zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move h264_profile_level_id and vp9_profile to api/video_codecs

Browse Source 
This is a refactor to simplify a follow-up CL of adding
SdpVideoFormat::IsSameCodec.

The original files media/base/h264_profile_level_id.* and
media/base/vp9_profile.h must be kept until downstream projects
stop using them.

Bug: chroimium:1187565
Change-Id: Ib39eca095a3d61939a914d9bffaf4b891ddd222f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215236
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Johannes Kron <kron@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33782}
This commit is contained in:
Johannes Kron
2021-04-19 09:09:26 +02:00
committed by Commit Bot
parent 8546666cb9
commit c3fcee7c3a
48 changed files with 1236 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/android/src/jni/h264_utils.cc
View File

@ -8,10 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "sdk/android/src/jni/video_codec_info.h"
#include "common_video/h264/profile_level_id.h"
#include "api/video_codecs/h264_profile_level_id.h"
#include "sdk/android/generated_video_jni/H264Utils_jni.h"
#include "sdk/android/src/jni/video_codec_info.h"
namespace webrtc {
namespace jni {
@ -20,8 +19,8 @@ static jboolean JNI_H264Utils_IsSameH264Profile(
JNIEnv* env,
const JavaParamRef<jobject>& params1,
const JavaParamRef<jobject>& params2) {
return H264::IsSameH264Profile(JavaToNativeStringMap(env, params1),
JavaToNativeStringMap(env, params2));
return H264IsSameProfile(JavaToNativeStringMap(env, params1),
JavaToNativeStringMap(env, params2));
}
} // namespace jni