summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Small changes to comments and add host() + message_loop() implementation ↵ajwong@chromium.org2009-07-136-1/+22
| | | | | | | | | | into MediaFilter. Remove host() and message_loop() overrides in DecoderBase. Review URL: http://codereview.chromium.org/150193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20533 0039d316-1c4b-4281-b951-d872f2087c98
* Add methods to ARAB and BufferQueue to allow owners to query it for the ↵kylep@chromium.org2009-07-135-0/+61
| | | | | | | | | | timestamp of our next byte. BUG=16011 TEST=src/media/base/buffer_queue_unittest.cc Review URL: http://codereview.chromium.org/149494 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20520 0039d316-1c4b-4281-b951-d872f2087c98
* More media::PipelineImpl cleanup, this time focusing on not taking down the ↵scherkus@chromium.org2009-07-113-64/+145
| | | | | | | | | | | | | | | | render process. Specifically, if the pipeline hasn't started we should fail gracefully and not DCHECK. Volume and playback rate are now allowed to be set if the pipeline isn't running, and filters will now receive a call to SetVolume() and SetPlaybackRate() with the initial values when the pipeline has fully initialized. Added tests and expectations for all of this and ran valgrind to verify that we were indeed leaking memory (now fixed). BUG=16009, 13902 TEST=media_unittests, layout tests Review URL: http://codereview.chromium.org/149500 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20455 0039d316-1c4b-4281-b951-d872f2087c98
* Unreverting "Implemented injected message loops for PipelineImpl"scherkus@chromium.org2009-07-118-401/+443
| | | | | | | | | | Guess it was a flaky layout test. TBR=hclam Review URL: http://codereview.chromium.org/155400 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20444 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Implemented injected message loops for PipelineImpl."scherkus@chromium.org2009-07-108-443/+401
| | | | | | | | | | | | I cannot repro the layout test failures, seeing if this helps. TBR=hclam BUG=none TEST=none Review URL: http://codereview.chromium.org/155396 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20439 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented injected message loops for PipelineImpl.scherkus@chromium.org2009-07-108-401/+443
| | | | | | | | | | | For now both the player and WebMediaPlayerImpl create a thread and inject its message loop into the pipeline. The end result is more-or-less the same as what we have today, but we could end up moving the pipeline onto the render thread. BUG=16008 TEST=layout tests, media_unittests should pass Review URL: http://codereview.chromium.org/155338 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20417 0039d316-1c4b-4281-b951-d872f2087c98
* Modify OLA to use window size in seconds instead of bytes.kylep@chromium.org2009-07-105-19/+59
| | | | | | | | BUG=16011 TEST=none Review URL: http://codereview.chromium.org/157001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20416 0039d316-1c4b-4281-b951-d872f2087c98
* Converted remaining tests to use gmock and deleted all old mocking code.scherkus@chromium.org2009-07-1010-1126/+519
| | | | | | | | | | | 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
* Replaced DCHECKs to use MessageLoop::current() for FFmpegDemuxer and ↵scherkus@chromium.org2009-07-104-46/+25
| | | | | | | | | | | | DecoderBase. TEST=media_unittests BUG=none Review URL: http://codereview.chromium.org/149475 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20409 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor audio renderer algorithms to use BufferQueue. Also cleaned up some ↵kylep@chromium.org2009-07-106-198/+88
| | | | | | | | | | comments and unnecessary functions/fields. BUG=16011 TEST=none Review URL: http://codereview.chromium.org/155255 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20347 0039d316-1c4b-4281-b951-d872f2087c98
* Made MediaFilter::host_ and MediaFilter::message_loop_ private.scherkus@chromium.org2009-07-0913-61/+62
| | | | | | | | | | | More cleanup relating to pipeline cleanup. BUG=16008 TEST=no real code chage, nothing should change Review URL: http://codereview.chromium.org/155230 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20338 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Made MediaFilter::host_ and MediaFilter::message_loop_ private."scherkus@chromium.org2009-07-0912-53/+52
| | | | | | | | | | TEST=none BUG=none TBR=evmar Review URL: http://codereview.chromium.org/155333 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20336 0039d316-1c4b-4281-b951-d872f2087c98
* Made MediaFilter::host_ and MediaFilter::message_loop_ private.scherkus@chromium.org2009-07-0912-52/+53
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20335 0039d316-1c4b-4281-b951-d872f2087c98
* Manually declare media_format() because gmock does not like mocking ↵scherkus@chromium.org2009-07-091-4/+12
| | | | | | | | | | | non-copyable const references. TEST=media_unittests should pass BUG=16008 Review URL: http://codereview.chromium.org/155316 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20328 0039d316-1c4b-4281-b951-d872f2087c98
* Updated FFmpegDemuxerTest and FFmpegVideoDecoderTest to use the gmock-based ↵scherkus@chromium.org2009-07-096-340/+30
| | | | | | | | | | | | | MockFilterHost. Also deleted the old MockPipeline and MockFilterHost code as it has been completely deprecated. BUG=16008 TEST=FFmpegDemuxerTest and FFmpegVideoDecoderTest Review URL: http://codereview.chromium.org/149366 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20242 0039d316-1c4b-4281-b951-d872f2087c98
* Added new gmock-based MockFilterHost and deprecated the old one.scherkus@chromium.org2009-07-095-65/+66
| | | | | | | | | | | Updated FileDataSource tests to use the new MockFilterHost as a proof of concept, also because my pipeline refactoring completely broke the test. BUG=16008 TEST=FileDataSourceTest.* should pass Review URL: http://codereview.chromium.org/149350 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20219 0039d316-1c4b-4281-b951-d872f2087c98
* Big media::Pipeline cleanup.scherkus@chromium.org2009-07-099-476/+245
| | | | | | | | | | | Before I can even start refactoring, I need to remove a lot of accumulated cruft and fix some style stuff. PipelineStatus has been merged into Pipeline and I got rid of GetInterpolatedTime() as well as the ability to schedule callbacks when time has updated. We haven't found a need for these features and they introduced a good amount of code complexity. TEST=media_unittests should still pass BUG=16008 Review URL: http://codereview.chromium.org/149215 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20218 0039d316-1c4b-4281-b951-d872f2087c98
* BufferQueue class to hide audio data micromanagement from scaling ↵kylep@chromium.org2009-07-084-0/+290
| | | | | | | | | | algorithms. May be useful in other contexts. BUG=16011 TEST=src/media/base/buffer_queue_unittest.cc Review URL: http://codereview.chromium.org/155193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20211 0039d316-1c4b-4281-b951-d872f2087c98
* Wrote gmock-based mock filters and a mock filter factory.scherkus@chromium.org2009-07-083-9/+188
| | | | | | | | | | | Next up is actually refactoring tests to use these and not the old_mocks version. The biggest user is the PipelineImpl tests, which I'm currently refactoring anyway hence sending this out for review. BUG=16008 TEST=FFmpegVideoDecoderTest should still pass Review URL: http://codereview.chromium.org/149356 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20201 0039d316-1c4b-4281-b951-d872f2087c98
* Removing video_decoder_unittest.cc as it tests nothing.scherkus@chromium.org2009-07-082-37/+0
| | | | | | | | | | | ffmpeg_video_decoder_unittest.cc is a much more comprehensive test! BUG=16008 TEST=none Review URL: http://codereview.chromium.org/155198 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20162 0039d316-1c4b-4281-b951-d872f2087c98
* Remove svn:executable property from files that don't need it.thestig@chromium.org2009-07-081-0/+0
| | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/155199 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20161 0039d316-1c4b-4281-b951-d872f2087c98
* Test fwrite returnval in wav_ola_test.cc to fix ubuntu compile warning.kylep@chromium.org2009-07-071-1/+4
| | | | | | Review URL: http://codereview.chromium.org/155160 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20077 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup resources allocated by FFmpeg to avoid memory and threads leakshclam@chromium.org2009-07-075-19/+55
| | | | | | | | 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
* OLA Algorithm and test shell.kylep@chromium.org2009-07-074-0/+452
| | | | | | | | BUG=16011 TEST=none Review URL: http://codereview.chromium.org/151120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19994 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor AudioRendererBase to use scoped_refptr<AudioDecoder>kylep@chromium.org2009-07-062-3/+2
| | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/149144 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19984 0039d316-1c4b-4281-b951-d872f2087c98
* Scale function cleaned up white spaces and removed comments that are no ↵fbarchard@chromium.org2009-07-061-86/+29
| | | | | | | | | | longer applicable to this module. Removed openmp support, which is no longer necessary for high performance. Review URL: http://codereview.chromium.org/150143 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19971 0039d316-1c4b-4281-b951-d872f2087c98
* Asynchronous initialization of media::PipelineThreadhclam@chromium.org2009-07-013-231/+322
| | | | | | | | | The initialization of media::PipelineThread needs to done asynchronously or a lot of dead lock will happen. Review URL: http://codereview.chromium.org/149123 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19787 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a bug in audio/video decoder that the stopped variable is not initializedhclam@chromium.org2009-07-011-7/+4
| | | | | | | | stopped_ variable is not initialized in DecoderBase, results in dropping packets. Review URL: http://codereview.chromium.org/151170 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19786 0039d316-1c4b-4281-b951-d872f2087c98
* Make FFmpeg delay load settings propagate to all shared libraries and ↵scherkus@chromium.org2009-07-011-6/+0
| | | | | | | | | | | executables. TEST=everything should build with no test hangs BUG=15664 Review URL: http://codereview.chromium.org/151124 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19746 0039d316-1c4b-4281-b951-d872f2087c98
* Minor change to ARAB and ARAD for subsequent OLA submission.kylep@chromium.org2009-07-014-30/+28
| | | | | | Review URL: http://codereview.chromium.org/150150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19739 0039d316-1c4b-4281-b951-d872f2087c98
* Put some hard limits on the low level audio apicpu@google.com2009-07-013-0/+50
| | | | | | | | | | | | | | - Max number of channels (2) - Bits per sample (64) - Sampling rate (256kHz) - Queue audio buffer (64MB x 2) BUG=none TEST= WinAudioTest.SanityOnMakeParams Review URL: http://codereview.chromium.org/151093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19695 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting 19687.dkegel@google.com2009-07-014-29/+30
| | | | | | Review URL: http://codereview.chromium.org/150145 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19689 0039d316-1c4b-4281-b951-d872f2087c98
* Minor changes to ARAB and ARAD necessary for OLAkylep@chromium.org2009-07-014-30/+29
| | | | | | Review URL: http://codereview.chromium.org/150140 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19687 0039d316-1c4b-4281-b951-d872f2087c98
* Switching decoders to use the injected message loop.scherkus@chromium.org2009-06-297-210/+205
| | | | | | | | | TEST=test should continue to pass, movies stay in sync BUG=none Review URL: http://codereview.chromium.org/146068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19555 0039d316-1c4b-4281-b951-d872f2087c98
* Micro-refactor: added VideoRendererBase::OnStop().scherkus@chromium.org2009-06-264-0/+17
| | | | | | | | | | | | Updated subclasses WtlRenderer and VideoRendererImpl as well. TEST=none BUG=none Review URL: http://codereview.chromium.org/147191 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19372 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor media pipeline and filters to use injected message loops.scherkus@chromium.org2009-06-257-173/+266
| | | | | | | | | | | Message loops are provided via MediaFilter::SetMessageLoop(). For now FFmpegDemuxer is the only filter taking advantage of injected message loops, and its unit tests have been updated as well. TEST=FFmpegDemuxer tests should continue to run BUG=none Review URL: http://codereview.chromium.org/145014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19209 0039d316-1c4b-4281-b951-d872f2087c98
* Checking in media/base/mock_filters.h, a new set of mock filters based on gmock.scherkus@chromium.org2009-06-233-4/+52
| | | | | | | | | TEST=FFmpegDemuxer tests should continue to run BUG=none Review URL: http://codereview.chromium.org/147046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19078 0039d316-1c4b-4281-b951-d872f2087c98
* Fix sign mismatch issues.ajwong@chromium.org2009-06-231-6/+6
| | | | | | Review URL: http://codereview.chromium.org/145025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18992 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor FFmpegVideoDecoder::OnDecode and unittest and add state tracking.ajwong@chromium.org2009-06-226-128/+645
| | | | | | | | 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
* Removed message loop from MockPipeline as it is no longer needed.scherkus@chromium.org2009-06-222-26/+0
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/145022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18984 0039d316-1c4b-4281-b951-d872f2087c98
* Cleaned up AudioRendererAlgorithmBase: moved data members to private section ↵kylep@chromium.org2009-06-224-46/+71
| | | | | | | | and added accessors. Review URL: http://codereview.chromium.org/140080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18974 0039d316-1c4b-4281-b951-d872f2087c98
* Removing FilterHost::PostTask() in preparation of injected message loops.scherkus@chromium.org2009-06-225-49/+2
| | | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/145001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18972 0039d316-1c4b-4281-b951-d872f2087c98
* Renamed media::VideoThread to the more appropriate media::VideoRendererBase.scherkus@chromium.org2009-06-227-781/+299
| | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/141059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18970 0039d316-1c4b-4281-b951-d872f2087c98
* FFmpegDemuxerStream::Read() now functions properly while stopped.scherkus@chromium.org2009-06-223-29/+154
| | | | | | | | | BUG=13907 TEST=some layout tests might start passing Review URL: http://codereview.chromium.org/131092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18917 0039d316-1c4b-4281-b951-d872f2087c98
* Changing overstrict CHECKs to just setting the object into an invalid state.ajwong@chromium.org2009-06-201-5/+17
| | | | | | | | BUG: 13287 Review URL: http://codereview.chromium.org/140033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18882 0039d316-1c4b-4281-b951-d872f2087c98
* Draft of base and default algorithm class for AudioRendererBase refactor.kylep@chromium.org2009-06-195-0/+295
| | | | | | Review URL: http://codereview.chromium.org/118395 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18876 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor FFmpegDemuxerTest to use gmock and eliminate flakiness.scherkus@chromium.org2009-06-195-438/+569
| | | | | | | | | | | | | | | 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
* Setting svn:eol-style LF for media source files.scherkus@chromium.org2009-06-174-78/+79
| | | | | | | | | | | Removed some trailing whitespace as well and fixed some style nits. No code change. TEST=none BUG=none TBR=hclam Review URL: http://codereview.chromium.org/125225 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18577 0039d316-1c4b-4281-b951-d872f2087c98
* Serialize calls to avcodec_open() and avcodec_close().scherkus@chromium.org2009-06-175-28/+47
| | | | | | | | BUG=http://crbug.com/13907 TEST=some media layout tests should start passing consistently Review URL: http://codereview.chromium.org/126243 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18570 0039d316-1c4b-4281-b951-d872f2087c98
* Refactored, templatized, commented and moved TestReader to the fancy new ↵scherkus@chromium.org2009-06-163-60/+100
| | | | | | | | | | MockReader. Previously only used by FFmpegDemuxerTest, it's not templated so we can use it with FFmpegVideoDecoderTest and FFmpegAudioDecoderTest and any other sort of demuxer or decoder for that matter. Review URL: http://codereview.chromium.org/126027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18547 0039d316-1c4b-4281-b951-d872f2087c98