summaryrefslogtreecommitdiffstats
path: root/media/ffmpeg/ffmpeg_common.h
Commit message (Collapse)AuthorAgeFilesLines
* Ignore unsupported audio/video streams.dalecurtis@chromium.org2012-05-111-0/+8
| | | | | | | | | | | | | | | Now that FFmpeg passes in ID3 tag data (video, pictures) as an additional stream, we need to skip if it's unsupported, otherwise we'll bail out at the decoding stage. Allows partial playback of unsupported content. BUG=127692 TEST=mp3 in bug, layout tests, unittests. Review URL: https://chromiumcodereview.appspot.com/10382117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136490 0039d316-1c4b-4281-b951-d872f2087c98
* Second attempt to land ffmpeg roll.dalecurtis@google.com2012-03-011-0/+1
| | | | | | | | | | | | | | | | | 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-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Linux: Chromium FTBFS against libav 0.8b2.erg@chromium.org2012-01-071-1/+2
| | | | | | | | | | | Reported by Jonathan Nieder <jrnieder@gmail.com>: avutil.h doesn't include mathematics.h after v0.8b1~2231. BUG=108945 TEST=Compiles on Debian experimental Review URL: http://codereview.chromium.org/9123015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116780 0039d316-1c4b-4281-b951-d872f2087c98
* Miscellaneous header file cleanup for src/media.scherkus@chromium.org2011-10-281-4/+4
| | | | | | Review URL: http://codereview.chromium.org/8418017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107772 0039d316-1c4b-4281-b951-d872f2087c98
* Remove DemuxerStream::GetAVStream() once and for all.scherkus@chromium.org2011-10-271-8/+9
| | | | | | | | | We now use AudioDecoderConfig and VideoDecoderConfig to pass decoder initialization information. Review URL: http://codereview.chromium.org/8341033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107494 0039d316-1c4b-4281-b951-d872f2087c98
* Fix support for yuv_422 pixel format.scherkus@chromium.org2011-10-041-0/+6
| | | | | | | | | | | | Added pix_fmt field to the VideoDecoderConfig class. The pixel format is passed to the codec_context_ and used to correctly initialize VideoFrames. Patch by shadi@chromium.org: http://codereview.chromium.org/8052002/ BUG=95642 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103961 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up VideoDecoderConfig and replace VideoCodecInfo with a bool.scherkus@chromium.org2011-10-011-2/+2
| | | | | | | | | | | Similar to AudioDecoderConfig that was introduced in r102183, add Initialize() and IsValidConfig() to VideoDecoderConfig and update documentation. This helps pave the way to remove DemuxerStream::GetAVStream(). Since natural_size isn't used by neither VideoDecoderConfig nor VideoDecodeEngines, remove it from both and replace VideoCodecInfo with a bool. Review URL: http://codereview.chromium.org/8084021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103603 0039d316-1c4b-4281-b951-d872f2087c98
* Remove no-longer-used FFmpeg index-related helpers.fischman@chromium.org2011-09-291-28/+0
| | | | | | | | | | | | These methods served AdaptiveDemuxer which died in r103279. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/8084005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103334 0039d316-1c4b-4281-b951-d872f2087c98
* Introduce AudioDecoderConfig to migrate away from GetAVStream().scherkus@chromium.org2011-09-211-0/+8
| | | | | | | | | Instead add DemuxerStream::audio_decoder_config() to break FFmpegAudioDecoder's dependency on the AVCodecContext object maintained by FFmpegDemuxer. Review URL: http://codereview.chromium.org/7867051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102183 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r101418: Fix aspect ratio and clarify video frame dimensionsvrk@google.com2011-09-191-3/+3
| | | | | | | | | | | | Fixes shared build errors for windows and linux. BUG=18941,94861 TEST=shared builds compile TBR=acolwell Review URL: http://codereview.chromium.org/7932005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101808 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 101418 - Fix aspect ratio and clarify video frame dimensionsvrk@google.com2011-09-161-3/+3
| | | | | | | | | | | | BUG=18941,94861 TEST=video-aspect-ratio.html Review URL: http://codereview.chromium.org/7864009 TBR=vrk@google.com Review URL: http://codereview.chromium.org/7919006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101420 0039d316-1c4b-4281-b951-d872f2087c98
* Fix aspect ratio and clarify video frame dimensionsvrk@google.com2011-09-161-3/+3
| | | | | | | | | BUG=18941,94861 TEST=video-aspect-ratio.html Review URL: http://codereview.chromium.org/7864009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101418 0039d316-1c4b-4281-b951-d872f2087c98
* Create media.dll / libmedia.so.darin@chromium.org2011-08-291-13/+14
| | | | | | | | | This is a re-attempt at landing http://codereview.chromium.org/7572040, now with a DEPS roll to pick up the changes made to ffmpeg by http://codereview.chromium.org/7778004/ so that media_unittests run properly on Linux. TBR=fischman Review URL: http://codereview.chromium.org/7775004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98600 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r95841 due to failing media_unittests on linux_shared bot.darin@chromium.org2011-08-081-14/+13
| | | | | | | TBR=fischman@chromium.org Review URL: http://codereview.chromium.org/7601002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95846 0039d316-1c4b-4281-b951-d872f2087c98
* Enable media.dll / libmedia.so.darin@chromium.org2011-08-081-13/+14
| | | | | | Review URL: http://codereview.chromium.org/7572040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95841 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 95496 - Create media.dllapatrick@chromium.org2011-08-051-14/+13
| | | | | | | | | Review URL: http://codereview.chromium.org/7523051 TBR=darin@chromium.org Review URL: http://codereview.chromium.org/7491048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95561 0039d316-1c4b-4281-b951-d872f2087c98
* Create media.dlldarin@chromium.org2011-08-041-13/+14
| | | | | | Review URL: http://codereview.chromium.org/7523051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95496 0039d316-1c4b-4281-b951-d872f2087c98
* Adding ChunkDemuxer implementation.acolwell@chromium.org2011-06-291-0/+4
| | | | | | | | | BUG=86536 TEST=ChunkDemuxerTest.* Review URL: http://codereview.chromium.org/7203002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90966 0039d316-1c4b-4281-b951-d872f2087c98
* Respect pixel aspect ratio of video if it contains one.scherkus@chromium.org2011-06-031-0/+6
| | | | | | | | | | Patch by scottfr@chromium.org: http://codereview.chromium.org/7086002 BUG=18941 TEST=Check correct AR on http://people.xiph.org/~giles/2009/celt-aspect.html, media/video-display-aspect-ratio git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87751 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 87578 - Respect pixel aspect ratio of video if it contains one.michaeln@google.com2011-06-021-6/+0
| | | | | | | | | | | | | | BUG=18941 TEST=Check correct AR on http://people.xiph.org/~giles/2009/celt-aspect.html Alternately, fix 59412 and run media/video-display-aspect-ratio layout test Review URL: http://codereview.chromium.org/7086002 TBR=scottfr@chromium.org Review URL: http://codereview.chromium.org/7109002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87579 0039d316-1c4b-4281-b951-d872f2087c98
* Respect pixel aspect ratio of video if it contains one.scottfr@chromium.org2011-06-021-0/+6
| | | | | | | | | | | BUG=18941 TEST=Check correct AR on http://people.xiph.org/~giles/2009/celt-aspect.html Alternately, fix 59412 and run media/video-display-aspect-ratio layout test Review URL: http://codereview.chromium.org/7086002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87578 0039d316-1c4b-4281-b951-d872f2087c98
* Description:annacc@chromium.org2011-05-161-0/+7
| | | | | | | | | | | | | | | | | This patch gets the channel layout for surround sound channel order from ffmpeg and stores it so that chromium will be able to re-order the channels for various sound cards and OSes later. - AudioParameters gets a new field (channel_layout). - channel_layout.h stores an enum that we will use in chromium for channel values. - ffmpeg_common.h gets a new method for mapping the channel layout received from ffmpeg to an internal chromium enum value. BUG=None (though storing the channel order should help us solve some other bugs soon) TEST=media_unittests Review URL: http://codereview.chromium.org/6930039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85541 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor PTS processing logic from FFmpegVideoDecoder::FindPtsAndDuration() ↵scherkus@chromium.org2011-04-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | into PtsStream. This simplifies its reuse in other video decoders. An instance of this class is added to OmxVideoDecoder filter. The PTS processing is mostly left intact. The only difference is addition of PtsStream::Seek() method, which resets the current PTS. Without this method seeking brakes AV synchronization if the video decoder relies on last known PTS and frame rate to calculate timestamps for decoded frames. Patch by ostrovsm@gmail.com: http://codereview.chromium.org/6902032/ BUG=none TEST=The easiest way I found to reproduce the problem is to use an .avi file. It doesn't happen all the time but sometimes AVI demuxer reports invalid timestamps for video packets, and the decoder heavily relies on the PTS estimation logic (last PTS + frame rate). A sample file that triggers the behavior can be downloaded from [1]. The FFmpeg library has to be reconfigured to support MPEG4 decoding and AVI demuxing. Also to simplify the experiment "video/x-msvideo" has to be added to the list of supported media types in net/base/mime_util.cc. [1] http://www.dvdloc8.com/clip.php?movieid=284&clipid=1 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83180 0039d316-1c4b-4281-b951-d872f2087c98
* Fix samplefmt.h inclusion with newer ffmpegscherkus@chromium.org2011-04-011-1/+0
| | | | | | | | | | | | libavcore is defunct in upstream ffmpeg. Patch by floppymaster@gmail.com: http://codereview.chromium.org/6791004/ BUG=77795 TEST=Build with recent ffmpeg (use_system_ffmpeg=1) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80200 0039d316-1c4b-4281-b951-d872f2087c98
* Create helper methods to process FFmpeg index data.acolwell@chromium.org2011-04-011-1/+40
| | | | | | | | | BUG=none TEST=FFmpegCommonTest Review URL: http://codereview.chromium.org/6708130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80153 0039d316-1c4b-4281-b951-d872f2087c98
* Move some files from base to base/memory.levin@chromium.org2011-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | raw_scoped_refptr_mismatch_checker.h ref_counted.cc ref_counted.h ref_counted_memory.cc ref_counted_memory.h ref_counted_unittest.cc scoped_callback_factory.h scoped_comptr_win.h scoped_handle.h scoped_native_library.cc scoped_native_library.h scoped_native_library_unittest.cc scoped_nsobject.h scoped_open_process.h scoped_ptr.h scoped_ptr_unittest.cc scoped_temp_dir.cc scoped_temp_dir.h scoped_temp_dir_unittest.cc scoped_vector.h singleton.h singleton_objc.h singleton_unittest.cc linked_ptr.h linked_ptr_unittest.cc weak_ptr.cc weak_ptr.h weak_ptr_unittest.cc BUG=None TEST=Compile Review URL: http://codereview.chromium.org/6714032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79524 0039d316-1c4b-4281-b951-d872f2087c98
* Fold media/ffmpeg/ffmpeg_util.{cc,h} into media/ffmpeg/ffmpeg_common.{cc,h}scherkus@chromium.org2011-03-121-0/+3
| | | | | | | | | BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6686011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77896 0039d316-1c4b-4281-b951-d872f2087c98
* Remove FFmpegVideoDecodeEngine's dependency on AVStream (again).scherkus@chromium.org2011-03-111-0/+4
| | | | | | | | | | | First step of many towards removing DemuxerStream::QueryInterface, AVStreamProvider, and MediaFormat. This time without memory leaks! BUG=28206 TEST=media_unittests git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77875 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 77476 - Remove FFmpegVideoDecodeEngine's dependency on AVStream.tyoshino@chromium.org2011-03-111-4/+0
| | | | | | | | | | | | | | | | | This change seems to have caused Linux Heapcheck bot redness. http://build.chromium.org/p/chromium.memory/builders/Linux%20Heapcheck/builds/4846 First step of many towards removing DemuxerStream::QueryInterface, AVStreamProvider, and MediaFormat. BUG=28206 TEST=media_unittests Review URL: http://codereview.chromium.org/6624062 TBR=scherkus@chromium.org Review URL: http://codereview.chromium.org/6665020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77770 0039d316-1c4b-4281-b951-d872f2087c98
* Remove FFmpegVideoDecodeEngine's dependency on AVStream.scherkus@chromium.org2011-03-091-0/+4
| | | | | | | | | | | First step of many towards removing DemuxerStream::QueryInterface, AVStreamProvider, and MediaFormat. BUG=28206 TEST=media_unittests Review URL: http://codereview.chromium.org/6624062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77476 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the silly notion of MIME types from media code.scherkus@chromium.org2011-03-091-10/+1
| | | | | | | | | | | This was one of the first things I checked into Chromium and I've been wanting to remove it for a long, long time now. BUG=28206 TEST=media_unittests Review URL: http://codereview.chromium.org/6623087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77468 0039d316-1c4b-4281-b951-d872f2087c98
* roll ffmpeg to nov 4 to fix clang issuefbarchard@chromium.org2010-11-111-0/+1
| | | | | | | | | BUG=61931 TEST=none Review URL: http://codereview.chromium.org/4770001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65784 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg roll for chromium source and windows binariesfbarchard@chromium.org2010-07-281-0/+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
* Revert r53885 "deps roll for new ffmpeg and switch to av_register_protocol2"jeremy@chromium.org2010-07-281-1/+0
| | | | | | | | 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-0/+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/+0
| | | | | | | | | | | | | | 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-0/+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
* Handle EINTR and remove offset_t in ffmpeg code.agl@chromium.org2010-05-201-3/+0
| | | | | | | | (Should also fix OpenBSD build I believe) http://codereview.chromium.org/2136017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47794 0039d316-1c4b-4281-b951-d872f2087c98
* Fix use_system_ffmpeg and clean up ffmpeg.gypscherkus@chromium.org2010-03-301-3/+4
| | | | | | | | | | | | | To make use_system_ffmpeg work more correctly, we now use the system include path for headers and make use of the version number macros to determine the shared library names. Also removed a bunch of cruft without breaking anything on Windows, Mac or Linux. BUG=23602, 39430 TEST=ffmpeg should still work both with and without use_system_ffmpeg Review URL: http://codereview.chromium.org/1503002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43030 0039d316-1c4b-4281-b951-d872f2087c98
* Removed custom FFmpegLock. Removed ffmpeg headers from ↵scherkus@chromium.org2010-03-251-23/+3
| | | | | | | | | | | | | 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-3/+23
| | | | | | | | | | | | | | | | 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-23/+3
| | | | | | | | | | | | | 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-3/+23
| | | | | | | | | | | | | | | | | | | | | 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-23/+3
| | | | | | | | | | | | | 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-0/+82
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