media/base/android/sdk_media_codec_bridge.h - Issue 1726103002: Disable adaptive resolution support for MediaCodec use by AVDA.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1726103002: Disable adaptive resolution support for MediaCodec use by AVDA. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rename to allow. 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/java/src/org/chromium/media/MediaCodecBridge.java ('k') | media/base/android/sdk_media_codec_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/sdk_media_codec_bridge.h

diff --git a/media/base/android/sdk_media_codec_bridge.h b/media/base/android/sdk_media_codec_bridge.h

index b729eab67770f35ae83203d94212b5ac74067f8b..63c939d8f768d95b8e667dc64fe9d27c3ca14eba 100644

--- a/media/base/android/sdk_media_codec_bridge.h

+++ b/media/base/android/sdk_media_codec_bridge.h

@@ -162,10 +162,13 @@ class MEDIA_EXPORT VideoCodecBridge : public SdkMediaCodecBridge {

// Create, start, and return a VideoCodecBridge decoder or NULL on failure.

static VideoCodecBridge* CreateDecoder(

const VideoCodec& codec, // e.g. media::kCodecVP8

- bool is_secure,

- const gfx::Size& size, // Output frame size.

- jobject surface, // Output surface, optional.

- jobject media_crypto); // MediaCrypto object, optional.

+ bool is_secure, // Will be used with encrypted content.

+ const gfx::Size& size, // Output frame size.

+ jobject surface, // Output surface, optional.

+ jobject media_crypto, // MediaCrypto object, optional.

+ bool allow_adaptive_playback =

+ true); // Should adaptive playback be allowed if

+ // supported.

qinmin 2016/02/23 23:29:22 nit: this fits into the previous line.

DaleCurtis 2016/02/23 23:31:28 Done.

// Create, start, and return a VideoCodecBridge encoder or NULL on failure.

static VideoCodecBridge* CreateEncoder(