diff options
| author | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 22:19:15 +0000 |
|---|---|---|
| committer | tomfinegan@chromium.org <tomfinegan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-16 22:19:15 +0000 |
| commit | 4e8d20a5e0c0e29b9f7235f0d01c926316e778e4 (patch) | |
| tree | 43c1b73db1f77aff7b6a53bf3fffe3b0a17e53af /media/ffmpeg | |
| parent | d674f6e23dc4d4e8944df74074e06c1b5c18a7f1 (diff) | |
| download | chromium_src-4e8d20a5e0c0e29b9f7235f0d01c926316e778e4.zip chromium_src-4e8d20a5e0c0e29b9f7235f0d01c926316e778e4.tar.gz chromium_src-4e8d20a5e0c0e29b9f7235f0d01c926316e778e4.tar.bz2 | |
media: Add support for playback for VP8 Alpha video streams.
BUG=147355
TEST=VP8 Alpha video streams play
Review URL: https://codereview.chromium.org/12263013
Patch from Vignesh Venkatasubramanian <vigneshv@chromium.org>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 12a4ec9..cc7dfc2 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -382,6 +382,12 @@ void AVStreamToVideoDecoderConfig( if (key) is_encrypted = true; + AVDictionaryEntry* webm_alpha = + av_dict_get(stream->metadata, "alpha_mode", NULL, 0); + if (webm_alpha && !strcmp(webm_alpha->value, "1")) { + format = VideoFrame::YV12A; + } + config->Initialize(codec, profile, format, @@ -490,6 +496,8 @@ VideoFrame::Format PixelFormatToVideoFormat(PixelFormat pixel_format) { case PIX_FMT_YUV420P: case PIX_FMT_YUVJ420P: return VideoFrame::YV12; + case PIX_FMT_YUVA420P: + return VideoFrame::YV12A; default: DVLOG(1) << "Unsupported PixelFormat: " << pixel_format; } @@ -502,6 +510,8 @@ PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format) { return PIX_FMT_YUV422P; case VideoFrame::YV12: return PIX_FMT_YUV420P; + case VideoFrame::YV12A: + return PIX_FMT_YUVA420P; default: DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format; } |