From e23feeb34e5705f6726516428450e808187ef05b Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Fri, 13 Jul 2018 10:25:18 +0200 Subject: [PATCH] Don't care about H264 profiles when creating Android decoder. Fixes problem in Android's legacy video decoder factory. Bug: b/111416606 Change-Id: Id6f26d559e5055eb7808beb600b9550ebd4ca4b7 Reviewed-on: https://webrtc-review.googlesource.com/88560 Commit-Queue: Magnus Jedvert Reviewed-by: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#23967} --- sdk/android/src/jni/androidmediadecoder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/android/src/jni/androidmediadecoder.cc b/sdk/android/src/jni/androidmediadecoder.cc index f14bc3c2f8..7ac6c47d17 100644 --- a/sdk/android/src/jni/androidmediadecoder.cc +++ b/sdk/android/src/jni/androidmediadecoder.cc @@ -814,7 +814,7 @@ std::unique_ptr MediaCodecVideoDecoderFactory::CreateVideoDecoder( return nullptr; } for (SdpVideoFormat supported_format : supported_formats_) { - if (supported_format == format) { + if (supported_format.name == format.name) { ALOGD << "Create HW video decoder for type " << format.name; JNIEnv* jni = AttachCurrentThreadIfNeeded(); ScopedLocalRefFrame local_ref_frame(jni);