summaryrefslogtreecommitdiffstats
path: root/media/tools/player_x11/gles_video_renderer.cc
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 19:57:22 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-05 19:57:22 +0000
commit88185ad05fa219c194418e6e7eb9555fb07c2b67 (patch)
treea9e9464358e5f13066d9d7b71817d2c5d5386e64 /media/tools/player_x11/gles_video_renderer.cc
parent0701ad5e7a6f5607ae6315f355eac2bdfd4c7080 (diff)
downloadchromium_src-88185ad05fa219c194418e6e7eb9555fb07c2b67.zip
chromium_src-88185ad05fa219c194418e6e7eb9555fb07c2b67.tar.gz
chromium_src-88185ad05fa219c194418e6e7eb9555fb07c2b67.tar.bz2
Add EGLImage as one media type different than regular uncompressed video buffer.
Video renderer could get this info via decoder->media_format(). This is needed in case video renderer is the buffer allocator. Patch by wjia@chromium.org: http://codereview.chromium.org/1725021/show BUG=NONE TEST=compiles Review URL: http://codereview.chromium.org/1952003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/player_x11/gles_video_renderer.cc')
-rw-r--r--media/tools/player_x11/gles_video_renderer.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/tools/player_x11/gles_video_renderer.cc b/media/tools/player_x11/gles_video_renderer.cc
index 347a3dc..31847820 100644
--- a/media/tools/player_x11/gles_video_renderer.cc
+++ b/media/tools/player_x11/gles_video_renderer.cc
@@ -34,7 +34,8 @@ bool GlesVideoRenderer::IsMediaFormatSupported(
const media::MediaFormat& media_format) {
int width = 0;
int height = 0;
- return ParseMediaFormat(media_format, &width, &height);
+ bool uses_egl_image_ = false;
+ return ParseMediaFormat(media_format, &width, &height, &uses_egl_image_);
}
void GlesVideoRenderer::OnStop() {
@@ -105,7 +106,8 @@ static const char kFragmentShader[] =
static const unsigned int kErrorSize = 4096;
bool GlesVideoRenderer::OnInitialize(media::VideoDecoder* decoder) {
- if (!ParseMediaFormat(decoder->media_format(), &width_, &height_))
+ if (!ParseMediaFormat(decoder->media_format(), &width_, &height_,
+ &uses_egl_image_))
return false;
LOG(INFO) << "Initializing GLES Renderer...";