1b63db956f
AV1X->AV1 mapping added to SdpVideoFormatToVideoCodecInfo in https://webrtc-review.googlesource.com/c/src/+/215586 results in discrepancy of codec name between SDP and VideoCodecInfo. That violates VideoCodecInfo design and breaks downstream projects. This CL moves the mapping from VideoCodecInfoToSdpVideoFormat and SdpVideoFormatToVideoCodecInfo to VideoCodecTypeMime. Bug: b/181690054 Change-Id: I2a76524c29b082241f2ec72a60a209ce9b0c7c5f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/221205 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Xavier Lepaul <xalep@webrtc.org> Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34230}
38 lines
1.3 KiB
C++
38 lines
1.3 KiB
C++
/*
|
|
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "sdk/android/src/jni/video_codec_info.h"
|
|
|
|
#include "sdk/android/generated_video_jni/VideoCodecInfo_jni.h"
|
|
#include "sdk/android/native_api/jni/java_types.h"
|
|
#include "sdk/android/src/jni/jni_helpers.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
SdpVideoFormat VideoCodecInfoToSdpVideoFormat(JNIEnv* jni,
|
|
const JavaRef<jobject>& j_info) {
|
|
return SdpVideoFormat(
|
|
JavaToNativeString(jni, Java_VideoCodecInfo_getName(jni, j_info)),
|
|
JavaToNativeStringMap(jni, Java_VideoCodecInfo_getParams(jni, j_info)));
|
|
}
|
|
|
|
ScopedJavaLocalRef<jobject> SdpVideoFormatToVideoCodecInfo(
|
|
JNIEnv* jni,
|
|
const SdpVideoFormat& format) {
|
|
ScopedJavaLocalRef<jobject> j_params =
|
|
NativeToJavaStringMap(jni, format.parameters);
|
|
return Java_VideoCodecInfo_Constructor(
|
|
jni, NativeToJavaString(jni, format.name), j_params);
|
|
}
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|