Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(603)

Unified Diff: media/base/android/sdk_media_codec_bridge.cc

Issue 1726103002: Disable adaptive resolution support for MediaCodec use by AVDA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/sdk_media_codec_bridge.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/sdk_media_codec_bridge.cc
diff --git a/media/base/android/sdk_media_codec_bridge.cc b/media/base/android/sdk_media_codec_bridge.cc
index 1e767c82f869a666c3bba527aeaf91d172e7d505..62782160d42e8a8fb7330674fda770115f1a170b 100644
--- a/media/base/android/sdk_media_codec_bridge.cc
+++ b/media/base/android/sdk_media_codec_bridge.cc
@@ -560,11 +560,13 @@ bool VideoCodecBridge::IsKnownUnaccelerated(const VideoCodec& codec,
}
// static
-VideoCodecBridge* VideoCodecBridge::CreateDecoder(const VideoCodec& codec,
- bool is_secure,
- const gfx::Size& size,
- jobject surface,
- jobject media_crypto) {
+VideoCodecBridge* VideoCodecBridge::CreateDecoder(
+ const VideoCodec& codec,
+ bool is_secure,
+ const gfx::Size& size,
+ jobject surface,
+ jobject media_crypto,
+ bool allow_adaptive_playback) {
if (!MediaCodecUtil::IsMediaCodecAvailable())
return nullptr;
@@ -583,9 +585,9 @@ VideoCodecBridge* VideoCodecBridge::CreateDecoder(const VideoCodec& codec,
Java_MediaCodecBridge_createVideoDecoderFormat(
env, j_mime.obj(), size.width(), size.height()));
DCHECK(!j_format.is_null());
- if (!Java_MediaCodecBridge_configureVideo(env, bridge->media_codec(),
- j_format.obj(), surface,
- media_crypto, 0)) {
+ if (!Java_MediaCodecBridge_configureVideo(
+ env, bridge->media_codec(), j_format.obj(), surface, media_crypto, 0,
+ allow_adaptive_playback)) {
return nullptr;
}
@@ -620,7 +622,7 @@ VideoCodecBridge* VideoCodecBridge::CreateEncoder(const VideoCodec& codec,
DCHECK(!j_format.is_null());
if (!Java_MediaCodecBridge_configureVideo(env, bridge->media_codec(),
j_format.obj(), nullptr, nullptr,
- kConfigureFlagEncode)) {
+ kConfigureFlagEncode, true)) {
return nullptr;
}
« no previous file with comments | « media/base/android/sdk_media_codec_bridge.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698