diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-01 22:25:25 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-01 22:25:25 +0000 |
| commit | d8fedf9ca7071735da290dca4d58440d05594694 (patch) | |
| tree | 4b182b22e2973f01e7209c82973793c005d67eed /media/tools | |
| parent | a76af4a70e85380fb855e9babc0ab700d9a3a10d (diff) | |
| download | chromium_src-d8fedf9ca7071735da290dca4d58440d05594694.zip chromium_src-d8fedf9ca7071735da290dca4d58440d05594694.tar.gz chromium_src-d8fedf9ca7071735da290dca4d58440d05594694.tar.bz2 | |
Using bitstream filters if OpenMAX is enabled
Use FFmpeg bitstream filters if OpenMAX is enabled. The following filters
are used:
1. h264_mp4toannexb
2. mpeg4video_es
3. vc1_asftorcv
4. vc1_asftoannexg
TEST=run player_x11 with --enable-openmax and the above formats work
Review URL: http://codereview.chromium.org/661059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/omx_test/file_reader_util.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/tools/omx_test/file_reader_util.cc b/media/tools/omx_test/file_reader_util.cc index 700ffc0..4414cd7 100644 --- a/media/tools/omx_test/file_reader_util.cc +++ b/media/tools/omx_test/file_reader_util.cc @@ -156,6 +156,12 @@ bool FFmpegFileReader::Initialize() { } else if (codec_context_->codec_id == CODEC_ID_MPEG4) { converter_.reset(new media::FFmpegBitstreamConverter( "mpeg4video_es", codec_context_)); + } else if (codec_context_->codec_id == CODEC_ID_WMV3) { + converter_.reset(new media::FFmpegBitstreamConverter( + "vc1_asftorcv", codec_context_)); + } else if (codec_context_->codec_id == CODEC_ID_VC1) { + converter_.reset(new media::FFmpegBitstreamConverter( + "vc1_asftoannexg", codec_context_)); } if (converter_.get() && !converter_->Initialize()) { |