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

Add getSupportedCodecs to VideoDecoderFactory interface.

Browse Source 
The default implementation of the method is to return an empty list.
Clients should update their implementations before WebRTC starts calling
this method.

Also updates internal WebRTC implentations of this interface to
implement the method.

Bug: webrtc:7925
Change-Id: I258de2f09f6d4cc5dd9f4657e5d54e8411f8f5d8
Reviewed-on: https://webrtc-review.googlesource.com/77641
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23325}
This commit is contained in:
Sami Kalliomäki
2018-05-21 13:45:51 +02:00
committed by Commit Bot
parent 80d02ad93f
commit cc02cb595f
7 changed files with 123 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/android/api/org/webrtc/DefaultVideoDecoderFactory.java
View File

@ -10,6 +10,9 @@
package org.webrtc;
import java.util.Arrays;
import java.util.LinkedHashSet;
import java.util.List;
import javax.annotation.Nullable;
public class DefaultVideoDecoderFactory implements VideoDecoderFactory {
@ -30,4 +33,14 @@ public class DefaultVideoDecoderFactory implements VideoDecoderFactory {
}
return softwareVideoDecoderFactory.createDecoder(codecType);
}
@Override
public VideoCodecInfo[] getSupportedCodecs() {
LinkedHashSet<VideoCodecInfo> supportedCodecInfos = new LinkedHashSet<VideoCodecInfo>();
supportedCodecInfos.addAll(Arrays.asList(softwareVideoDecoderFactory.getSupportedCodecs()));
supportedCodecInfos.addAll(Arrays.asList(hardwareVideoDecoderFactory.getSupportedCodecs()));
return supportedCodecInfos.toArray(new VideoCodecInfo[supportedCodecInfos.size()]);
}
}

48
sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
View File

@ -19,6 +19,8 @@ import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaCodecList;
import android.os.Build;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
/** Factory for Android hardware VideoDecoders. */
@ -72,6 +74,39 @@ public class HardwareVideoDecoderFactory implements VideoDecoderFactory {
sharedContext);
}
@Override
public VideoCodecInfo[] getSupportedCodecs() {
List<VideoCodecInfo> supportedCodecInfos = new ArrayList<VideoCodecInfo>();
// Generate a list of supported codecs in order of preference:
// VP8, VP9, H264 (high profile), and H264 (baseline profile).
for (VideoCodecType type :
new VideoCodecType[] {VideoCodecType.VP8, VideoCodecType.VP9, VideoCodecType.H264}) {
MediaCodecInfo codec = findCodecForType(type);
if (codec != null) {
String name = type.name();
if (type == VideoCodecType.H264 && isH264HighProfileSupported(codec)) {
supportedCodecInfos.add(new VideoCodecInfo(
name, MediaCodecUtils.getCodecProperties(type, /* highProfile= */ true)));
}
supportedCodecInfos.add(new VideoCodecInfo(
name, MediaCodecUtils.getCodecProperties(type, /* highProfile= */ false)));
}
}
// TODO(andersc): This is for backwards compatibility. Remove when clients have migrated to
// new DefaultVideoEncoderFactory.
if (fallbackToSoftware) {
for (VideoCodecInfo info : SoftwareVideoDecoderFactory.supportedCodecs()) {
if (!supportedCodecInfos.contains(info)) {
supportedCodecInfos.add(info);
}
}
}
return supportedCodecInfos.toArray(new VideoCodecInfo[supportedCodecInfos.size()]);
}
private @Nullable MediaCodecInfo findCodecForType(VideoCodecType type) {
// HW decoding is not supported on builds before KITKAT.
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
@ -129,4 +164,17 @@ public class HardwareVideoDecoderFactory implements VideoDecoderFactory {
return false;
}
}
private boolean isH264HighProfileSupported(MediaCodecInfo info) {
String name = info.getName();
// Support H.264 HP decoding on QCOM chips for Android L and above.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && name.startsWith(QCOM_PREFIX)) {
return true;
}
// Support H.264 HP decoding on Exynos chips for Android M and above.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && name.startsWith(EXYNOS_PREFIX)) {
return true;
}
return false;
}
}

34
sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
View File

@ -19,7 +19,6 @@ import android.media.MediaCodecList;
import android.os.Build;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Nullable;
@ -96,10 +95,11 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
MediaCodecUtils.ENCODER_COLOR_FORMATS, info.getCapabilitiesForType(mime));
if (type == VideoCodecType.H264) {
boolean isHighProfile = nativeIsSameH264Profile(input.params, getCodecProperties(type, true))
boolean isHighProfile = nativeIsSameH264Profile(input.params,
MediaCodecUtils.getCodecProperties(type, /* highProfile= */ true))
&& isH264HighProfileSupported(info);
boolean isBaselineProfile =
nativeIsSameH264Profile(input.params, getCodecProperties(type, false));
boolean isBaselineProfile = nativeIsSameH264Profile(
input.params, MediaCodecUtils.getCodecProperties(type, /* highProfile= */ false));
if (!isHighProfile && !isBaselineProfile) {
return null;
@ -121,11 +121,15 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
MediaCodecInfo codec = findCodecForType(type);
if (codec != null) {
String name = type.name();
// TODO(sakal): Always add H264 HP once WebRTC correctly removes codecs that are not
// supported by the decoder.
if (type == VideoCodecType.H264 && isH264HighProfileSupported(codec)) {
supportedCodecInfos.add(new VideoCodecInfo(name, getCodecProperties(type, true)));
supportedCodecInfos.add(new VideoCodecInfo(
name, MediaCodecUtils.getCodecProperties(type, /* highProfile= */ true)));
}
supportedCodecInfos.add(new VideoCodecInfo(name, getCodecProperties(type, false)));
supportedCodecInfos.add(new VideoCodecInfo(
name, MediaCodecUtils.getCodecProperties(type, /* highProfile= */ false)));
}
}
@ -266,24 +270,6 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory {
&& info.getName().startsWith(EXYNOS_PREFIX);
}
private Map<String, String> getCodecProperties(VideoCodecType type, boolean highProfile) {
switch (type) {
case VP8:
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;
default:
throw new IllegalArgumentException("Unsupported codec: " + type);
}
}
private static native boolean nativeIsSameH264Profile(
Map<String, String> params1, Map<String, String> params2);
}

19
sdk/android/api/org/webrtc/SoftwareVideoDecoderFactory.java
View File

@ -10,6 +10,9 @@
package org.webrtc;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import javax.annotation.Nullable;
public class SoftwareVideoDecoderFactory implements VideoDecoderFactory {
@ -25,4 +28,20 @@ public class SoftwareVideoDecoderFactory implements VideoDecoderFactory {
return null;
}
@Override
public VideoCodecInfo[] getSupportedCodecs() {
return supportedCodecs();
}
static VideoCodecInfo[] supportedCodecs() {
List<VideoCodecInfo> codecs = new ArrayList<VideoCodecInfo>();
codecs.add(new VideoCodecInfo("VP8", new HashMap<>()));
if (VP9Decoder.nativeIsSupported()) {
codecs.add(new VideoCodecInfo("VP9", new HashMap<>()));
}
return codecs.toArray(new VideoCodecInfo[codecs.size()]);
}
}

8
sdk/android/api/org/webrtc/VideoDecoderFactory.java
View File

@ -19,4 +19,12 @@ public interface VideoDecoderFactory {
* VideoEncoderFactory.
*/
@Nullable @CalledByNative VideoDecoder createDecoder(String codecType);
/**
* Enumerates the list of supported video codecs.
*/
@CalledByNative
default VideoCodecInfo[] getSupportedCodecs() {
return new VideoCodecInfo[0];
}
}

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

@ -14,6 +14,8 @@ import android.annotation.TargetApi;
import android.media.MediaCodec;
import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nullable;
/** Container class for static constants and helpers used with MediaCodec. */
@ -76,6 +78,24 @@ class MediaCodecUtils {
return false;
}
static Map<String, String> getCodecProperties(VideoCodecType type, boolean highProfile) {
switch (type) {
case VP8:
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;
default:
throw new IllegalArgumentException("Unsupported codec: " + type);
}
}
private MediaCodecUtils() {
// This class should not be instantiated.
}

7
sdk/android/src/jni/videodecoderfactorywrapper.cc
View File

@ -16,6 +16,7 @@
#include "rtc_base/logging.h"
#include "sdk/android/generated_video_jni/jni/VideoDecoderFactory_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/videocodecinfo.h"
#include "sdk/android/src/jni/wrappednativecodec.h"
namespace webrtc {
@ -39,8 +40,10 @@ std::unique_ptr<VideoDecoder> VideoDecoderFactoryWrapper::CreateVideoDecoder(
std::vector<SdpVideoFormat> VideoDecoderFactoryWrapper::GetSupportedFormats()
const {
// TODO(andersc): VideoDecoderFactory.java does not have this method.
return std::vector<SdpVideoFormat>();
JNIEnv* env = AttachCurrentThreadIfNeeded();
return JavaToNativeVector<SdpVideoFormat>(
env, Java_VideoDecoderFactory_getSupportedCodecs(env, decoder_factory_),
&VideoCodecInfoToSdpVideoFormat);
}
} // namespace jni