summaryrefslogtreecommitdiffstats
path: root/media/base/mock_ffmpeg.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge 54053 - ffmpeg roll for chromium source and windows binariesscherkus@chromium.org2010-08-021-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 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/3007022 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@54517 0039d316-1c4b-4281-b951-d872f2087c98
* Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-251-0/+1
| | | | | | | | | | | | | third_party/ffmpeg/include. Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/1289003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42573 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 42415 - Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-241-1/+0
| | | | | | | | | | | | | | | | third_party/ffmpeg/include. Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/1213002 TBR=scherkus@chromium.org Review URL: http://codereview.chromium.org/1240002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42422 0039d316-1c4b-4281-b951-d872f2087c98
* Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-241-0/+1
| | | | | | | | | | | | | third_party/ffmpeg/include. Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/1213002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42415 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from ↵jrg@chromium.org2010-03-121-1/+0
| | | | | | | | | | | | | | | | | | | | | third_party/ffmpeg/include. Bot unhappy Automatic: "media_unittests" on "Vista Tests" from 41386: ... scherkus@chromium.org ... http://chrome-buildbot:8010/builders/Vista%20Tests/builds/17009/steps/media_unittests/logs/stdio Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/909002 TBR=scherkus@chromium.org Review URL: http://codereview.chromium.org/854006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41389 0039d316-1c4b-4281-b951-d872f2087c98
* Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-121-0/+1
| | | | | | | | | | | | | third_party/ffmpeg/include. Patch by sergeyu@chromium.org BUG=23271 TEST=none Review URL: http://codereview.chromium.org/909002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41386 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor some code that depends on FFmpeghclam@chromium.org2010-01-261-2/+2
| | | | | | | | | | | | | 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
* Retry r35228: Fix windows build due to missing mock ffmpeg entry points.ajwong@chromium.org2009-12-231-0/+1
| | | | | | | | Original Review URL: http://codereview.chromium.org/522004 TBR: levin git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35238 0039d316-1c4b-4281-b951-d872f2087c98
* TBR: levinajwong@chromium.org2009-12-231-1/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35229 0039d316-1c4b-4281-b951-d872f2087c98
* Fix windows build due to missing mock ffmpeg entry points.ajwong@chromium.org2009-12-231-0/+1
| | | | | | Review URL: http://codereview.chromium.org/522004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35228 0039d316-1c4b-4281-b951-d872f2087c98
* Implementation of OmxVideoDecodeEngine.ajwong@chromium.org2009-12-221-0/+12
| | | | | | | | | | | | | | | | | | Also moves FFmpegVideoDecodeEngine FFmpegVideoDecoder, OmxVideoDecoder, and VideoDecoderImpl into their own files. Refactors FFmpegDemuxerTest to be less of a characterization test, and to hopefully be less fragile. Creates a set of utilities for handling Callbacks versus Tasks, and resource management related to Callbacks. Re-enables the annexb filters for the chrome build of FFmpeg. Added a BitstreamConverter class that abstracts the bitstream filter code. Cleans up a few gyp mistakes with flag exporting. Review URL: http://codereview.chromium.org/492023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35171 0039d316-1c4b-4281-b951-d872f2087c98
* Enable the mpeg4toannexb bitstream filter.ajwong@chromium.org2009-11-301-0/+9
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/441024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33307 0039d316-1c4b-4281-b951-d872f2087c98
* Disable FFmpeg logging as it interferes with layout tests.scherkus@chromium.org2009-09-191-0/+2
| | | | | | | | | | | | We could disable logging as soon as FFmpeg is loaded in InitializeMediaLibrary(), but we may want logging enabled for different applications using the media library (i.e., media_bench). BUG=16779 TEST=running chrome, test_shell on theora videos shouldn't print any boring log messages Review URL: http://codereview.chromium.org/212013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26641 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Issue 160529 in a nice way with unittest.fbarchard@chromium.org2009-08-211-0/+1
| | | | | | | | | | | | Original CL171023 by Song YeWen. BUG=16020 TEST=test with all media types and ensure there are no memory leaks are functional differences from previous version. Review URL: http://codereview.chromium.org/174027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24016 0039d316-1c4b-4281-b951-d872f2087c98
* Converted remaining tests to use gmock and deleted all old mocking code.scherkus@chromium.org2009-07-101-0/+8
| | | | | | | | | | | The most important part was refactoring PipelineImpl tests in preparation for message loop injection. The old mocks just did not work *at all* with my message loop injection patch. BUG=16008 TEST=media_unittests should pass and not flake out Review URL: http://codereview.chromium.org/149423 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20412 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup resources allocated by FFmpeg to avoid memory and threads leakshclam@chromium.org2009-07-071-0/+2
| | | | | | | | Calls avcodec_free and avcodec_thread_free appropriately. Review URL: http://codereview.chromium.org/151192 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20039 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor FFmpegVideoDecoder::OnDecode and unittest and add state tracking.ajwong@chromium.org2009-06-221-2/+8
| | | | | | | | The decoder needs a concept of state to know when it should just stop attempting to decode. This is because ffmpeg will sometimes gives spurious frames back, which plays badly with the time presentation timestamp calculation logic. Review URL: http://codereview.chromium.org/132013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18990 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor FFmpegDemuxerTest to use gmock and eliminate flakiness.scherkus@chromium.org2009-06-191-1/+77
| | | | | | | | | | | | | | | This eliminates all final traces of the old global-functions-and-variables style of mocking, which was a massive headache to maintain and verify correctness. No new tests have been added, however gmock creates much stronger assertions for the tests themselves. I also made FFmpegDemuxerTest a friend of FFmpegDemuxer to let tests verify that all tasks on the internal demuxing thread have completed. BUG=13933 TEST=FFmpegDemuxerTest should more awesome and less flaky Review URL: http://codereview.chromium.org/126306 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18833 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in ffmpeg_common.h into header for definition of CodecID.ajwong@chromium.org2009-06-161-6/+3
| | | | | | Review URL: http://codereview.chromium.org/125163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18459 0039d316-1c4b-4281-b951-d872f2087c98
* Moving MockFFmpeg to its own file and some media.gyp cleanup.scherkus@chromium.org2009-06-151-0/+34
Step one of having a completely mocked FFmpeg library. Review URL: http://codereview.chromium.org/126160 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18455 0039d316-1c4b-4281-b951-d872f2087c98