diff options
| author | fgalligan@chromium.org <fgalligan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 16:48:39 +0000 |
|---|---|---|
| committer | fgalligan@chromium.org <fgalligan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 16:48:39 +0000 |
| commit | 7ebccf35d1c0e6dcfafedae7b9ea3a21ba930b41 (patch) | |
| tree | 7c4c8378aa45e9877292b9ae300ae24461072291 | |
| parent | 0b71e9a05edba7dd17619c141c55d963edc49e98 (diff) | |
| download | chromium_src-7ebccf35d1c0e6dcfafedae7b9ea3a21ba930b41.zip chromium_src-7ebccf35d1c0e6dcfafedae7b9ea3a21ba930b41.tar.gz chromium_src-7ebccf35d1c0e6dcfafedae7b9ea3a21ba930b41.tar.bz2 | |
Add VP8 codec enum to video decoder.
BUG=52594
TEST=Play a WebM file in debug Chrome build and renderer
should not crash.
Review URL: http://codereview.chromium.org/3189013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57070 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/filters/ffmpeg_video_decoder.cc | 2 | ||||
| -rw-r--r-- | media/filters/video_decode_engine.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index 82c8007..8b673dc 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -89,6 +89,8 @@ void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream, config.codec_ = kCodecMPEG2; break; case CODEC_ID_MPEG4: config.codec_ = kCodecMPEG4; break; + case CODEC_ID_VP8: + config.codec_ = kCodecVP8; break; default: NOTREACHED(); } diff --git a/media/filters/video_decode_engine.h b/media/filters/video_decode_engine.h index 96872de..3098fe1 100644 --- a/media/filters/video_decode_engine.h +++ b/media/filters/video_decode_engine.h @@ -19,6 +19,7 @@ enum VideoCodec { kCodecMPEG2, kCodecMPEG4, kCodecTheora, + kCodecVP8, }; static const uint32 kProfileDoNotCare = static_cast<uint32>(-1); |