summaryrefslogtreecommitdiffstats
path: root/webkit/media
Commit message (Collapse)AuthorAgeFilesLines
* Move webkit/media/ into webkit/renderer/mediajamesr@chromium.org2013-05-3081-16064/+0
| | | | | | | | | | | | This code is only used in renderer processes, this just moves the files to reflect that fact in the directory structure so we can verify it with DEPS. BUG=237267 Review URL: https://chromiumcodereview.appspot.com/15842010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203248 0039d316-1c4b-4281-b951-d872f2087c98
* Fix pcm_f32le and amr playback.dalecurtis@google.com2013-05-301-5/+7
| | | | | | | | | | | | | | | | The number of frames to interleave was being chosen incorrectly, so only half the output frames were being used. Also fixes issue 223034 in the CDM audio decoder. Adds a test. WebAudio playback is unaffected. BUG=245071 TEST=F32 and AMR playback correctly. R=acolwell@chromium.org Review URL: https://codereview.chromium.org/15664006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203183 0039d316-1c4b-4281-b951-d872f2087c98
* Separate MediaKeys interface from Decryptor interface.xhwang@chromium.org2013-05-3010-34/+46
| | | | | | | | | BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/15772012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203026 0039d316-1c4b-4281-b951-d872f2087c98
* Update refernces to Blink's Platform API (webkit)abarth@chromium.org2013-05-3023-44/+44
| | | | | | | | | | | | | | These headers have moved from Source/Platform/chromium/public to public/platform. This CL updates src/webkit's references to the old location to point to the new location. After this CL lands, I'll remove the forwarding headers that are letting these references still work. TBR=jamesr@chromium.org BUG=239545 Review URL: https://chromiumcodereview.appspot.com/15937016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203020 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed incorrect bug ID in TODO.kbr@chromium.org2013-05-291-1/+1
| | | | | | | | | BUG=234710 TBR=scherkus@chromium.org,qinmin@chromium.org Review URL: https://codereview.chromium.org/16082004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202888 0039d316-1c4b-4281-b951-d872f2087c98
* Fix MediaPlayerDelegate error handling so it passes the ↵acolwell@chromium.org2013-05-285-51/+59
| | | | | | | | | | | | webkitmediasource-errors.html LayoutTest. BUG=233420 TEST=http/tests/media/media-source/webkitmediasource-errors.html LayoutTests now passes w/o crashing. Review URL: https://chromiumcodereview.appspot.com/15927003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202671 0039d316-1c4b-4281-b951-d872f2087c98
* Streamline SIMD targets in media.gypdalecurtis@google.com2013-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | Prevents duplicates of the media_sse and yuv_convert targets from ending up in both media and media_unittests during shared builds. - Removes the yuv_convert target since everyone who uses it already uses media. - Merges differ_block_sse2 and yuv_convert_simd_x86 into media_sse2. - Moves assembly into media_asm. - Moves incorrect mmx bundling from sse2 to new media_mmx target. - Introduces EXPORT macro to x86inc.asm - Introduces yasm_includes for non-.asm files in yasm_compile.gypi. - Fixes missing const on yuv constants table. BUG=none TEST=compiles, all unittests pass. TBR=fischman@chromium.org, kbr@chromium.org, sergeyu@chromium.org Review URL: https://codereview.chromium.org/15151002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202230 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unit8_t from WebMediaPlayer implementations.xhwang@chromium.org2013-05-247-11/+7
| | | | | | | | | | | | This is the chromium side change of https://codereview.chromium.org/15857006. BUG=243347 TEST=Everything still compiles. R=acolwell@chromium.org Review URL: https://codereview.chromium.org/15784006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202219 0039d316-1c4b-4281-b951-d872f2087c98
* Enable seek in fullscreen mode for MSE impl on androidqinmin@chromium.org2013-05-244-9/+52
| | | | | | | | | | | | | | | | | | | | | | | | Since the actual MediaCodec instances live in browser process, we need to inform the chunk demuxer when a seek happens. To avoid race conditions, all the operations related to seek needs to be performed on the browser thread, instead of MediaDecoderJobs' own threads. Here is the work flow of the fullscreen seek event: 1. User hit the seek bar. 2. MediaSourcePlayer waits for all the decoder tasks to finish on the browser thread. 3. MediaSourcePlayer sends MediaSeekRequest to render process. 4. Render process gets the MediaSeekRequest, sends back the ack, and ask chunk demuxer to do a seek 5. MediaSourcePlayer gets the MediaSeekRequestAck, and starts sending IPC for getting more data For embedded video case, the workflow is: 1. user hit the seek bar 2. WebMediaPlayerAndroid sends a SeekTo message to MediaSourcePlayer. 3. MediaSourcePlayer waits for all the decoder tasks to finish, and then follows step 3-5 as shown in the fullscreen case. This change also allows toggling from embedded mode to fullscreen mode. When that happens, we first wait for the current decoding tasks to finish. Then perform a seek and reestablish the surface. BUG=233420 Review URL: https://chromiumcodereview.appspot.com/15499006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202098 0039d316-1c4b-4281-b951-d872f2087c98
* Fix various MediaSource related crashes on Android.acolwell@chromium.org2013-05-244-10/+70
| | | | | | | | | | | | | | | | | | | | This change fixes several issues that were causing crashes. - MediaPlayerHostMsg_DemuxerReady_Params was not initializing the xxx_codec member variables so audio-only or video-only content would randomly be flagged as A/V content with a random codec ID. - ChunkDemuxer::Stop() was not being called which could cause the delegate to be accessed after it was destroyed. - MediaSourceDelegate was signalling that it had metadata before the ChunkDemuxer was even initialized. This caused the HTMLMediaElement to signal that the load completed way too early and caused play() to be called when the delegate wasn't ready. BUG=233420 TEST=webkitmediasource-play.html LayoutTest reliably runs w/o crashing now. Review URL: https://chromiumcodereview.appspot.com/15898002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202019 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 201791 "Fix various MediaSource related crashes on Android."thestig@chromium.org2013-05-234-72/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | > Fix various MediaSource related crashes on Android. > > This change fixes several issues that were causing crashes. > - MediaPlayerHostMsg_DemuxerReady_Params was not initializing the xxx_codec > member variables so audio-only or video-only content would randomly be > flagged as A/V content with a random codec ID. > - ChunkDemuxer::Stop() was not being called which could cause the delegate > to be accessed after it was destroyed. > - MediaSourceDelegate was signalling that it had metadata before the > ChunkDemuxer was even initialized. This caused the HTMLMediaElement to > signal that the load completed way too early and caused play() to be > called when the delegate wasn't ready. > > BUG=233420 > TEST=webkitmediasource-play.html LayoutTest reliably runs w/o crashing now. > > Review URL: https://chromiumcodereview.appspot.com/15754004 TBR=acolwell@chromium.org Review URL: https://codereview.chromium.org/15838006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201797 0039d316-1c4b-4281-b951-d872f2087c98
* Fix various MediaSource related crashes on Android.acolwell@chromium.org2013-05-234-10/+72
| | | | | | | | | | | | | | | | | | | | This change fixes several issues that were causing crashes. - MediaPlayerHostMsg_DemuxerReady_Params was not initializing the xxx_codec member variables so audio-only or video-only content would randomly be flagged as A/V content with a random codec ID. - ChunkDemuxer::Stop() was not being called which could cause the delegate to be accessed after it was destroyed. - MediaSourceDelegate was signalling that it had metadata before the ChunkDemuxer was even initialized. This caused the HTMLMediaElement to signal that the load completed way too early and caused play() to be called when the delegate wasn't ready. BUG=233420 TEST=webkitmediasource-play.html LayoutTest reliably runs w/o crashing now. Review URL: https://chromiumcodereview.appspot.com/15754004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201791 0039d316-1c4b-4281-b951-d872f2087c98
* Conditionally build support for Pepper-based CDMs.ddorwin@chromium.org2013-05-238-30/+74
| | | | | | | | | | | Adds enable_pepper_cdms and ENABLE_PEPPER_CDMS to control building of this logic. Previously, it was built for all platforms, but not all platforms use Pepper. TEST=content_browsertests on platforms with and without Pepper CDM support Review URL: https://chromiumcodereview.appspot.com/15028015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201738 0039d316-1c4b-4281-b951-d872f2087c98
* Media Source dispatches inband text tracksmatthewjheaney@chromium.org2013-05-239-2/+241
| | | | | | | | | | | | The Media Source (WebM) parser now detects the presence of inband text tracks. As frames of inband text (WebVTT cues) are found in the network stream, they are pushed up the media stack. BUG=230708 Review URL: https://chromiumcodereview.appspot.com/13419002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201716 0039d316-1c4b-4281-b951-d872f2087c98
* Keep screen on when there is an active WebRTC session on Android.wjia@chromium.org2013-05-221-12/+16
| | | | | | | | | | Reland https://chromiumcodereview.appspot.com/15035013/ When WebRTC session has video channel, the screen is kept on. Review URL: https://codereview.chromium.org/15743009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201593 0039d316-1c4b-4281-b951-d872f2087c98
* Use URLUtil_Dev to check the document URL instead of Private interfaces.ddorwin@chromium.org2013-05-222-12/+14
| | | | | | | | | | | In addition to eliminating dependencies on the Private interfaces, the second instance to call location.GetProperty("origin") (or "href") would fail for unknown reasons if SandboxOrigin is set, as is the case in https://codereview.chromium.org/14756021/ Review URL: https://chromiumcodereview.appspot.com/15536006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201577 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 201439 "Revert 201433 "Revert 201424 "Keep screen on when..."wjia@chromium.org2013-05-221-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > Revert 201433 "Revert 201424 "Keep screen on when there is an ac..." > > r201431 passed all android bots. > > > Revert 201424 "Keep screen on when there is an active WebRTC ses..." > > > > experimental reversion due to http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20Tests&number=4397 > > > > > Keep screen on when there is an active WebRTC session on Android. > > > > > > When WebRTC session has video channel, the screen is kept on. > > > > > > R=bulach@chromium.org, joth@chromium.org, qinmin@chromium.org, sky@chromium.org > > > > > > Review URL: https://codereview.chromium.org/15035013 > > > > TBR=wjia@chromium.org > > > > Review URL: https://codereview.chromium.org/15655002 > > TBR=wjia@chromium.org > > Review URL: https://codereview.chromium.org/15667003 TBR=wjia@chromium.org Review URL: https://codereview.chromium.org/15673002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201440 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 201433 "Revert 201424 "Keep screen on when there is an ac..."wjia@chromium.org2013-05-221-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | r201431 passed all android bots. > Revert 201424 "Keep screen on when there is an active WebRTC ses..." > > experimental reversion due to http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20Tests&number=4397 > > > Keep screen on when there is an active WebRTC session on Android. > > > > When WebRTC session has video channel, the screen is kept on. > > > > R=bulach@chromium.org, joth@chromium.org, qinmin@chromium.org, sky@chromium.org > > > > Review URL: https://codereview.chromium.org/15035013 > > TBR=wjia@chromium.org > > Review URL: https://codereview.chromium.org/15655002 TBR=wjia@chromium.org Review URL: https://codereview.chromium.org/15667003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201439 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 201424 "Keep screen on when there is an active WebRTC ses..."wjia@chromium.org2013-05-221-16/+12
| | | | | | | | | | | | | | | | | | experimental reversion due to http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20Tests&number=4397 > Keep screen on when there is an active WebRTC session on Android. > > When WebRTC session has video channel, the screen is kept on. > > R=bulach@chromium.org, joth@chromium.org, qinmin@chromium.org, sky@chromium.org > > Review URL: https://codereview.chromium.org/15035013 TBR=wjia@chromium.org Review URL: https://codereview.chromium.org/15655002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201433 0039d316-1c4b-4281-b951-d872f2087c98
* Keep screen on when there is an active WebRTC session on Android.wjia@chromium.org2013-05-221-12/+16
| | | | | | | | | | When WebRTC session has video channel, the screen is kept on. R=bulach@chromium.org, joth@chromium.org, qinmin@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/15035013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201424 0039d316-1c4b-4281-b951-d872f2087c98
* Add MSE implementation on androidqinmin@chromium.org2013-05-206-42/+28
| | | | | | | | | | | | Here are the changes included in this CL: 1. Adds a MediaSourcePlayer for android to play media source extensions. Only embedded mode are working currently. 2. Rewrite the MediaCodecBridge code in java. The current MediaCodecBridge code is not very suitable for exception handling. Also, this refactoring adds support for audio playback. BUG=233420 Review URL: https://chromiumcodereview.appspot.com/15113002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201031 0039d316-1c4b-4281-b951-d872f2087c98
* Roll FFmpeg for M29wolenetz@chromium.org2013-05-162-5/+5
| | | | | | | | | | | | | | | | | | | | | Chrome-side changes: 1. Use AVCodecID instead of CodecID. 2. Accomodate FFmpeg's new internal refcounted buffers: * Use av_free_packet() instead of av_destruct_packet() in FFmpegH264ToAnnexBBitstreamConverterTests (http://crbug.com/238543) * Add TSAN suppressions (http://crbug.com/239350) * Copy from data[] in FFmpegCdmVideoDecoder. (http://crbug.com/240573) 3. Update ffmpeg_regression_tests: * Rebaseline expectations (http://crbug.com/237363) * Mark some flaky (http://crbug.com/237371) * Change disabled to flaky (http://crbug.com/236979) * Add new tests. (http://crbug.com/234630) R=dalecurtis BUG=238543,239350,237363,237371,236979,234630,123426,223295,236611,234630,240573,241212 Review URL: https://chromiumcodereview.appspot.com/15078005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200467 0039d316-1c4b-4281-b951-d872f2087c98
* Move webkit/compositor_bindings into webkit/rendererjamesr@chromium.org2013-05-154-4/+4
| | | | | | | | | | | | | | | | | | The compositor bindings for WebKit should only be used in a render process or in webkit_support for DumpRenderTree or webkit_unit_tests. It's never used in a browser process. This moves the bindings code under webkit/renderer/ so we can enforce this via DEPS rules. The path is unfortunately a bit awkward. Once we drop DumpRenderTreeSupport and figure out a way to deal with webkit_unit_tests, we can move the bindings into content/renderer/gpu/ since they'll only be used by the content embedding. BUG=239107 TBR=piman@chromium.org Review URL: https://codereview.chromium.org/14651027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200350 0039d316-1c4b-4281-b951-d872f2087c98
* Update code to use the new version of copyTextureCHROMIUM() with added ↵jun.a.jiang@intel.com2013-05-144-2/+7
| | | | | | | | | | | | | parameter dest_type. Besides this, re-implement copyVideoTextureToPlatformTexture() defined in WebMediaPlayer.h with added parameter dest_type. BUG=239341 Review URL: https://chromiumcodereview.appspot.com/15077004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199864 0039d316-1c4b-4281-b951-d872f2087c98
* Set frame pixels to a specific color for pixel testing in layout test.wjia@chromium.org2013-05-132-6/+6
| | | | | | | | | BUG=239541 R=fischman@chromium.org, xhwang@chromium.org Review URL: https://codereview.chromium.org/15103002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199776 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the build for Google TVqinmin@chromium.org2013-05-111-0/+1
| | | | | | | | | | | R=qinmin@chromium.org BUG= Review URL: https://codereview.chromium.org/15096003 Patch from Yuncheol Heo <ycheo@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199628 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 199531 "Use a shared thread for media operations."zmo@chromium.org2013-05-104-29/+22
| | | | | | | | | | | | | | | | | | | Possibly causing mem-corruption on webkit layout tests, thus crashes. > Use a shared thread for media operations. > > This reduces the number of threads created per media element by one. > > BUG=61293 > R=acolwell@chromium.org, jamesr@chromium.org, jochen@chromium.org > > Review URL: https://codereview.chromium.org/15005005 TBR=scherkus@chromium.org Review URL: https://codereview.chromium.org/14690019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199562 0039d316-1c4b-4281-b951-d872f2087c98
* Use a shared thread for media operations.scherkus@chromium.org2013-05-104-22/+29
| | | | | | | | | | | This reduces the number of threads created per media element by one. BUG=61293 R=acolwell@chromium.org, jamesr@chromium.org, jochen@chromium.org Review URL: https://codereview.chromium.org/15005005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199531 0039d316-1c4b-4281-b951-d872f2087c98
* Cut content/browser dependency on webkit_mediajamesr@chromium.org2013-05-104-39/+1
| | | | | | | | BUG=237267 Review URL: https://chromiumcodereview.appspot.com/15063003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199384 0039d316-1c4b-4281-b951-d872f2087c98
* Reland: Remove reference counting from media::Pipeline.scherkus@chromium.org2013-05-092-4/+6
| | | | | | | | | | Now with a test that covers the refresh/teardown case. BUG=173313 Review URL: https://chromiumcodereview.appspot.com/14779009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199130 0039d316-1c4b-4281-b951-d872f2087c98
* Remove inside_chromium_build gyp variablejamesr@chromium.org2013-05-081-11/+1
| | | | | | | | | | | | | In the days of olde, we supported compiling from inside a chromium checkout and inside a WebKit checkout with some chromium libraries. In the latter configuration, used mainly by the build.webkit.org bots, the paths to the WebKit headers relative to chromium gyp files was different. This added a lot of complexity and some extra scripts to fix up paths and includes. Blink only supports building within a chromium checkout so all of this complexity can be removed. Review URL: https://chromiumcodereview.appspot.com/14823005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199057 0039d316-1c4b-4281-b951-d872f2087c98
* Add MediaPlayerAndroid as a super class for all media player implementations ↵qinmin@chromium.org2013-05-083-8/+8
| | | | | | | | | | | | | | | | | on android. There are several different implementations of media players on Android. Currently they all inherit from MediaPlayerBridge. This only works if their java player is a subclass of Android MediaPlayer class, which is not necessary in some cases. Additionally, we are not going to use any subclass of android MediaPlayer for MSE implementation As a result, this change introduces a super class for all the media player implementations. BUG=233420 R=scherkus@chromium.org, ycheo@chromium.org, yfriedman@chromium.org Review URL: https://codereview.chromium.org/14762006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198957 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 198760 "Remove reference counting from media::Pipeline."scherkus@chromium.org2013-05-082-4/+3
| | | | | | | | | | | | | | | | > Remove reference counting from media::Pipeline. > > BUG=173313 > R=acolwell@chromium.org > > Review URL: https://codereview.chromium.org/14371023 BUG=238908 TBR=scherkus@chromium.org Review URL: https://codereview.chromium.org/14972012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198922 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: Remove unnecessary ".get()" from scoped_ptrs<>.erg@chromium.org2013-05-084-10/+10
| | | | | | | | | | | In r174057, enne@ added support for implicit testing to scoped_ptr<>. Removes these in webkit/. BUG=232084 Review URL: https://chromiumcodereview.appspot.com/14886011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198894 0039d316-1c4b-4281-b951-d872f2087c98
* Remove reference counting from media::Pipeline.scherkus@chromium.org2013-05-072-3/+4
| | | | | | | | | BUG=173313 R=acolwell@chromium.org Review URL: https://codereview.chromium.org/14371023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198760 0039d316-1c4b-4281-b951-d872f2087c98
* Notify geometry when requesting for external surfacewonsik@chromium.org2013-05-072-3/+4
| | | | | | | | | | | | | The browser process may not be aware of geometry of the requesting media player, so notify the browser processs when requesting for an external surface. BUG=236363 R=qinmin@chromium.org,scherkus@chromium.org Review URL: https://chromiumcodereview.appspot.com/14650003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198668 0039d316-1c4b-4281-b951-d872f2087c98
* Allow extra codec data to be passed to AudioCodecBridgeqinmin@chromium.org2013-05-071-1/+5
| | | | | | | | | | | Android MediaCodec needs vorbis codec data to work properly. Passing the extra codec data from ChunkDemuxer should fix the problem. BUG=233420 Review URL: https://chromiumcodereview.appspot.com/14957003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198650 0039d316-1c4b-4281-b951-d872f2087c98
* Notify Blink when the current_frame_'s natural_size() changes.acolwell@chromium.org2013-05-062-3/+20
| | | | | | | | | | | Currently the element only reflects the new frame size when something triggers layout or the controls are updated. This change allows the element size to change even if the controls aren't displayed and nothing triggers layout. BUG=176533 TEST=None. A new LayoutTest will be added to Blink shortly. Review URL: https://chromiumcodereview.appspot.com/14566010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198552 0039d316-1c4b-4281-b951-d872f2087c98
* Move AudioBus creation into provideInput().dalecurtis@chromium.org2013-05-062-6/+13
| | | | | | | | | | | | Looks like provideInput() may be called prior to initialize, so we need to move the construction to provideInput(). BUG=237678 TEST=new content_unittest. Review URL: https://chromiumcodereview.appspot.com/14890003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198409 0039d316-1c4b-4281-b951-d872f2087c98
* Reduce memory usage in DecodeAudioFileData if we know the duration.rtoy@google.com2013-05-041-33/+95
| | | | | | | | BUG=227145 Review URL: https://chromiumcodereview.appspot.com/14383018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198318 0039d316-1c4b-4281-b951-d872f2087c98
* Do not use bundles for the CDM on Mac.ddorwin@chromium.org2013-05-031-11/+3
| | | | | | | | | | | | | | | When using components, the CDM and adapter cannot be within the Chrome bundle. Since the adapter is built with Chrome, the CDM cannot be within its bundle. As a result, the adapter no longer needs to be a bundle. The chrome_paths.cc code allows testing with the non-component path. BUG=180260 R=xhwang@chromium.org Review URL: https://codereview.chromium.org/14743002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198211 0039d316-1c4b-4281-b951-d872f2087c98
* Temporarily disable canPlayType() and tests for component CDM.ddorwin@chromium.org2013-05-032-0/+10
| | | | | | | | BUG=180260,237627,237636 Review URL: https://chromiumcodereview.appspot.com/14835003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198054 0039d316-1c4b-4281-b951-d872f2087c98
* Handle decoding of vorbis files better on Androidrtoy@google.com2013-05-032-10/+12
| | | | | | | | | | BUG=227144 Send the data size to MediaCodec so we can get the duration length for ogg/vorbis files correctly instead of returning a huge number. With this information, we no longer need the is_vorbis flag since the duration is now correct, so we remove that code as well. Review URL: https://chromiumcodereview.appspot.com/14522002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198029 0039d316-1c4b-4281-b951-d872f2087c98
* Fix several WebAudioSourceProviderImpl issues.dalecurtis@chromium.org2013-05-013-38/+289
| | | | | | | | | | | | | | | | | | | | Fixes the following issues: - WebAudioSourceProviderImpl::Stop() does not block for outstanding provideInput() calls to complete. provideInput() now acquires the sink_lock_ to ensure this is true. - Volume adjustment does not work. AudioBus::Scale() handles this now. - The sink_ was not restored to its original state after client disconnection. State is now tracked via a simple state machine. BUG=233026,235048 TEST=http://chome-audio-example.s3.amazonaws.com/audio_context.html TEST=http://images.jayisgames.com/magnetized/index.html TEST=content_unittests --gtest_filter=WebAudioSource* Review URL: https://chromiumcodereview.appspot.com/14256009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197742 0039d316-1c4b-4281-b951-d872f2087c98
* Rename MediaPlayerBridgeManager to MediaPlayerManagerqinmin@chromium.org2013-05-013-107/+0
| | | | | | | | | | | | | | | | | | To support MediaSource, i am planning to introduce MediaSourceBridge on android. Both MediaSourceBridge and MediaPlayerBridge will inherit from a common class: MediaPlayerAndroid. As a result of this plan, MediaPlayerBridgeManager is no longer a good name for this common class. This CL includes the following changes: 1. rename MediaPlayerBridgeManager to MediaPlayerManager, and MediaPlayerManagerAndroid to MediaPlayerManagerImpl. 2. remove MediaPlayerBridgeManagerImpl as it is no longer being used. 3. MediaResouceGetter is now owned by MediaPlayerManagerImpl. so we no longer need to create a separate MediaResourceGetter for each player. BUG=233420 R=jam@chromium.org, scherkus@chromium.org, yfriedman@chromium.org Review URL: https://codereview.chromium.org/14314020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197626 0039d316-1c4b-4281-b951-d872f2087c98
* webkit: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.scherkus@chromium.org2013-04-301-1/+1
| | | | | | | | | | | It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details. BUG=234765 R=jamesr@chromium.org Review URL: https://codereview.chromium.org/14307012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197204 0039d316-1c4b-4281-b951-d872f2087c98
* Enable MSE for TVqinmin@chromium.org2013-04-279-24/+775
| | | | | | | | | | | BUG=215275 R=acolwell@chromium.org, jamesr@chromium.org, palmer@chromium.org, qinmin@chromium.org, yfriedman@chromium.org Review URL: https://codereview.chromium.org/14341010 Patch from Yuncheol Heo <ycheo@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196968 0039d316-1c4b-4281-b951-d872f2087c98
* Merge MediaPlayerAndroid with MediaPlayerImplAndroid.qinmin@chromium.org2013-04-265-294/+138
| | | | | | | | | After deleting the MediaPlayerInProcessAndroid, we no longer need to have a base WMPA class for android. Merging these 2 classes into a single one. Review URL: https://chromiumcodereview.appspot.com/14203003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196877 0039d316-1c4b-4281-b951-d872f2087c98
* Replace myself with Min for media/android/OWNERSyfriedman@chromium.org2013-04-261-1/+1
| | | | | | | | | | He's better-suited to review this code. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/14314018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196868 0039d316-1c4b-4281-b951-d872f2087c98
* Remove reference counting from media::DataSource and friends.scherkus@chromium.org2013-04-265-33/+34
| | | | | | | | BUG=173313 Review URL: https://codereview.chromium.org/14503002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196789 0039d316-1c4b-4281-b951-d872f2087c98