diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 15:53:30 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-13 15:53:30 +0000 |
| commit | 768708171bb6c8dec34509c11460d3bc355a3e81 (patch) | |
| tree | 0759c4e4c4fc9bd6d115e5e4ade74f81225756ff /media/tools | |
| parent | 8f8b6b856f85ec92504ca3e48ea4e0d0886ac7b2 (diff) | |
| download | chromium_src-768708171bb6c8dec34509c11460d3bc355a3e81.zip chromium_src-768708171bb6c8dec34509c11460d3bc355a3e81.tar.gz chromium_src-768708171bb6c8dec34509c11460d3bc355a3e81.tar.bz2 | |
Added FakeGlVideoDecodeEngine to exercise the IPC protocol for hardware video decoding
There are several things done in this patch:
1. Added FakeGlVideoDecodeEngine
2. Fixed style problem in VideoDecodeEngine and gpu_video_common.h
3. Added route to pass texture from gpu process to WebKit
BUG=53714
TEST=Tree is green
Review URL: http://codereview.chromium.org/3335014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/omx_test/omx_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc index 693c7be..44b728f 100644 --- a/media/tools/omx_test/omx_test.cc +++ b/media/tools/omx_test/omx_test.cc @@ -173,21 +173,21 @@ class TestApp : public base::RefCountedThreadSafe<TestApp>, media::VideoCodecConfig config; switch (av_stream_->codec->codec_id) { case CODEC_ID_VC1: - config.codec_ = media::kCodecVC1; break; + config.codec = media::kCodecVC1; break; case CODEC_ID_H264: - config.codec_ = media::kCodecH264; break; + config.codec = media::kCodecH264; break; case CODEC_ID_THEORA: - config.codec_ = media::kCodecTheora; break; + config.codec = media::kCodecTheora; break; case CODEC_ID_MPEG2VIDEO: - config.codec_ = media::kCodecMPEG2; break; + config.codec = media::kCodecMPEG2; break; case CODEC_ID_MPEG4: - config.codec_ = media::kCodecMPEG4; break; + config.codec = media::kCodecMPEG4; break; default: NOTREACHED(); break; } - config.opaque_context_ = NULL; - config.width_ = av_stream_->codec->width; - config.height_ = av_stream_->codec->height; + config.opaque_context = NULL; + config.width = av_stream_->codec->width; + config.height = av_stream_->codec->height; engine_.reset(new OmxVideoDecodeEngine()); engine_->Initialize(&message_loop_, this, config); |