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

Android: Add helper functions for comparing H264 codecs

Browse Source 
These helper functions will be useful when making the legacy video
codecs injectable.

Bug: webrtc:7925
Change-Id: Id5a480666f07eccc3116d2c2e61803cc4daf7c9f
Reviewed-on: https://webrtc-review.googlesource.com/88365
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23954}
This commit is contained in:
Magnus Jedvert
2018-07-12 17:05:12 +02:00
committed by Commit Bot
parent 3f84f498e4
commit 1045af2989
5 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sdk/android/src/java/org/webrtc/H264Utils.java Normal file
View File

@ -0,0 +1,52 @@
/*
* 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.
*/
package org.webrtc;
import java.util.Map;
import java.util.HashMap;
/** Container for static helper functions related to dealing with H264 codecs. */
class H264Utils {
public static final String H264_FMTP_PROFILE_LEVEL_ID = "profile-level-id";
public static final String H264_FMTP_LEVEL_ASYMMETRY_ALLOWED = "level-asymmetry-allowed";
public static final String H264_FMTP_PACKETIZATION_MODE = "packetization-mode";
public static final String H264_PROFILE_CONSTRAINED_BASELINE = "42e0";
public static final String H264_PROFILE_CONSTRAINED_HIGH = "640c";
public static final String H264_LEVEL_3_1 = "1f"; // 31 in hex.
public static final String H264_CONSTRAINED_HIGH_3_1 =
H264_PROFILE_CONSTRAINED_HIGH + H264_LEVEL_3_1;
public static final String H264_CONSTRAINED_BASELINE_3_1 =
H264_PROFILE_CONSTRAINED_BASELINE + H264_LEVEL_3_1;
public static Map<String, String> getDefaultH264Params(boolean isHighProfile) {
final Map<String, String> params = new HashMap<>();
params.put(VideoCodecInfo.H264_FMTP_LEVEL_ASYMMETRY_ALLOWED, "1");
params.put(VideoCodecInfo.H264_FMTP_PACKETIZATION_MODE, "1");
params.put(VideoCodecInfo.H264_FMTP_PROFILE_LEVEL_ID,
isHighProfile ? VideoCodecInfo.H264_CONSTRAINED_HIGH_3_1
: VideoCodecInfo.H264_CONSTRAINED_BASELINE_3_1);
return params;
}
public static VideoCodecInfo DEFAULT_H264_BASELINE_PROFILE_CODEC =
new VideoCodecInfo("H264", getDefaultH264Params(/* isHighProfile= */ false));
public static VideoCodecInfo DEFAULT_H264_HIGH_PROFILE_CODEC =
new VideoCodecInfo("H264", getDefaultH264Params(/* isHighProfile= */ true));
public static boolean isSameH264Profile(
Map<String, String> params1, Map<String, String> params2) {
return nativeIsSameH264Profile(params1, params2);
}
private static native boolean nativeIsSameH264Profile(
Map<String, String> params1, Map<String, String> params2);
}

8
sdk/android/src/java/org/webrtc/MediaCodecUtils.java
View File

@ -84,13 +84,7 @@ class MediaCodecUtils {
case VP9:
return new HashMap<String, String>();
case H264:
Map<String, String> properties = new HashMap<>();
properties.put(VideoCodecInfo.H264_FMTP_LEVEL_ASYMMETRY_ALLOWED, "1");
properties.put(VideoCodecInfo.H264_FMTP_PACKETIZATION_MODE, "1");
properties.put(VideoCodecInfo.H264_FMTP_PROFILE_LEVEL_ID,
highProfile ? VideoCodecInfo.H264_CONSTRAINED_HIGH_3_1
: VideoCodecInfo.H264_CONSTRAINED_BASELINE_3_1);
return properties;
return H264Utils.getDefaultH264Params(highProfile);
default:
throw new IllegalArgumentException("Unsupported codec: " + type);
}

18
sdk/android/src/jni/hardwarevideoencoderfactory.cc → sdk/android/src/jni/h264utils.cc
View File

@ -1,5 +1,5 @@
/*
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
* Copyright 2018 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
@ -8,23 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include <jni.h>
#include "sdk/android/src/jni/videocodecinfo.h"
#include "media/base/h264_profile_level_id.h"
#include "sdk/android/generated_video_jni/jni/HardwareVideoEncoderFactory_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
#include "common_video/h264/profile_level_id.h"
#include "sdk/android/generated_video_jni/jni/H264Utils_jni.h"
namespace webrtc {
namespace jni {
static jboolean JNI_HardwareVideoEncoderFactory_IsSameH264Profile(
JNIEnv* jni,
static jboolean JNI_H264Utils_IsSameH264Profile(
JNIEnv* env,
const JavaParamRef<jclass>&,
const JavaParamRef<jobject>& params1,
const JavaParamRef<jobject>& params2) {
return H264::IsSameH264Profile(JavaToNativeStringMap(jni, params1),
JavaToNativeStringMap(jni, params2));
return H264::IsSameH264Profile(JavaToNativeStringMap(env, params1),
JavaToNativeStringMap(env, params2));
}
} // namespace jni