summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Rename media statistics APIs to match webkit renaming.sjl@chromium.org2011-02-253-0/+9
| | | | | | | | | | | Also, set expectations for statistics callback mock in unittests the lack of which caused "uninteresting calls" turds in the mock output. This mock was introduced in the original patch for media statistics (http://codereview.chromium.org/6246091/). BUG=71255, 73464 TEST=media_unittests Review URL: http://codereview.chromium.org/6549030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76092 0039d316-1c4b-4281-b951-d872f2087c98
* Benchmark tool for tile renderinghclam@chromium.org2011-02-222-0/+265
| | | | | | | | | | | A tool for using tiles to render an image. BUG=None TEST=None Review URL: http://codereview.chromium.org/6542045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75607 0039d316-1c4b-4281-b951-d872f2087c98
* Retry: Move MockFFmpeg instance setting into the constructor/destructor.scherkus@chromium.org2011-02-199-191/+106
| | | | | | | | | | | Previously tests had to manually call MockFFmpeg::set() during test setup and teardown. Now that operation is handled automatically via scoping. BUG=72933 TEST=media_unittests Review URL: http://codereview.chromium.org/6539021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75472 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 75444 - Move MockFFmpeg instance setting into the constructor/destructor.scherkus@chromium.org2011-02-189-106/+196
| | | | | | | | | | | | | Previously tests had to manually call MockFFmpeg::set() during test setup and teardown. Now that operation is handled automatically via scoping. BUG=72933 TEST=media_unittests Review URL: http://codereview.chromium.org/6539021 TBR=scherkus@chromium.org Review URL: http://codereview.chromium.org/6541037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75448 0039d316-1c4b-4281-b951-d872f2087c98
* Move MockFFmpeg instance setting into the constructor/destructor.scherkus@chromium.org2011-02-189-196/+106
| | | | | | | | | | Previously tests had to manually call MockFFmpeg::set() during test setup and teardown. Now that operation is handled automatically via scoping. BUG=72933 TEST=media_unittests Review URL: http://codereview.chromium.org/6539021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75444 0039d316-1c4b-4281-b951-d872f2087c98
* Fix chromium-style compile error that got in the tree since yesterday.erg@google.com2011-02-172-0/+7
| | | | | | | | | BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6532008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75330 0039d316-1c4b-4281-b951-d872f2087c98
* Delete the StatisticsCallback passed to media filter mocks.scherkus@chromium.org2011-02-171-3/+4
| | | | | | | | | | Patch by sjl@chromium.org: http://codereview.chromium.org/6519024/ BUG=73132 TEST=media_unittests under heapcheck and valgrind to make sure the new leak has gone. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75222 0039d316-1c4b-4281-b951-d872f2087c98
* Remove theoretical race condition between Stop() and Initialize().scherkus@chromium.org2011-02-171-5/+5
| | | | | | | | | | | | | | | | | | | Initialize() could acquire lock_ and launch a new thread_ while Stop() had un-lock_'d and was joining the old thread. If that happened then Stop() would silently leak the new thread when it re-acquired lock_ and set thread_ to NULL. This also removes a cheap but unnecessary lock/unlock pair and clarifies the function a bit. Tested: built & ran media_unittests. Patch by fischman@chromium.org: http://codereview.chromium.org/6531012/ TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75212 0039d316-1c4b-4281-b951-d872f2087c98
* Bug-fixes for AudioInputStream:scherkus@chromium.org2011-02-162-2/+3
| | | | | | | | | | | | | | | - s/scoped_ptr/scoped_array/ for new[]'d memory; this fixes a bug valgrind found and which can cause memory corruption (as delete was being called instead of delete[] before, which can confuse the allocator). - Fix memory leak where AlsaPcmInputStreams would fail to be deleted. Patch by fischman@chromium.org: http://codereview.chromium.org/6523027/ BUG=none TEST=valgrind media_unittests stops complaining about leaking the AIS and using delete instead of delete[]. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75156 0039d316-1c4b-4281-b951-d872f2087c98
* Implement webkit media metrics in chromium.scherkus@chromium.org2011-02-1626-88/+275
| | | | | | | | | | | | | | | This implements the chromium side of the webkit media statistics feature. A followup cl (in webkit) will wire the two sides together. Patch by sjl@chromium.org: http://codereview.chromium.org/6246091/ BUG=71255 TEST=media_unittests git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75050 0039d316-1c4b-4281-b951-d872f2087c98
* Revised SSE2 color conversionhclam@chromium.org2011-02-141-89/+107
| | | | | | | | | | | | | | | | | | | | I discovered there's average and shuffle instructions which simplify the calculations of UV components. Also the extract instruction was very useful. In terms of the algorithm I rearranged the memory reads to be sequential. Overall this gives about 10% improvement on 64-bits machine. On 32-bits machine this gives 20% improvement. If compiled as 32-bits code this is quite slow compared to 64-bits, about 2x slow down. So working on MMX code will be a direction for improvement. BUG=None TEST=I tried it, it looks right. Review URL: http://codereview.chromium.org/6488014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74827 0039d316-1c4b-4281-b951-d872f2087c98
* Remove NullAudioManager.sergeyu@chromium.org2011-02-141-27/+0
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/6473021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74779 0039d316-1c4b-4281-b951-d872f2087c98
* Fix crash in WinAudioTest.PCMWaveStreamOpenLimit.robertshield@chromium.org2011-02-131-2/+3
| | | | | | | | | BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/6487024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74745 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 74590 - Disable AudioOutputControllerTest.CreateAndClose since it ↵sergeyu@chromium.org2011-02-121-5/+0
| | | | | | | | | | | | | | crashes on Windows in release. BUG=72718 TEST=none Review URL: http://codereview.chromium.org/6489032 TBR=maruel@chromium.org Review URL: http://codereview.chromium.org/6513007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74729 0039d316-1c4b-4281-b951-d872f2087c98
* Disable media_unittests on Windowshclam@chromium.org2011-02-121-0/+47
| | | | | | | | | | | Exclude test cases on windows. BUG=72790 TEST=Windows bots are green Review URL: http://codereview.chromium.org/6507013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74714 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 74700 - Revert the "out-of-lining of test code" change within src/mediansylvain@chromium.org2011-02-127-15/+47
| | | | | | | | | | | | | to see if it fixes the gmock crashes we've been seeing since the change has been made. The original change was split between r74660, r74168, r74059 Review URL: http://codereview.chromium.org/6473006 TBR=nsylvain@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74712 0039d316-1c4b-4281-b951-d872f2087c98
* Revert the "out-of-lining of test code" change within src/mediansylvain@chromium.org2011-02-117-47/+15
| | | | | | | | | | | to see if it fixes the gmock crashes we've been seeing since the change has been made. The original change was split between r74660, r74168, r74059 Review URL: http://codereview.chromium.org/6473006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74700 0039d316-1c4b-4281-b951-d872f2087c98
* Resubmit - Use SSE2 block differ for chromotinghclam@chromium.org2011-02-111-1/+2
| | | | | | | | | | | | | Put the SSE2 block differ code back in. TBR=dhollowa BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/6501005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74671 0039d316-1c4b-4281-b951-d872f2087c98
* Continuing with the out-of-lining of test code.erg@google.com2011-02-112-11/+16
| | | | | | | | | BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6485015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74660 0039d316-1c4b-4281-b951-d872f2087c98
* clang: Fix several -Woverloaded-virtual warnings.thakis@chromium.org2011-02-111-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Real bugs: net/http/http_network_transaction_unittest.cc:273:16:error: 'net::CaptureGroupNameSocketPool<net::HttpProxyClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual] virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_network_transaction_unittest.cc:310:1: note: in instantiation of template class 'net::CaptureGroupNameSocketPool<net::HttpProxyClientSocketPool>' requested here CaptureGroupNameHttpProxySocketPool::CaptureGroupNameSocketPool( ^ In file included from ./net/http/http_network_session_peer.h:10: ./net/http/http_proxy_client_socket_pool.h:200:16: note: hidden overloaded virtual function 'net::HttpProxyClientSocketPool::ReleaseSocket' declared here virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_network_transaction_unittest.cc:273:16:error: 'net::CaptureGroupNameSocketPool<net::SSLClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual] virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_network_transaction_unittest.cc:316:1: note: in instantiation of template class 'net::CaptureGroupNameSocketPool<net::SSLClientSocketPool>' requested here CaptureGroupNameSSLSocketPool::CaptureGroupNameSocketPool( ^ In file included from ./net/http/http_network_session_peer.h:12: ./net/socket/ssl_client_socket_pool.h:208:16: note: hidden overloaded virtual function 'net::SSLClientSocketPool::ReleaseSocket' declared here virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_network_transaction_unittest.cc:273:16:error: 'net::CaptureGroupNameSocketPool<net::TCPClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual] virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_network_transaction_unittest.cc:5511:13: note: in instantiation of template class 'net::CaptureGroupNameSocketPool<net::TCPClientSocketPool>' requested here new CaptureGroupNameTCPSocketPool(NULL, NULL); ^ In file included from ./net/socket/socket_test_util.h:34: ./net/socket/tcp_client_socket_pool.h:134:16: note: hidden overloaded virtual function 'net::TCPClientSocketPool::ReleaseSocket' declared here virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_network_transaction_unittest.cc:273:16:error: 'net::CaptureGroupNameSocketPool<net::SOCKSClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual] virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_network_transaction_unittest.cc:5630:13: note: in instantiation of template class 'net::CaptureGroupNameSocketPool<net::SOCKSClientSocketPool>' requested here new CaptureGroupNameSOCKSSocketPool(NULL, NULL); ^ In file included from ./net/http/http_network_session_peer.h:11: ./net/socket/socks_client_socket_pool.h:133:16: note: hidden overloaded virtual function 'net::SOCKSClientSocketPool::ReleaseSocket' declared here virtual void ReleaseSocket(const std::string& group_name, ^ CXX(target) out/Debug/obj.target/net_unittests/net/http/http_response_body_drainer_unittest.o 4 errors generated. net/http/http_stream_factory_unittest.cc:126:16:error: 'net::<anonymous namespace>::CapturePreconnectsSocketPool<net::HttpProxyClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual] virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_stream_factory_unittest.cc:170:1: note: in instantiation of template class 'net::<anonymous>::CapturePreconnectsSocketPool<net::HttpProxyClientSocketPool>' requested here CapturePreconnectsHttpProxySocketPool::CapturePreconnectsSocketPool( ^ In file included from ./net/http/http_network_session_peer.h:10: ./net/http/http_proxy_client_socket_pool.h:200:16: note: hidden overloaded virtual function 'net::HttpProxyClientSocketPool::ReleaseSocket' declared here virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_stream_factory_unittest.cc:126:16:error: 'net::<anonymous namespace>::CapturePreconnectsSocketPool<net::SSLClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual] virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_stream_factory_unittest.cc:176:1: note: in instantiation of template class 'net::<anonymous>::CapturePreconnectsSocketPool<net::SSLClientSocketPool>' requested here CapturePreconnectsSSLSocketPool::CapturePreconnectsSocketPool( ^ In file included from ./net/http/http_network_session_peer.h:12: ./net/socket/ssl_client_socket_pool.h:208:16: note: hidden overloaded virtual function 'net::SSLClientSocketPool::ReleaseSocket' declared here virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_stream_factory_unittest.cc:126:16:error: 'net::<anonymous namespace>::CapturePreconnectsSocketPool<net::TCPClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual] virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_stream_factory_unittest.cc:188:13: note: in instantiation of template class 'net::<anonymous>::CapturePreconnectsSocketPool<net::TCPClientSocketPool>' requested here new CapturePreconnectsTCPSocketPool( ^ In file included from ./net/socket/socket_test_util.h:34: ./net/socket/tcp_client_socket_pool.h:134:16: note: hidden overloaded virtual function 'net::TCPClientSocketPool::ReleaseSocket' declared here virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_stream_factory_unittest.cc:126:16:error: 'net::<anonymous namespace>::CapturePreconnectsSocketPool<net::SOCKSClientSocketPool>::ReleaseSocket' hides overloaded virtual function [-Woverloaded-virtual] virtual void ReleaseSocket(const std::string& group_name, ^ net/http/http_stream_factory_unittest.cc:237:13: note: in instantiation of template class 'net::<anonymous>::CapturePreconnectsSocketPool<net::SOCKSClientSocketPool>' requested here new CapturePreconnectsSOCKSSocketPool( ^ In file included from net/http/http_stream_factory_unittest.cc:17: In file included from ./net/http/http_network_session_peer.h:11: ./net/socket/socks_client_socket_pool.h:133:16: note: hidden overloaded virtual function 'net::SOCKSClientSocketPool::ReleaseSocket' declared here virtual void ReleaseSocket(const std::string& group_name, ^ CXX(target) out/Debug/obj.target/net_unittests/net/http/http_vary_data_unittest.o 4 errors generated. make: *** [out/Debug/obj.target/net_unittests/net/http/http_stream_factory_unittest.o] Error 1 media/audio/linux/alsa_output_unittest.cc:83:3:error: 'MockAudioManagerLinux::MakeAudioInputStream' hides overloaded virtual function [-Woverloaded-virtual] MOCK_METHOD5(MakeAudioInputStream, AudioInputStream*( ^ In file included from media/audio/linux/alsa_output_unittest.cc:12: In file included from ./testing/gmock/include/gmock/gmock.h:61: testing/gmock/include/gmock/gmock-generated-function-mockers.h:632:28: note: instantiated from: ^ media/audio/linux/alsa_output_unittest.cc:83:3: note: instantiated from: MOCK_METHOD5(MakeAudioInputStream, AudioInputStream*( ^ media/audio/linux/alsa_output_unittest.cc:83:16: note: instantiated from: MOCK_METHOD5(MakeAudioInputStream, AudioInputStream*( ^ In file included from media/audio/linux/alsa_output_unittest.cc:9: ./media/audio/linux/audio_manager_linux.h:30:29: note: hidden overloaded virtual function 'AudioManagerLinux::MakeAudioInputStream' declared here virtual AudioInputStream* MakeAudioInputStream(AudioParameters params); ^ CXX(target) out/Debug/obj.target/media_unittests/media/base/data_buffer_unittest.o CXX(target) out/Debug/obj.target/media_unittests/media/base/djb2_unittest.o 1 error generated. No bug, just confusing: In file included from webkit/plugins/npapi/test/plugin_schedule_timer_test.cc:5: ./webkit/plugins/npapi/test/plugin_schedule_timer_test.h:59:8:error: 'NPAPIClient::ScheduleTimerTest::HandleEvent' hides overloaded virtual function [-Woverloaded-virtual] void HandleEvent(int event_index); ^ In file included from webkit/plugins/npapi/test/plugin_schedule_timer_test.cc:5: In file included from ./webkit/plugins/npapi/test/plugin_schedule_timer_test.h:9: ./webkit/plugins/npapi/test/plugin_test.h:43:19: note: hidden overloaded virtual function 'NPAPIClient::PluginTest::HandleEvent' declared here virtual int16 HandleEvent(void* event); ^ 1 error generated. make: *** [out/Debug/obj.target/npapi_test_plugin/webkit/plugins/npapi/test/plugin_schedule_timer_test.o] Error 1 CXX(target) out/Debug/obj.target/npapi_test_plugin/webkit/plugins/npapi/test/plugin_private_test.o CXX(target) out/Debug/obj.target/npapi_test_plugin/webkit/plugins/npapi/test/plugin_test_factory.o In file included from webkit/plugins/npapi/test/plugin_test_factory.cc:17: ./webkit/plugins/npapi/test/plugin_schedule_timer_test.h:59:8:error: 'NPAPIClient::ScheduleTimerTest::HandleEvent' hides overloaded virtual function [-Woverloaded-virtual] void HandleEvent(int event_index); ^ In file included from webkit/plugins/npapi/test/plugin_test_factory.cc:7: In file included from ./webkit/plugins/npapi/test/plugin_arguments_test.h:8: ./webkit/plugins/npapi/test/plugin_test.h:43:19: note: hidden overloaded virtual function 'NPAPIClient::PluginTest::HandleEvent' declared here virtual int16 HandleEvent(void* event); ^ 1 error generated. BUG=72205 TEST=none Review URL: http://codereview.chromium.org/6503001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74642 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 74571 - Use SSE2 block differ for chromotingdhollowa@chromium.org2011-02-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | We have the SSE2 lying around in the tree just never being used. This will allow us to use it. A number of Windows bots have gone red in media_tests on the waterfall: http://build.chromium.org/p/chromium/builders/XP%20Tests%20%281%29 http://build.chromium.org/p/chromium/builders/XP%20Tests%20%281%29/builds/501/steps/media_unittests/logs/stdio This seems to be related to r74571. So am reverting to see. BUG=None TEST=Chromoting to a host machine and the diff will work correctly Review URL: http://codereview.chromium.org/6469022 TBR=hclam@chromium.org Review URL: http://codereview.chromium.org/6502002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74630 0039d316-1c4b-4281-b951-d872f2087c98
* Disable AudioOutputControllerTest.CreateAndClose since it crashes on Windows ↵maruel@chromium.org2011-02-111-0/+5
| | | | | | | | | | | in release. BUG=72718 TEST=none Review URL: http://codereview.chromium.org/6489032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74590 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 74583 - Revert 74571 - Use SSE2 block differ for chromotingfinnur@chromium.org2011-02-111-1/+2
| | | | | | | | | | | | | | | | | | | | (Quick test to see if it is the cause of crashes in media_unittests) (Test showed this CL is not to blame) We have the SSE2 lying around in the tree just never being used. This will allow us to use it. BUG=None TEST=Chromoting to a host machine and the diff will work correctly Review URL: http://codereview.chromium.org/6469022 TBR=hclam@chromium.org Review URL: http://codereview.chromium.org/6488023 TBR=finnur@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74588 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 74571 - Use SSE2 block differ for chromotingfinnur@chromium.org2011-02-111-2/+1
| | | | | | | | | | | | | | | | | (Quick test to see if it is the cause of crashes in media_unittests) We have the SSE2 lying around in the tree just never being used. This will allow us to use it. BUG=None TEST=Chromoting to a host machine and the diff will work correctly Review URL: http://codereview.chromium.org/6469022 TBR=hclam@chromium.org Review URL: http://codereview.chromium.org/6488023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74583 0039d316-1c4b-4281-b951-d872f2087c98
* Use SSE2 block differ for chromotinghclam@chromium.org2011-02-111-1/+2
| | | | | | | | | | | | We have the SSE2 lying around in the tree just never being used. This will allow us to use it. BUG=None TEST=Chromoting to a host machine and the diff will work correctly Review URL: http://codereview.chromium.org/6469022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74571 0039d316-1c4b-4281-b951-d872f2087c98
* Override AudioManager::MakeAudioInputStream() in NullAudioManager.sergeyu@chromium.org2011-02-101-7/+9
| | | | | | | | | BUG=72577 TEST=None Review URL: http://codereview.chromium.org/6487008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74492 0039d316-1c4b-4281-b951-d872f2087c98
* Disable FakeAudioInputTest.BasicCallbacks after two crashes in a row.dmazzoni@chromium.org2011-02-101-2/+2
| | | | | | | | | TEST=disables crashing test BUG=49497 Review URL: http://codereview.chromium.org/6480012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74385 0039d316-1c4b-4281-b951-d872f2087c98
* Another big out-of-lining of test code. Hits a lot of gmock objectserg@google.com2011-02-083-4/+24
| | | | | | | | | BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6413036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74168 0039d316-1c4b-4281-b951-d872f2087c98
* Runtime check to enable SSE2 color space conversion codehclam@chromium.org2011-02-088-39/+243
| | | | | | | | | | | This will make text in chromoting view to looks much nicer. BUG=72218 TEST=Text looks much better in chromoting Review URL: http://codereview.chromium.org/6410127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74154 0039d316-1c4b-4281-b951-d872f2087c98
* More out-of-lining of test code, along with a bunch of GMOCK objects.erg@google.com2011-02-082-0/+7
| | | | | | | | | | | Most notably, rename various mock_objects.h files in remoting/ because after deinlining, there were compile failures. This fixes Windows compiling because you can't have two implementation files with the same name in a project, even if they are in different directories. (The output from one compile will clobber the others!) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6250198 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74059 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up warnings found in our testing code.erg@google.com2011-02-071-2/+2
| | | | | | | | | | | | | Time wise, this only speeds things up by a minute, which I think is within the margin of error. I can't get a good size measurement since we aren't building .a files for a lot of this code. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6312137 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73999 0039d316-1c4b-4281-b951-d872f2087c98
* Change includes of gfx/* to ui/gfx/*sail@chromium.org2011-02-054-4/+4
| | | | | | | | | BUG=71063 TEST=compiled Review URL: http://codereview.chromium.org/6312156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73890 0039d316-1c4b-4281-b951-d872f2087c98
* Reworked player_x11:scherkus@chromium.org2011-02-0411-5/+1553
| | | | | | | | | | | | | | | | | - Turned support for EGL image ON for OpenMAX decoding. - Added simple fix for compilation issue due to missing definition for MessageLoop. - Added changes to GLES Video Renderer to use EGL image. - Added H264BitstreamConverter and H264BitstreamConverterFFmpegAdaptor classes to Chromium. - Introduced new h264 bitstream converter to FFmpegDemuxer - Added h264 bitstream converter related classes to media targets and introduced new target for unit testing bitstream converter. Patch by vmr@chromium.org: http://codereview.chromium.org/6260010/ BUG=None TEST=Test H.264 decode clip with player_x11 OpenMAX enabled. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73839 0039d316-1c4b-4281-b951-d872f2087c98
* Resubmit "RGB to YUV conversion using SSE2""hclam@chromium.org2011-02-037-0/+525
| | | | | | | | | | | Introduce SSE2 patch again. BUG=None TEST=None Review URL: http://codereview.chromium.org/6334029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73552 0039d316-1c4b-4281-b951-d872f2087c98
* Move src/gfx/ to src/ui/gfxsail@chromium.org2011-02-021-2/+2
| | | | | | | | | | | To reduce the size of this change I've left stub header files in src/gfx/. Once all includes have been updated I'll delete the stub files. BUG=71063 TEST=Still doing test builds. Review URL: http://codereview.chromium.org/6246027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73530 0039d316-1c4b-4281-b951-d872f2087c98
* media/audio/mac/audio_low_latency_output_mac.cc is missing an #include.mark@chromium.org2011-02-021-0/+2
| | | | | | | | | | | | | | | | | | audio_low_latency_output_mac.cc, new in r73058, uses the Mac OS X Component Manager. This includes the Component and ComponentDescription types, and the FindNextComponent, OpenAComponent, and CloseComponent calls. To use the Component Manager, #include <CoreServices/CoreServices.h> http://developer.apple.com/library/mac/#documentation/Carbon/Reference/Component_Manager/Reference/reference.html CoreServices.h is probably #included by something else when using the 10.5 SDK, but this caused a compilation failure with the 10.6 SDK. BUG=none TEST=none Review URL: http://codereview.chromium.org/6286056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73503 0039d316-1c4b-4281-b951-d872f2087c98
* Prevent pending callbacks after an error from being interpreted as teardown ↵acolwell@chromium.org2011-02-023-13/+120
| | | | | | | | | | | | | | callbacks. - Moved teardown state transitions to use TeardownStateTransitionTask() so they can't be confused with normal playback transitions in FilterStateTransitionTask(). - Fixed code so seek callback is called if an error occurs during a Seek(). BUG=71087 TEST=PipelineImplTest.ErrorDuringSeek Review URL: http://codereview.chromium.org/6250092 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73469 0039d316-1c4b-4281-b951-d872f2087c98
* NullVideoRenderer, the video equivalent to NullAudioRenderer.scherkus@chromium.org2011-02-013-0/+58
| | | | | | | | | | | Can eventually be used to construct media playback pipelines that don't render any pixels to the screen. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6287034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73365 0039d316-1c4b-4281-b951-d872f2087c98
* Don't hold the lock when calling VideoRendererBase::OnFrameAvailable().scherkus@chromium.org2011-02-011-2/+7
| | | | | | | | | | | There's one instance of the code where we hold on to the lock when calling OnFrameAvailable(), which means if the subclass can crash if it calls a locked method such as GetCurrentFrame(). BUG=none TEST=media_unittests Review URL: http://codereview.chromium.org/6260052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73362 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "RGB to YUV conversion using SSE2"hclam@chromium.org2011-02-017-514/+0
| | | | | | | | Reverting patch because ARM build is broken. TBR=ctguil git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73341 0039d316-1c4b-4281-b951-d872f2087c98
* RGB to YUV conversion using SSE2hclam@chromium.org2011-02-017-0/+514
| | | | | | | | | | | | | This code uses SSE2 intrinsics with the feature of 2x2 subsampling for U and V. Performance compared to a pure C version is about 20% faster with better quality. BUG=None TEST=None Review URL: http://codereview.chromium.org/6268018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73339 0039d316-1c4b-4281-b951-d872f2087c98
* Rename Real* to Double* in values.* and dependent filesarv@chromium.org2011-02-011-2/+2
| | | | | | | | | BUG=None TEST=Compiles and passes all tests Review URL: http://codereview.chromium.org/6248026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73232 0039d316-1c4b-4281-b951-d872f2087c98
* Add a low-latency AudioOutputStream implementation for Mac OS X.crogers@google.com2011-01-297-12/+353
| | | | | | | | | BUG=none TEST=none (tested locally to verify this code plays audio with much lower latency than the current PCMQueueOutAudioOutputStream implementation) Review URL: http://codereview.chromium.org/6350019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73058 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a teardown hang caused by an Abort() call while there is a pending read.acolwell@chromium.org2011-01-261-1/+3
| | | | | | | | | BUG=64754 TEST=BufferedDataSourceTest.StopDoesNotUseMessageLoopForCallback , BufferedDataSourceTest.AbortDuringPendingRead Review URL: http://codereview.chromium.org/6342018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72668 0039d316-1c4b-4281-b951-d872f2087c98
* Return 0 instead of AVERROR_EOF for reads at or past the end of a file.scherkus@chromium.org2011-01-242-5/+5
| | | | | | | | | | | I'm not sure if it's because the files listed in the bug report were improperly muxed, but FFmpeg was attempting to read past the end of the file and apparently returning AVERROR_EOF instead of 0 makes a huge difference. BUG=47489 TEST=media_unittests, files linked in bug report Review URL: http://codereview.chromium.org/6249013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72350 0039d316-1c4b-4281-b951-d872f2087c98
* Fix frame-exact seeking again to stay within duration as opposed to rounding ↵scherkus@chromium.org2011-01-222-4/+4
| | | | | | | | | | | | | to the closest frame. Based on discussion from https://bugs.webkit.org/show_bug.cgi?id=52697 to be consistent with other WebKit ports. BUG=69499 TEST=media_unittests Review URL: http://codereview.chromium.org/6259012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72247 0039d316-1c4b-4281-b951-d872f2087c98
* Remove obsolete base/lock.h and fix up callers to use the new header file andbrettw@chromium.org2011-01-2119-109/+109
| | | | | | | | | | | the base namespace. Fix several files including lock.h unnecessarily. BUG=none TEST=none Original review=http://codereview.chromium.org/6142009/ Patch by leviw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
* Use midpoint calculation for frame-exact seeking.scherkus@chromium.org2011-01-182-50/+112
| | | | | | | | | | | Previously we would use a "good enough" frame without fully taking duration into account. BUG=69499 TEST=media_unittests Review URL: http://codereview.chromium.org/6321005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71676 0039d316-1c4b-4281-b951-d872f2087c98
* Remove MessageLoop methods from Filter interface toacolwell@chromium.org2011-01-1529-332/+321
| | | | | | | | | | | | | | separate Filter management from MessageLoop management. This sets the stage for filters to share threads in the future which will reduce resource consumption when multiple <video> tags are on the same page. BUG=69451 TEST=None Review URL: http://codereview.chromium.org/6171009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71548 0039d316-1c4b-4281-b951-d872f2087c98
* Replace MockFilterCallback with MockCallback and simplify unit tests.scherkus@chromium.org2011-01-1512-327/+184
| | | | | | | | | | | We had a ton of unnecessarily duplicated code, most of which could be solved by introducing NewExpectedCallback(). BUG=none TEST=media_unittests Review URL: http://codereview.chromium.org/6350001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71537 0039d316-1c4b-4281-b951-d872f2087c98