summaryrefslogtreecommitdiffstats
path: root/third_party/ffmpeg
Commit message (Collapse)AuthorAgeFilesLines
* Add comments setting emacs and vim tab width and expansion variables.sgk@google.com2009-10-061-0/+6
| | | | | | | | BUG=none TEST=successful builds Review URL: http://codereview.chromium.org/256059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28089 0039d316-1c4b-4281-b951-d872f2087c98
* Make <video> works properly in test_shell in machclam@chromium.org2009-10-021-0/+4
| | | | | | | | | | | | BUG=23602 BUG=13907 1. FFmpeg binaries are copied to TestShell.app/Contents/MacOS 2. Load media_*.png for drawing the controls Review URL: http://codereview.chromium.org/248042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27863 0039d316-1c4b-4281-b951-d872f2087c98
* Disable FFmpeg logging as it interferes with layout tests.scherkus@chromium.org2009-09-191-0/+1
| | | | | | | | | | | | 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
* Update ffmpeg binaries directories to support variants based off the target ↵ajwong@chromium.org2009-09-181-12/+13
| | | | | | | | | | | architecture. BUG=20948 TEST=none Review URL: http://codereview.chromium.org/215016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26630 0039d316-1c4b-4281-b951-d872f2087c98
* Properly only add linker flag for linux/freebsd.thomasvl@chromium.org2009-09-161-8/+10
| | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/195103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26343 0039d316-1c4b-4281-b951-d872f2087c98
* Force inclusion of build/common.gypi for all chromium gyp files.yaar@chromium.org2009-09-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Why: Simpler build code. If everybody includes it, it should be included automatically. Why now: The webkit chromium builds need it be specified, since can't default to build/common.gypi. What was done: 1. build/common.gypi's contents were moved to a new file build/gyp_chromium.gypi 2. tools/gyp/gyp_chromium was moved to build/gyp_chromium and made to automatically include build/gyp_chromium.gypi. 3. lots of gyp files were fixed to not refer to build/common.gypi any more. 4. o3d which also builds independently of chrome, was fixed to have a gyp_o3d that includes gyp_chromium.gypi too. 5. build/common.gypi was left empty, because there are some external projects that still refer to it. Things that are left to do after this patch is in: 1. The following external files (in other repositories) need to stop include common.gypi ./third_party/hunspell/hunspell.gyp ./third_party/icu/icu.gyp ./v8/tools/gyp/v8.gyp 2. Once nobody refers to common.gypi anymore, delete common.gypi -or- Delete gyp_chromium.gypi and move its content back to common.gypi Tested on mac, win and linux. On win, got a few unit tests errors on chrome bookmarks, which should not be related. I'm running again with clobber to verify. Review URL: http://codereview.chromium.org/206006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26302 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the Linux shared build.thestig@chromium.org2009-09-151-0/+6
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/203076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26291 0039d316-1c4b-4281-b951-d872f2087c98
* Added USE_GDK, set when either TOOLKIT_GTK or TOOLKIT_VIEWS is set butbenl@chromium.org2009-09-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not OS_WIN. Added USE_X11. Set when OS_LINUX or OS_FREEBSD is set. Added USE_BASE_DATA_PACK for base::DataPack usage, set for OS_MACOSX, OS_LINUX or OS_FREEBSD. Added USE_NSS for ... nss (for crypto). Windows and MacOS use platform-specific libraries. All of the above cause slightly odd formulations like: #if defined(OS_WIN) ... #elif defined(USE_BASE_DATA_PACK) ... #endif Possibly should also define USE_DLL_FOR_DATA, etc? Or something? Wrapped various references to struct stat64 and stat64() to use struct stat and stat() for FreeBSD - but a "man stat64" on Linux suggests that we could do the same thing for at least Linux, too, and perhaps eliminate the wrapper? git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25599 0039d316-1c4b-4281-b951-d872f2087c98
* Style changes for readability review.ajwong@chromium.org2009-09-022-411/+487
| | | | | | Review URL: http://codereview.chromium.org/146104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25272 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
* Gyp change to allow overriding of the binaries used based on environment ↵ajwong@chromium.org2009-08-181-2/+6
| | | | | | | | | | | variables. BUG=16779 TEST=none Review URL: http://codereview.chromium.org/172060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23661 0039d316-1c4b-4281-b951-d872f2087c98
* Move to using updated chromium binaries pulled in via platform-specific DEPS.ajwong@chromium.org2009-08-0810-12/+0
| | | | | | | | | BUG=16010,16638,17174 TEST=none Review URL: http://codereview.chromium.org/165193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22853 0039d316-1c4b-4281-b951-d872f2087c98
* Remove pthread from ffmpeg copy stepfbarchard@chromium.org2009-08-071-1/+0
| | | | | | Review URL: http://codereview.chromium.org/164209 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22832 0039d316-1c4b-4281-b951-d872f2087c98
* Binaries for chromium built updated OGG, and reduced in size with O2 and ↵fbarchard@chromium.org2009-08-074-0/+0
| | | | | | | | | | | static pthread lib linked into avcodec. BUG=17174,18466,16010 TEST=play http://people.xiph.org/~tterribe/tmp/sign_irene_cif-3qi.ogg Review URL: http://codereview.chromium.org/164165 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22816 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: preload ffmpeg in the zygote.agl@chromium.org2009-08-051-1/+3
| | | | | | | | | | | | | | | | | | When using the sandbox, the renderer cannot load the ffmpeg shared objects from disk. So we load them in the zygote before the sandbox is started. (Note that this doesn't get media working, but it's a start.) BUG=18329 http://codereview.chromium.org/159841 (Note: relanding. Original landing in r22392, reverted in r22405 due to check-deps failure.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22492 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Linux: preload ffmpeg in the zygote."agl@chromium.org2009-08-041-3/+1
| | | | | | | This reverts commit r22392. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22405 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: preload ffmpeg in the zygote.agl@chromium.org2009-08-041-1/+3
| | | | | | | | | | | | | | | When using the sandbox, the renderer cannot load the ffmpeg shared objects from disk. So we load them in the zygote before the sandbox is started. (Note that this doesn't get media working, but it's a start.) BUG=18329 http://codereview.chromium.org/159841 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22392 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: add use_system_ffmpeg GYP variable.agl@chromium.org2009-07-201-8/+19
| | | | | | | | | | | | | | | | | In r20548, we switched from using a shell script to copy the ffmpeg binaries to the output directory, to using the GYP 'copies' stanza. When built using Scons, any copies for which the source file was missing began to fail. Since Ubuntu policy (and size considerations) prohibit the shipping of the binaries in the source packages of chromium-browser, so add a GYP variable which can be set to inhibit this copying for cases where the source files aren't included. http://codereview.chromium.org/155791 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21093 0039d316-1c4b-4281-b951-d872f2087c98
* Rewrite ffmpeg_binaries target to use GYP built-ins and branding conditions.mmoss@chromium.org2009-07-132-96/+27
| | | | | | | | | BUG=16657 Review URL: http://codereview.chromium.org/149554 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20548 0039d316-1c4b-4281-b951-d872f2087c98
* Add mac and linux binaries for ffmpeg.ajwong@chromium.org2009-07-086-0/+0
| | | | | | | | | BUG=15906 TEST=chromium builds should have video enabled Review URL: http://codereview.chromium.org/155107 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20171 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup resources allocated by FFmpeg to avoid memory and threads leakshclam@chromium.org2009-07-072-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
* Checking in Windows FFmpeg binaries for Chromium.scherkus@chromium.org2009-07-066-10/+34
| | | | | | | | | BUG=15906 TEST=builds of Chromium should now be video/audio enabled Review URL: http://codereview.chromium.org/149165 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19987 0039d316-1c4b-4281-b951-d872f2087c98
* Make FFmpeg delay load settings propagate to all shared libraries and ↵scherkus@chromium.org2009-07-011-8/+8
| | | | | | | | | | | 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
* Fixed typo in ffmpeg.gyp that caused avcodec-52.dll to not get copied.scherkus@chromium.org2009-06-301-1/+1
| | | | | | | | | | TEST=media layout tests should pass again, bots shouldn't be all busted BUG=15664 TBR=glen Review URL: http://codereview.chromium.org/151070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19579 0039d316-1c4b-4281-b951-d872f2087c98
* Add in support for copying the ffmpeg binaries in linux and mac.ajwong@chromium.org2009-06-302-29/+94
| | | | | | Review URL: http://codereview.chromium.org/149121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19570 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r19534 "Add in support for copying the ffmpeg binaries in linux and mac."ajwong@chromium.org2009-06-292-97/+29
| | | | | | Review URL: http://codereview.chromium.org/151044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19538 0039d316-1c4b-4281-b951-d872f2087c98
* Add in support for copying the ffmpeg binaries in linux and mac.ajwong@chromium.org2009-06-292-29/+97
| | | | | | Review URL: http://codereview.chromium.org/149121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19534 0039d316-1c4b-4281-b951-d872f2087c98
* Setting executable bit for third_party/ffmpeg/copy_binaries.shhclam@chromium.org2009-06-271-0/+0
| | | | | | | | TBR=ajwong Review URL: http://codereview.chromium.org/149122 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19450 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor FFmpegVideoDecoder::OnDecode and unittest and add state tracking.ajwong@chromium.org2009-06-222-1/+9
| | | | | | | | 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
* Make the generated stubs weak. Enable the unittests that had conflicting ↵ajwong@chromium.org2009-06-161-1/+6
| | | | | | | | | | symbols. Also move some of the old mocks into their own namespace. They were causing linker confusion due to inlining or something which generated bad test executables that segfaulted. Review URL: http://codereview.chromium.org/126170 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18457 0039d316-1c4b-4281-b951-d872f2087c98
* Change delayload attribute from string to list in gyp fileshclam@chromium.org2009-06-121-1/+5
| | | | | | | | | | Change from string to list so the list can merge correctly. TBR=scherkus Review URL: http://codereview.chromium.org/125059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18294 0039d316-1c4b-4281-b951-d872f2087c98
* Delay loading FFmpeg dlls from the test_shellhclam@chromium.org2009-06-121-0/+5
| | | | | | | | | Make test_shell.vsprops depends on using_ffmpeg.vsprops so it delays loading FFmpeg dlls. Review URL: http://codereview.chromium.org/125015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18231 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Revert r18122: "Reapply ffmpeg changes." (it broke the Linux make ↵tc@google.com2009-06-117-48/+178
| | | | | | | | | | | | build)." This reverts commit r18168 and reapplies r18122. I.e., this reapplies the ffmpeg changes. Review URL: http://codereview.chromium.org/125003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18200 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r18122: "Reapply ffmpeg changes." (it broke the Linux make build).agl@chromium.org2009-06-117-178/+48
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18168 0039d316-1c4b-4281-b951-d872f2087c98
* Define all file handles so if open fails, we can still test for the variable.ajwong@chromium.org2009-06-111-0/+5
| | | | | | Review URL: http://codereview.chromium.org/122013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18133 0039d316-1c4b-4281-b951-d872f2087c98
* Reapply ffmpeg changes. The original review is at ↵ajwong@chromium.org2009-06-117-48/+178
| | | | | | | | http://codereview.chromium.org/118046. Review URL: http://codereview.chromium.org/118444 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18122 0039d316-1c4b-4281-b951-d872f2087c98
* Removing ffmpeg again.ajwong@chromium.org2009-06-096-150/+41
| | | | | | | | Reverting r17992 and r17987. Review URL: http://codereview.chromium.org/119399 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17995 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing include path for windows.ajwong@chromium.org2009-06-091-0/+3
| | | | | | Review URL: http://codereview.chromium.org/119396 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17992 0039d316-1c4b-4281-b951-d872f2087c98
* Reapply ffmpeg changes. The original review is at ↵ajwong@chromium.org2009-06-096-41/+147
| | | | | | | | http://codereview.chromium.org/118046. Review URL: http://codereview.chromium.org/118444 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17987 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting r17820 and r17819 due to mac breakage.ajwong@chromium.org2009-06-066-158/+41
| | | | | | Review URL: http://codereview.chromium.org/119276 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17821 0039d316-1c4b-4281-b951-d872f2087c98
* Fix mac gyp build of ffmpeg to have type 'none'.ajwong@chromium.org2009-06-061-0/+5
| | | | | | Review URL: http://codereview.chromium.org/119275 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17820 0039d316-1c4b-4281-b951-d872f2087c98
* Change ffmpeg.gyp over to use generate_stubs.py.ajwong@chromium.org2009-06-066-41/+153
| | | | | | | | Also reimplement media_posix.cc to call into the generated stub functions instead of having its own hacked together version. Review URL: http://codereview.chromium.org/118046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17819 0039d316-1c4b-4281-b951-d872f2087c98
* Python script for auto-generating stub/def files for a list of signatures.ajwong@chromium.org2009-06-032-0/+1144
| | | | | | | | This python script takes a list of C-style signatures and generates either a windows def file, or a C++ stub file that allows for binding of functions via dlopen/dlsym. This is used to support delay loading in windows and simulate it on posix systems. Review URL: http://codereview.chromium.org/113803 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17534 0039d316-1c4b-4281-b951-d872f2087c98
* Better seeking for <video> and <audio>hclam@chromium.org2009-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There two problems surrouding the seek feature for <video> and <audio>: 1. After each seek, the time goes back and forth until stable, so user has to "fight" the time bar for seeking. 2. When playing an audio file, sounds plays a litte bit and then the play position rewinded and plays again. The cause of above problems: 1. There are demuxed packets and decoded buffers inside decoders and renderers. When seek is requested only demuxer flush its buffers, decoders and renderers still plays a little bit of the old buffer, thus updating the time incorrectly. 2. When playing a media file, WebKit does: 1. load() 2. pause() 3. seek(0.0f) 4. play() Since load() does prerolling internally, there were some decoded buffers in the renderers, and when seek(0.0f) is fired the play position reset to time 0 and decode starts from there again, the internal buffer queue in the renderer would then look like: | 0.0s | | 0.1s | | 0.2s | | 0.0s | | 0.1s | ... Thus playback at the beginning goes back and forth. To solve the seek problems, here's what is done in this CL: 1. All decoders and renderers should receive the seek signal. 2. When seek signal is received, discard all buffers and schedule read again. With this CL, we can now scrub an <audio> tag with the timebar. The downside of this fix is that we don't have prerolling (notice that due to how WebKit starts playing back we didn't preroll anyway...), this should be fixed in another CL. Review URL: http://codereview.chromium.org/113891 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17242 0039d316-1c4b-4281-b951-d872f2087c98
* Make the GUID upper case (so Visual Studio won't try to correctsgk@google.com2009-05-261-1/+1
| | | | | | | | | it by asking to write out a "modified" chrome.sln). BUG=none TEST=none Review URL: http://codereview.chromium.org/113860 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16951 0039d316-1c4b-4281-b951-d872f2087c98
* Adding ffmpeg_binaries target which copies FFmpeg binaries alongside ↵ajwong@chromium.org2009-05-232-1/+47
| | | | | | | | chrome.dll if present. Review URL: http://codereview.chromium.org/114048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16826 0039d316-1c4b-4281-b951-d872f2087c98
* New FFmpeg public API headers to match our source tarball in deps.scherkus@chromium.org2009-05-229-194/+382
| | | | | | Review URL: http://codereview.chromium.org/113748 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16771 0039d316-1c4b-4281-b951-d872f2087c98
* Temporary fix for MP3 decoding by duplicating packets before handing them to ↵scherkus@chromium.org2009-05-201-0/+1
| | | | | | | | | | the decoder. Turns out packets filled out by av_read_frame() were being modifying on subsequent calls to av_read_frame(). Might be a case of setting the data pointer to internal memory as opposed to allocated memory. Review URL: http://codereview.chromium.org/115561 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16525 0039d316-1c4b-4281-b951-d872f2087c98
* Use av_rescale_q() for converting FFmpeg timestamps to base::TimeDelta ↵scherkus@chromium.org2009-05-201-0/+1
| | | | | | | | | | | | (second attempt). Previously we were using integer math to convert to microseconds, but depending on the frame rate and packet size we could introduce enough error that could accumulate and introduce audio/video synchronization drift. av_rescale_q() is a simple function but is designed to minimize error as much as possible. Second attempt since I forgot to manually resolve av_rescale_q() for unittests. Review URL: http://codereview.chromium.org/113619 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16514 0039d316-1c4b-4281-b951-d872f2087c98
* Revert change 16453 because it broke the build.nsylvain@chromium.org2009-05-201-1/+0
| | | | | | Review URL: http://codereview.chromium.org/113615 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16459 0039d316-1c4b-4281-b951-d872f2087c98