From 6ac955b41814da1eebf56244a147f3fad00f5aa7 Mon Sep 17 00:00:00 2001
From: "vigneshv@chromium.org"
 <vigneshv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 19 Apr 2013 23:43:32 +0000
Subject: media: Add support for playback of VP8 Alpha video streams

BUG=147355
TEST=VP8 Alpha video streams play
TBR=sky

Review URL: https://chromiumcodereview.appspot.com/13886011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195339 0039d316-1c4b-4281-b951-d872f2087c98
---
 media/ffmpeg/ffmpeg_common.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'media/ffmpeg')

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;
   }
-- 
cgit v1.1