diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-28 02:39:28 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-28 02:39:28 +0000 |
| commit | 20821861f10e6dd9a73cabf0def42b29f1abc62c (patch) | |
| tree | 7c7f40e9bab0df32738dff84b4357f892159f34f | |
| parent | 0f935491a6bb96ebad37266ce4f5fb98657c1391 (diff) | |
| download | chromium_src-20821861f10e6dd9a73cabf0def42b29f1abc62c.zip chromium_src-20821861f10e6dd9a73cabf0def42b29f1abc62c.tar.gz chromium_src-20821861f10e6dd9a73cabf0def42b29f1abc62c.tar.bz2 | |
remove meaningless ffmpeg fast flag
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3280004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57771 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/filters/ffmpeg_video_decode_engine.cc | 6 | ||||
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 3 | ||||
| -rw-r--r-- | media/tools/media_bench/media_bench.cc | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/media/filters/ffmpeg_video_decode_engine.cc b/media/filters/ffmpeg_video_decode_engine.cc index 97eb24e..f5e6d34 100644 --- a/media/filters/ffmpeg_video_decode_engine.cc +++ b/media/filters/ffmpeg_video_decode_engine.cc @@ -38,14 +38,12 @@ void FFmpegVideoDecodeEngine::Initialize( // continue processing. Although it'd be nice to have the option of a single // decoding thread, FFmpeg treats having one thread the same as having zero // threads (i.e., avcodec_decode_video() will execute on the calling thread). - // Yet another reason for having three threads :) - static const int kDecodeThreads = 3; + // Yet another reason for having two threads :) + static const int kDecodeThreads = 2; static const int kMaxDecodeThreads = 16; - av_stream_ = static_cast<AVStream*>(config.opaque_context_); codec_context_ = av_stream_->codec; - codec_context_->flags2 |= CODEC_FLAG2_FAST; // Enable faster H264 decode. // Enable motion vector search (potentially slow), strong deblocking filter // for damaged macroblocks, and set our error detection sensitivity. codec_context_->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 4e0820d..5745fe9 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -93,7 +93,7 @@ int main(int argc, const char** argv) { out_path = FilePath(filenames[1]); // Default flags that match Chrome defaults. - int video_threads = 3; + int video_threads = 2; int verbose_level = AV_LOG_FATAL; int max_frames = 0; int max_loops = 0; @@ -228,7 +228,6 @@ int main(int argc, const char** argv) { video_threads = 1; } - codec_context->flags2 |= CODEC_FLAG2_FAST; codec_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK; codec_context->error_recognition = FF_ER_CAREFUL; diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 86833b1..37d7b45 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -330,6 +330,7 @@ int main(int argc, const char** argv) { codec_context->skip_frame = AVDISCARD_NONREF; } if (fast2) { + // Note this flag is no longer necessary for H264 multithreading. codec_context->flags2 |= CODEC_FLAG2_FAST; } if (error_correction) { |