summaryrefslogtreecommitdiffstats
path: root/media/tools/media_bench
Commit message (Collapse)AuthorAgeFilesLines
* Remove use of AV_EF_CAREFUL from media code.scherkus@chromium.org2012-12-131-1/+0
| | | | | | | | | It's only used in AC3 and ALS decoders, neither of which we use. Review URL: https://chromiumcodereview.appspot.com/11573010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172959 0039d316-1c4b-4281-b951-d872f2087c98
* Roll ffmpeg DEPS for fixes, patch removal, and better GOMA detection.dalecurtis@google.com2012-11-021-52/+25
| | | | | | | | | | | | | | | | | | Also fixes various media tools which were using the old av_register_protocol2() path instead of the new FFmpegGlue hotness. Includes: 3d123ab Zero initialize ff_lockmgr_cb. b694550 Remove custom av_register_protocol2() patch. c317c1c Use build.ninja to see the user uses GOMA or not. BUG=146529,118986,159139 TEST=builds. Review URL: https://codereview.chromium.org/11365050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165752 0039d316-1c4b-4281-b951-d872f2087c98
* Switch to using avcodec_decode_audio4, avcodec_alloc_context3.dalecurtis@chromium.org2012-06-111-13/+29
| | | | | | | | | | | | | | | | Allows us to remove another patch from FFmpeg relating to using deprecated features! We're now using the latest and greatest! FFmpeg side changes here, https://gerrit.chromium.org/gerrit/24823 BUG=112673 TEST=ffmpeg_regression_tests, webaudio tests. Review URL: https://chromiumcodereview.appspot.com/10540067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141524 0039d316-1c4b-4281-b951-d872f2087c98
* Second attempt to land ffmpeg roll.dalecurtis@google.com2012-03-011-9/+8
| | | | | | | | | | | | | | | | | Attempt 2 at landing http://codereview.chromium.org/9317096/ Same as before except for fixes in checkperms/ However, fixes have landed elsewhere for: - mp3 decode issue. - FrameRateNoVsyncCanvasInternalTest.fishbowl/0 BUG=110776 TEST=unittests, layouttests, trybots, perf tests... Review URL: https://chromiumcodereview.appspot.com/9447029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124501 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 123123 (probably caused a big perf regression -- http://crbug.com/115479,thakis@chromium.org2012-02-231-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and possibly made frame rate tests fail: http://crbug.com/115477. Will revert the revert if it doesn't help.) - Fix media code to work with new ffmpeg. Once ffmpeg git, svn are updated to new ffmpeg, will update DEPS in this CL. Which when committed, should seal the deal for the ffmpeg roll. API Changes: avutil: SampleFormat->AVSampleFormat avutil: av_get_bits_per_sample_fmt -> av_get_bytes_per_sample avcodec: avcodec_open -> avcodec_open2(..., NULL) avcodec: avcodec_decode_video2(... AVPacket ...) -> const AVPacket. avformat: av_open_input_file -> avformat_open_input avformat: av_register_protocol2 -> ffurl_register_protocol avformat: av_close_input_file -> avformat_close_input(&...) avformat: av_find_stream_info -> avformat_find_stream_info(..., NULL) URLContext now has a url_open2 method as well, for now I've set this to NULL. Also fixes: - ffmpeg_unittests change threading to mirror ffmpeg_video_decoder. There's an issue where threading causes the last frames of a no-audio video to be clipped. It existed before this ffmpeg roll, but because threading was disabled by default in ffmpeg, we never noticed it. - ffmpeg_demuxer_tests: GetBitrate_UnsetInContainer_NoFileSize now passes. - New ffmpeg_unittests passes: sync0_ogv/FFmpegTest.Seek_Video/0, where GetParam() = "sync0.ogv" sync1_ogv/FFmpegTest.Seek_Video/0, where GetParam() = "sync1.ogv" sync2_ogv/FFmpegTest.Seek_Video/0, where GetParam() = "sync2.ogv" FFmpeg fixups here, https://chromiumcodereview.appspot.com/9325049/ New git repo here: http://git.chromium.org/gitweb/?p=chromium/third_party/ffmpeg.git;a=summary Merge+Patches diff: https://chromiumcodereview.appspot.com/9317107 BUG=110776 TEST=unittests, layouttests, etc. Trybots. Review URL: https://chromiumcodereview.appspot.com/9317096 TBR=dalecurtis@google.com Review URL: https://chromiumcodereview.appspot.com/9455018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123249 0039d316-1c4b-4281-b951-d872f2087c98
* Fix media code to work with new ffmpeg.dalecurtis@google.com2012-02-221-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once ffmpeg git, svn are updated to new ffmpeg, will update DEPS in this CL. Which when committed, should seal the deal for the ffmpeg roll. API Changes: avutil: SampleFormat->AVSampleFormat avutil: av_get_bits_per_sample_fmt -> av_get_bytes_per_sample avcodec: avcodec_open -> avcodec_open2(..., NULL) avcodec: avcodec_decode_video2(... AVPacket ...) -> const AVPacket. avformat: av_open_input_file -> avformat_open_input avformat: av_register_protocol2 -> ffurl_register_protocol avformat: av_close_input_file -> avformat_close_input(&...) avformat: av_find_stream_info -> avformat_find_stream_info(..., NULL) URLContext now has a url_open2 method as well, for now I've set this to NULL. Also fixes: - ffmpeg_unittests change threading to mirror ffmpeg_video_decoder. There's an issue where threading causes the last frames of a no-audio video to be clipped. It existed before this ffmpeg roll, but because threading was disabled by default in ffmpeg, we never noticed it. - ffmpeg_demuxer_tests: GetBitrate_UnsetInContainer_NoFileSize now passes. - New ffmpeg_unittests passes: sync0_ogv/FFmpegTest.Seek_Video/0, where GetParam() = "sync0.ogv" sync1_ogv/FFmpegTest.Seek_Video/0, where GetParam() = "sync1.ogv" sync2_ogv/FFmpegTest.Seek_Video/0, where GetParam() = "sync2.ogv" FFmpeg fixups here, https://chromiumcodereview.appspot.com/9325049/ New git repo here: http://git.chromium.org/gitweb/?p=chromium/third_party/ffmpeg.git;a=summary Merge+Patches diff: https://chromiumcodereview.appspot.com/9317107 BUG=110776 TEST=unittests, layouttests, etc. Trybots. Review URL: https://chromiumcodereview.appspot.com/9317096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123123 0039d316-1c4b-4281-b951-d872f2087c98
* Enable logging for media_bench.scherkus@chromium.org2011-08-131-3/+10
| | | | | | Review URL: http://codereview.chromium.org/7629007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96681 0039d316-1c4b-4281-b951-d872f2087c98
* MD5Update function uses StringPiece instead of raw buffer.dominich@chromium.org2011-07-261-4/+10
| | | | | | | | | | BUG=none TEST=base_unittests --gtest_filter=MD5.ContextWithStringData* Review URL: http://codereview.chromium.org/7466003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94203 0039d316-1c4b-4281-b951-d872f2087c98
* base: Put md5.* into base namespace.tfarina@chromium.org2011-07-181-12/+10
| | | | | | | | | | | BUG=89274 TEST=None R=evan@chromium.org Review URL: http://codereview.chromium.org/7395021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92861 0039d316-1c4b-4281-b951-d872f2087c98
* Rename CommandLine::GetArgs(), update callers.msw@chromium.org2011-07-131-1/+1
| | | | | | | | | BUG=73195 TEST=none Review URL: http://codereview.chromium.org/7352006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92448 0039d316-1c4b-4281-b951-d872f2087c98
* Glue ffmpeg to Chromeihf@chromium.org2011-07-011-13/+10
| | | | | | | | | | | | | | | | | | | | 1) works for Linux, OSX, Windows 2) mostly renaming #defines 3) avcodec_thread_init is deprecated and has been removed, see http://ffmpeg.org/pipermail/ffmpeg-cvslog/2011-February/034326.html 4) will require a rebaseline of platform/chromium-mac/media/video-currentTime-set-expected.txt platform/chromium-win/media/video-currentTime-set-expected.txt with a change of -video.currentTime.toFixed(2) == '5.82' +video.currentTime.toFixed(2) == '5.81' BUG=87831 TESTS=ran Theora Testsuite, media tests, WebKit media tests Review URL: http://codereview.chromium.org/6993042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91259 0039d316-1c4b-4281-b951-d872f2087c98
* check for codec null pointer when printing error messagefbarchard@chromium.org2011-01-041-2/+2
| | | | | | | | | BUG=68115 TEST=media_bench.exe --verbose=48 --stream=audio out.webm.68798.1929 should print Error: Could not open codec (NULL) for c:\work\out.webm.68798.1929 Review URL: http://codereview.chromium.org/6044008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70412 0039d316-1c4b-4281-b951-d872f2087c98
* media_bench output width and height of mediafbarchard@chromium.org2010-10-271-3/+8
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/4128006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64107 0039d316-1c4b-4281-b951-d872f2087c98
* remove meaningless ffmpeg fast flagfbarchard@chromium.org2010-08-281-0/+1
| | | | | | | | | 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
* Revert 56582 - ffmpeg flag CODEC_FLAG2_FAST removedrvargas@google.com2010-08-181-1/+0
| | | | | | | | | | | | BUG=52607 TEST=ffmpeg_tests tulip\tulip2.mp4 should be same performance as media_bench.exe --video-threads=3 --fast2 --stream=video tulip\tulip2.mp4 Review URL: http://codereview.chromium.org/3157024 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/3125023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56606 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg flag CODEC_FLAG2_FAST removedfbarchard@chromium.org2010-08-181-0/+1
| | | | | | | | | BUG=52607 TEST=ffmpeg_tests tulip\tulip2.mp4 should be same performance as media_bench.exe --video-threads=3 --fast2 --stream=video tulip\tulip2.mp4 Review URL: http://codereview.chromium.org/3157024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56582 0039d316-1c4b-4281-b951-d872f2087c98
* media bench report fpsfbarchard@chromium.org2010-08-031-17/+24
| | | | | | | | | | | also handles videos with 0 frames the same as videos with more than 0 frames, for consistency and throwing in a comment in yuv conversion BUG=none TEST=none Review URL: http://codereview.chromium.org/3073019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54842 0039d316-1c4b-4281-b951-d872f2087c98
* fix another compile error on windows.nsylvain@chromium.org2010-07-311-0/+1
| | | | | | Review URL: http://codereview.chromium.org/3052032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54470 0039d316-1c4b-4281-b951-d872f2087c98
* Convert more callers of the integer/string functions to usingbrettw@chromium.org2010-07-311-6/+6
| | | | | | | | | | string_number_conversions.h TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3013046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54454 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg roll for chromium source and windows binariesfbarchard@chromium.org2010-07-281-1/+1
| | | | | | | | | | Includes fix for XP Perf by reducing webm library size by 1.6 MB BUG=48037,50507 TEST=XP Perf and layout tests should pass Review URL: http://codereview.chromium.org/3030024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54053 0039d316-1c4b-4281-b951-d872f2087c98
* base/ header cleanup. Forward declaration instead of including.erg@google.com2010-07-281-0/+1
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3068004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53969 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r53885 "deps roll for new ffmpeg and switch to av_register_protocol2"jeremy@chromium.org2010-07-281-1/+1
| | | | | | | | Trying to track down cause of XP Perf bot regression. Review URL: http://codereview.chromium.org/3081002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53926 0039d316-1c4b-4281-b951-d872f2087c98
* deps roll for new ffmpeg and switch to av_register_protocol2fbarchard@chromium.org2010-07-281-1/+1
| | | | | | | | | BUG=48037 TEST=layout tests should still pass for media Review URL: http://codereview.chromium.org/3005034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53885 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 53281 - ffmpeg update with vp3 patches.fbarchard@chromium.org2010-07-221-1/+1
| | | | | | | | | | | | | | switch to av_register_protocol2 video-played-collapse layout test fails and will be fixed later. BUG=48037 TEST=ffmpeg should still build/run Review URL: http://codereview.chromium.org/3010016 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/2805098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53285 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg update with vp3 patches.fbarchard@chromium.org2010-07-221-1/+1
| | | | | | | | | | | switch to av_register_protocol2 video-played-collapse layout test fails and will be fixed later. BUG=48037 TEST=ffmpeg should still build/run Review URL: http://codereview.chromium.org/3010016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53281 0039d316-1c4b-4281-b951-d872f2087c98
* Remove deprecated CommandLine::GetLooseValues(), rename to args().evan@chromium.org2010-07-211-23/+27
| | | | | | | | | | | | | | | It returned a wstring, when really we wanted the native encoded strings. Fixing the majority of callers actually simplified them in many cases because the callers wanted native strings too. Since I'm touching every caller, I gave it a more useful name. I'm not sure where "loose" came from but it never made sense to me. BUG=24672 Review URL: http://codereview.chromium.org/3028010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53193 0039d316-1c4b-4281-b951-d872f2087c98
* file_util: deprecate remaining wstring functionsevan@chromium.org2010-07-161-7/+11
| | | | | | | | | | | This removes the last wstring-accepting functions from file_util on non-Windows platforms. BUG=24672 Review URL: http://codereview.chromium.org/3005005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52755 0039d316-1c4b-4281-b951-d872f2087c98
* media_Bench and ffmpeg_tests disable exception handler by defaultfbarchard@chromium.org2010-06-241-2/+8
| | | | | | | | | BUG=47307 TEST=no change in normal behavior. Review URL: http://codereview.chromium.org/2811026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50684 0039d316-1c4b-4281-b951-d872f2087c98
* Enable error recognition and error concealment options in qualification ↵fbarchard@chromium.org2010-05-171-0/+12
| | | | | | | | | | | software, for consistency with Chrome, and as a switch in media_bench BUG=31093 TEST=media_bench --error-correction --stream=video --video-threads=1 d:\mediatests\tulip\tulip2.mp4 Review URL: http://codereview.chromium.org/2107009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47443 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 42727 - ffmpeg roll chromium binariesfbarchard@chromium.org2010-03-261-2/+2
| | | | | | | | | | | bug=none test=none TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/1401002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42728 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg roll chromium binariesfbarchard@chromium.org2010-03-261-2/+2
| | | | | | | | bug=none test=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42727 0039d316-1c4b-4281-b951-d872f2087c98
* media: string_util.h -> utf_string_conversions.h fix.jhawkins@chromium.org2010-03-061-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/668227 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40852 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg better message for error on opening file if the file opens but the ↵fbarchard@chromium.org2010-03-031-3/+13
| | | | | | | | | | | codec is not supported. BUG=37256 TEST=ffmpeg_tests.exe d:\mediatests\elephant2.m4v with chromium and you should get 'File format not supported' Review URL: http://codereview.chromium.org/661426 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40472 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor some code that depends on FFmpeghclam@chromium.org2010-01-263-101/+3
| | | | | | | | | | | | | Some FFmpeg header and source files are misplaced: media/filters/ffmpeg_common.{cc, h} -> media/ffmpeg media/tools/media_bench/file_protocol.{cc, h} -> media/ffmpeg And the necessary refactoring for the new location is done. Review URL: http://codereview.chromium.org/555087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37080 0039d316-1c4b-4281-b951-d872f2087c98
* Use argv[0] to print out executable usage info for media tools.scherkus@chromium.org2009-11-251-1/+1
| | | | | | | | | | BUG=n/a TESt=n/a Review URL: http://codereview.chromium.org/434101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33148 0039d316-1c4b-4281-b951-d872f2087c98
* Re-organizing all tools under /src/media to be consistent with the rest of ↵scherkus@chromium.org2009-11-253-0/+642
the repository. TEST=n/a BUG=n/a Review URL: http://codereview.chromium.org/431046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33089 0039d316-1c4b-4281-b951-d872f2087c98