summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from ↵jrg@chromium.org2010-03-128-54/+60
| | | | | | | | | | | | | | | | | | | | | 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-128-60/+54
| | | | | | | | | | | | | 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
* win: string_util.h -> utf_string_conversions.h fix.jhawkins@google.com2010-03-113-3/+3
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/830002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41292 0039d316-1c4b-4281-b951-d872f2087c98
* Move wtl from chrome/third_party to third_party/. Thistony@chromium.org2010-03-092-3/+3
| | | | | | | | | | | breaks dependencies on chrome from webkit, app, views and base. BUG=37649 TEST=compiles Review URL: http://codereview.chromium.org/699001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41001 0039d316-1c4b-4281-b951-d872f2087c98
* media: string_util.h -> utf_string_conversions.h fix.jhawkins@chromium.org2010-03-063-3/+3
| | | | | | | | 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
* Fix crashing in FFmpegGlueTest.Write and friendshclam@chromium.org2010-03-051-20/+15
| | | | | | | | | | | | | | | | BUG=36037 TEST=FFmpegGlueTest.* runs on build bot FFmpegGlueTest.Write was crashing on build bots due to that it has dependencies on previous test to run. And strangely the build bot didn't run all the test cases, resulting the crash. This is fixed by extracting the initialization step and putting it into a common test setup task. Review URL: http://codereview.chromium.org/668034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40800 0039d316-1c4b-4281-b951-d872f2087c98
* omx_unittests to load OpenMAX library dynamicallyhclam@chromium.org2010-03-052-1/+8
| | | | | | | | Now OpenMAX library has to be loaded dynamically. Review URL: http://codereview.chromium.org/667010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40693 0039d316-1c4b-4281-b951-d872f2087c98
* Fix DecoderBaseTest in media testhclam@chromium.org2010-03-031-35/+59
| | | | | | | | | | It was failing on XP (dbg) because of weird name clashing of class. BUG=32947 BUG=37139 Review URL: http://codereview.chromium.org/660355 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40566 0039d316-1c4b-4281-b951-d872f2087c98
* Fix problem linking with OpenMAX IL stubhclam@chromium.org2010-03-031-0/+1
| | | | | | | | | The dependency on OpenMAX IL stub is off. It creates failure depending on the build order. Review URL: http://codereview.chromium.org/665010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40551 0039d316-1c4b-4281-b951-d872f2087c98
* Fix license headers in X11/GL/GLES video renderers.scherkus@chromium.org2010-03-033-9/+9
| | | | | | | | | | TBR=piman BUG=none TEST=none Review URL: http://codereview.chromium.org/666006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40542 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing some subtle issues with player_x11 and GL/GLES video renderers.scherkus@chromium.org2010-03-035-58/+56
| | | | | | | | | BUG=n/a TEST=n/a Review URL: http://codereview.chromium.org/665008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40539 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg better message for error on opening file if the file opens but the ↵fbarchard@chromium.org2010-03-033-13/+43
| | | | | | | | | | | 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
* Generate stubs for OpenMAX ILhclam@chromium.org2010-03-025-3/+57
| | | | | | | | | | | | Generate stubs for OpenMAX IL so we don't need a real OpenMAX library for building. The actual library is loaded during runtime. TEST=Build is green TEST=Running omx_test works on hardware with OpenMAX support Review URL: http://codereview.chromium.org/661135 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40418 0039d316-1c4b-4281-b951-d872f2087c98
* Using bitstream filters if OpenMAX is enabledhclam@chromium.org2010-03-013-24/+51
| | | | | | | | | | | | | | | Use FFmpeg bitstream filters if OpenMAX is enabled. The following filters are used: 1. h264_mp4toannexb 2. mpeg4video_es 3. vc1_asftorcv 4. vc1_asftoannexg TEST=run player_x11 with --enable-openmax and the above formats work Review URL: http://codereview.chromium.org/661059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40306 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the tree after r40232.jhawkins@chromium.org2010-02-281-1/+1
| | | | | | | | | TBR=hclam BUG=none TEST=none Review URL: http://codereview.chromium.org/661254 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40233 0039d316-1c4b-4281-b951-d872f2087c98
* Disable a media unit testhclam@chromium.org2010-02-271-1/+1
| | | | | | | | | | DecoderBaseTest.FlowControl is crashing on XP (dbg). TBR=scherkus, nsylvain Review URL: http://codereview.chromium.org/661253 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40232 0039d316-1c4b-4281-b951-d872f2087c98
* Fix flow control in media::DecoderBasehclam@chromium.org2010-02-273-13/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | The flow control in media::DecoderBase was incorrect because it reads too aggressively to the demuxer stream and failed some DCHECKs when asynchronous decoding like OpenMAX is used. An example of a failing case is: Action Pending Read Pending Decode Read Request Read 1 0 1 Read 2 0 2 ReadComplete 1 1 2 ReadComplete 0 2 2 DecodeComplete 1 1 1 DecodeComplete 1 0 0 Because of the aggressive read in OnDecodeComplete in DecoderBase. Even if all the read requests are fulfiled there is still on pending read issued to the demuxer stream. This mismatch is fixed in this patch. BUG=32947 TEST=media_unittests Review URL: http://codereview.chromium.org/660170 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40189 0039d316-1c4b-4281-b951-d872f2087c98
* Prevent integer underflow when calculating next_fill_time_ms in ↵scherkus@chromium.org2010-02-251-5/+14
| | | | | | | | | | | AlsaPcmOutputStream. BUG=35819 TEST=play any content containing audio under linux, the sound should no longer cut out Review URL: http://codereview.chromium.org/660066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40070 0039d316-1c4b-4281-b951-d872f2087c98
* Some fixes to player_x11 when OpenMAX is enabledhclam@chromium.org2010-02-205-18/+19
| | | | | | | | | | | - remove the --enable-h264-annexb-filter flag - OmxVideoDecodeEngine have some problems dealing EOS buffers TEST=player_x11 runs with --enable-openmax Review URL: http://codereview.chromium.org/652008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39542 0039d316-1c4b-4281-b951-d872f2087c98
* Fix misuse of OmxCodechclam@chromium.org2010-02-191-1/+1
| | | | | | | | | | | | In the last refactoring, OmxCodec was used incorrectly as NULL parameter was passed in. Using the correct parameter now. TEST=player_x11 --enable-openmax should work TBR=scherkus Review URL: http://codereview.chromium.org/651068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39505 0039d316-1c4b-4281-b951-d872f2087c98
* Pulled out Callback code into base/callback.h. This is the first step ↵akalin@chromium.org2010-02-1928-31/+55
| | | | | | | | | | | | | towards redoing the Callback interfaces. Added and removed includes as needed. BUG=35223 TEST=trybots Review URL: http://codereview.chromium.org/646061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39419 0039d316-1c4b-4281-b951-d872f2087c98
* Solaris: Second set adding in Solaris as an OS optionevan@chromium.org2010-02-181-2/+2
| | | | | | | | | | TEST=compiles BUG=30101 Patch by James Choi <jchoi42@pha.jhu.edu>. Review URL: http://codereview.chromium.org/606075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39362 0039d316-1c4b-4281-b951-d872f2087c98
* gles2: fix stride supportpiman@chromium.org2010-02-171-3/+26
| | | | | | Review URL: http://codereview.chromium.org/626009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39283 0039d316-1c4b-4281-b951-d872f2087c98
* Add comment to unit tests previously disabledhclam@chromium.org2010-02-171-0/+8
| | | | | | | | | | | | | FFmpegGlueTest and friends are crashing on the build bots. Some of them are disabled and need comment in the code to indicate the bug number. BUG=36037 TBR=scherkus, finnur Review URL: http://codereview.chromium.org/619012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39253 0039d316-1c4b-4281-b951-d872f2087c98
* Disable FFmpegGlueTest.Write and friendshclam@chromium.org2010-02-171-4/+4
| | | | | | | | | | | | FFmpegGlueTest.Write starts to crash. Can't fix it shortly so disable it and its friends. BUG=36037 TBR=finnur, scherkus Review URL: http://codereview.chromium.org/624001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39252 0039d316-1c4b-4281-b951-d872f2087c98
* API to allow strategy class to work on the output buffer of OpenMAXhclam@chromium.org2010-02-1712-147/+1343
| | | | | | | | | | | | | | Added interface of OmxOutputSink to interact with OmxCodec to perform buffer negotiation and buffer read signaling. TEST=media_unittests --gtest_filter=Omx* BUG=32753 BUG=32754 BUG=32870 Review URL: http://codereview.chromium.org/593047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39247 0039d316-1c4b-4281-b951-d872f2087c98
* media: remove redundant gyp excludesevan@chromium.org2010-02-171-24/+0
| | | | | | | | | | I moved all of these general patterns to common.gypi. Also rearrange the common.gypi patterns to cover more common Linux patterns. Review URL: http://codereview.chromium.org/608032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39236 0039d316-1c4b-4281-b951-d872f2087c98
* Software performance qualification.fbarchard@chromium.org2010-02-132-0/+474
| | | | | | | | | BUG=32758 TEST=build this test in release mode, get test data (see source), and run the test. Review URL: http://codereview.chromium.org/552231 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38989 0039d316-1c4b-4281-b951-d872f2087c98
* Fix player_x11 so it works properly with GLEShclam@chromium.org2010-02-132-68/+85
| | | | | | | | | | | | | | | Fixed the following two things: 1. Some drivers doesn't like EGL context switching between threads. So initialize GLES lazily in the paint call. 2. glUniformMatrix3fv() failed because some drivers doesn't want to transpose the matrix so we do it ourself. TEST=player_x11 works with GLES Review URL: http://codereview.chromium.org/596104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38986 0039d316-1c4b-4281-b951-d872f2087c98
* Implement GLES video renderer in player_x11hclam@chromium.org2010-02-128-316/+910
| | | | | | | | | | This patch does the following: 1. Split the implementation of X11 and GL into two separate files 2. Add implementation of GLES render Review URL: http://codereview.chromium.org/596055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38867 0039d316-1c4b-4281-b951-d872f2087c98
* Fix using of OmxInputBufferhclam@chromium.org2010-02-101-15/+12
| | | | | | | | | | OmxInputBuffer is now ref counted, but some code still try to delete it explicitly. This delete call is hidden in a template function so it was hard to find! Review URL: http://codereview.chromium.org/601015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38571 0039d316-1c4b-4281-b951-d872f2087c98
* Unit test for OmxInputBufferhclam@chromium.org2010-02-092-0/+68
| | | | | | | | | TEST=media_unittest --gtest_filter=OmxInputBuffer.* BUG=32753 Review URL: http://codereview.chromium.org/580012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38502 0039d316-1c4b-4281-b951-d872f2087c98
* Fix usage of OmxInputBuffer in OpenMAX code since it's refcounted.hclam@chromium.org2010-02-093-13/+15
| | | | | | | | | | In last refactoring of OpenMAX code, OmxInputBuffer was changed to refcounted but it wasn't probably used. This is now fixed. Unittest is coming in another patch. Review URL: http://codereview.chromium.org/596018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38498 0039d316-1c4b-4281-b951-d872f2087c98
* linux: build with -Wextraevan@chromium.org2010-02-051-7/+7
| | | | | | | | | | | | 95% of this is removing "const" from return types, but turning this on found one bug! (A "for" loop that expected its iterator to go negative but which was using an unsigned type.) BUG=34160 Review URL: http://codereview.chromium.org/570012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38266 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor media::InputBuffer to consolidate it with media::Bufferhclam@chromium.org2010-02-058-46/+49
| | | | | | | | | | | | Rename media::InputBuffer to media::OmxInputBuffer and inherit from media::Buffer. Also provide the timestamp to media::OmxCodec. TEST=omx_test BUG=32753 Review URL: http://codereview.chromium.org/577012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38247 0039d316-1c4b-4281-b951-d872f2087c98
* Remove size_t from audio IPC code.jam@chromium.org2010-02-0526-242/+244
| | | | | | | The change got to this size because I had to modify the surrounding code (I didn't want to just cast at the last minute). Review URL: http://codereview.chromium.org/577006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38192 0039d316-1c4b-4281-b951-d872f2087c98
* Refactoring of media::OmxCodec to split configuration of IO portshclam@chromium.org2010-02-0412-529/+704
| | | | | | | | | | | | | Split encoder/decoder configuration of media::OmxCodec into strategy classes. This will help OmxCodec free from any codec specific bits. Also included the refactoring of omx_test to split the file output part to a separate class. Review URL: http://codereview.chromium.org/566036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38121 0039d316-1c4b-4281-b951-d872f2087c98
* Use FFmpeg demuxer and bitstream converters in omx_testhclam@chromium.org2010-01-306-243/+579
| | | | | | | | | | | | | | | | omx_test now uses FFmpeg demuxer and bistream converters. It can now parse mp4 files and convert them to H264 Annex B stream for input to OpenMAX decoder. Also refactored the file to move different reader methods to separate classes. BUG=32753 TEST=this is a test by itself Review URL: http://codereview.chromium.org/556032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37592 0039d316-1c4b-4281-b951-d872f2087c98
* Fix libssl.so link failures on Linux shared lib build.mmoss@google.com2010-01-271-0/+8
| | | | | | | | | | | | http://build.chromium.org/buildbot/waterfall.fyi/builders/Chromium%20Linux%20Builder%20(dbg-shlib)/builds/6369/steps/compile/logs/stdio This has been broken for a long time, I think basically since Linux switched to use_system_ssl=0. Also fix a couple unrelated shared lib failures in media. Review URL: http://codereview.chromium.org/553097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37256 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor some code that depends on FFmpeghclam@chromium.org2010-01-2624-60/+60
| | | | | | | | | | | | | 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 OpenMAX for video decoding in the media pipelinehclam@chromium.org2010-01-235-48/+111
| | | | | | | | | | | | | This patch is to fix some issues when using OpenMAX video decoder in the media pipeline. It will enable player_x11 to decode using OpenMAX. This still requires some more work to enable Chrome to use OpenMAX for decoding. Review URL: http://codereview.chromium.org/549124 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36936 0039d316-1c4b-4281-b951-d872f2087c98
* More unit tests for OpenMAXhclam@chromium.org2010-01-221-22/+95
| | | | | | | | | | | | | | | Added the following test cases: - Transition to executing state and back - Free component handle during executing state to expose leakage. - Request component handle using callbacks struct on stack and clear. This exposes bugs in library that doesn't copy the struct. TEST=omx_unittests BUG=NONE Review URL: http://codereview.chromium.org/548095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36912 0039d316-1c4b-4281-b951-d872f2087c98
* linux: add display option to media_bench, using GLpiman@chromium.org2010-01-224-54/+310
| | | | | | Review URL: http://codereview.chromium.org/523120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36886 0039d316-1c4b-4281-b951-d872f2087c98
* Switches to enable OpenMAX for video decoding in Chromehclam@chromium.org2010-01-224-5/+9
| | | | | | | | | Added a --enable-openmax switch to enable OpenMAX for video decoding. Review URL: http://codereview.chromium.org/555046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36883 0039d316-1c4b-4281-b951-d872f2087c98
* Unit tests for testing OpenMAX supporthclam@chromium.org2010-01-221-24/+331
| | | | | | | | | | | | | Added the following test cases: 1. GetComponentsByRole() now works with valid roles 2. GetHandle() / FreeHandle() pair on video decoder component 3. General configuration of video decoder component TEST=omx_unittests Review URL: http://codereview.chromium.org/550051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36834 0039d316-1c4b-4281-b951-d872f2087c98
* Video and OpenMAX: add role name to replace vendor specific component name.hclam@chromium.org2010-01-214-36/+106
| | | | | | | | | | | | | | | | | | | Add role name to replace vendor specific component name. Remove vendor specific Open MAX component name. use role name to find the appropriate component name in current OMX core library. We only pick the first component name returned and ignore all the other components with the same role. BUG=none TEST=none Reviewed: http://codereview.chromium.org/551084/show Submitted for: jiesun@chromium.org Review URL: http://codereview.chromium.org/546098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36716 0039d316-1c4b-4281-b951-d872f2087c98
* Separate input data into NALUs for testing OpenMAXhclam@chromium.org2010-01-201-30/+103
| | | | | | | | | | Feed OpenMAX H264 decoder into chunks of NALUs. That will solve some compability issues with decoders that require NALUs as boundary. Review URL: http://codereview.chromium.org/546018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36686 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build caused by omx_testhclam@chromium.org2010-01-151-0/+2
| | | | | | | | | | TBR=scherkus Initialize struct variables by memset()ing them. Review URL: http://codereview.chromium.org/552017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36401 0039d316-1c4b-4281-b951-d872f2087c98
* enable simple encoding in omx_codechclam@chromium.org2010-01-155-267/+585
| | | | | | | | | | | | | | | | | | | 1. add Format callback to notify media format change. 2. add timestamp to encoder input sample. 3. add loop count to input streams. 4. add enable-csc in encoder path. 5. measure initial delay 6. move color space conversion inside TestApp.(according to Alpha). 7. copy component name in OmxCodec ( Andrew ). BUG=31804 Submitted for: jiesun@chromium.org Reviewed: http://codereview.chromium.org/519084/show Review URL: http://codereview.chromium.org/552016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36400 0039d316-1c4b-4281-b951-d872f2087c98
* A simple sample video for decoder testing.fbarchard@chromium.org2010-01-131-0/+0
| | | | | | | | | BUG=30789 TEST=play this video with media_bench and ensure content decodes quickly and correctly. Review URL: http://codereview.chromium.org/545034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36174 0039d316-1c4b-4281-b951-d872f2087c98