| 5b892326406927b709cdaf6c384d4ababf456332 |
06-Nov-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 39.0.2171.53
This commit was generated by merge_to_master.py.
Change-Id: Id583a0dc312e50e455eb8bd04f75c74304738c9d
ndroid/audio_decoder_job.cc
ndroid/audio_decoder_job.h
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_source_player.cc
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
ontainer_names.cc
|
| 5b62eb5758cb7b791cfdd45cf78f35dc060631b6 |
27-Oct-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 39.0.2171.38
This commit was generated by merge_to_master.py.
Change-Id: Id34e308a78a8e250aa0f0b60fcb9f882fc35382e
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
|
| 1675a649fd7a8b3cb80ffddae2dc181f122353c5 |
22-Oct-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 39.0.2171.37
This commit was generated by merge_to_master.py.
Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_listener.cc
ndroid/media_player_listener.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
|
| 1320f92c476a1ad9d19dba2a48c72b75566198e9 |
30-Sep-2014 |
Primiano Tucci <primiano@google.com> |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
ndroid/BUILD.gn
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/UsbMidiDeviceAndroid.java
ndroid/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/java/src/org/chromium/media/VideoCaptureAndroid.java
ndroid/java/src/org/chromium/media/VideoCaptureFactory.java
ndroid/java/src/org/chromium/media/VideoCaptureTango.java
ndroid/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_common_android.h
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
ndroid/webaudio_media_codec_bridge.cc
udio_block_fifo.cc
udio_block_fifo.h
udio_block_fifo_unittest.cc
udio_buffer_converter.cc
udio_buffer_converter_unittest.cc
udio_buffer_queue.cc
udio_buffer_queue.h
udio_buffer_queue_unittest.cc
udio_converter.cc
udio_decoder.h
udio_discard_helper.cc
udio_renderer.h
udio_renderer_mixer.cc
udio_renderer_mixer_unittest.cc
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
it_reader_core.cc
it_reader_core.h
it_reader_unittest.cc
dm_promise.cc
dm_promise.h
hannel_mixer_unittest.cc
ontainer_names_unittest.cc
ata_source.cc
ata_source.h
emuxer.cc
emuxer.h
emuxer_perftest.cc
emuxer_stream.cc
emuxer_stream.h
emuxer_stream_provider.cc
emuxer_stream_provider.h
ilter_collection.cc
ilter_collection.h
imits.h
ac/BUILD.gn
ac/avfoundation_glue.h
ac/avfoundation_glue.mm
ac/coremedia_glue.h
ac/coremedia_glue.mm
ac/corevideo_glue.h
ac/videotoolbox_glue.h
ac/videotoolbox_glue.mm
edia_keys.h
edia_log.cc
edia_log_event.h
edia_switches.cc
edia_switches.h
ock_filters.cc
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
anges.h
enderer.cc
enderer.h
un_all_unittests.cc
imd/convert_yuv_to_rgb.h
imd/convert_yuv_to_rgb_mmx.asm
imd/convert_yuv_to_rgb_x86.cc
imd/filter_yuv.h
imd/filter_yuv_mmx.cc
tream_parser_buffer.cc
tream_parser_buffer.h
tream_parser_unittest.cc
est_data_util.cc
ext_renderer.cc
ime_source.h
ideo_decoder.h
ideo_frame.cc
ideo_frame.h
ideo_frame_pool.cc
ideo_renderer.h
all_clock_time_source.cc
all_clock_time_source.h
uv_convert.cc
uv_convert_perftest.cc
uv_convert_unittest.cc
|
| 03b57e008b61dfcb1fbad3aea950ae0e001748b0 |
28-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 291560
This commit was generated by merge_to_master.py.
Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ndroid/BUILD.gn
emuxer_perftest.cc
ideo_frame.cc
ideo_frame.h
|
| 6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 |
19-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 290040
This commit was generated by merge_to_master.py.
Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
UILD.gn
ndroid/BUILD.gn
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/VideoCaptureAndroid.java
ndroid/java/src/org/chromium/media/VideoCaptureFactory.java
ndroid/java/src/org/chromium/media/VideoCaptureTango.java
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
udio_splicer.cc
udio_splicer_unittest.cc
dm_promise.cc
dm_promise.h
ecoder_buffer.h
ecryptor.h
edia_keys.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
tream_parser.cc
tream_parser_buffer.cc
tream_parser_buffer.h
tream_parser_unittest.cc
est_helpers.cc
est_helpers.h
ideo_decoder_config.h
|
| 5f1c94371a64b3196d4be9466099bb892df9b88e |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_drm_bridge_unittest.cc
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
ndroid/media_resource_getter.h
ndroid/media_source_player_unittest.cc
ndroid/media_url_interceptor.h
udio_block_fifo.cc
udio_block_fifo.h
udio_bus_perftest.cc
udio_discard_helper.cc
udio_discard_helper.h
udio_discard_helper_unittest.cc
udio_renderer.h
ata_source.h
emuxer_perftest.cc
edia_log_event.h
ock_filters.cc
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
est_data_util.cc
est_data_util.h
ext_renderer.cc
ext_renderer.h
ext_renderer_unittest.cc
ime_source.h
ideo_frame.cc
ideo_frame.h
ideo_frame_unittest.cc
ideo_renderer.h
all_clock_time_source.cc
all_clock_time_source.h
all_clock_time_source_unittest.cc
|
| 116680a4aac90f2aa7413d9095a592090648e557 |
21-Jul-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
ndroid/OWNERS
ndroid/java/src/org/chromium/media/VideoCaptureAndroid.java
ndroid/media_codec_bridge.cc
ndroid/media_drm_bridge.cc
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_block_fifo.cc
udio_block_fifo.h
udio_block_fifo_unittest.cc
udio_bus.cc
udio_bus.h
udio_capturer_source.h
udio_decoder.h
udio_hash.cc
udio_hash.h
udio_renderer.h
udio_renderer_mixer_input.cc
udio_renderer_mixer_input.h
udio_renderer_mixer_input_unittest.cc
udio_renderer_mixer_unittest.cc
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
udio_video_metadata_extractor.cc
uffering_state.h
lock.cc
lock.h
lock_unittest.cc
ontainer_names.cc
ecoder_buffer.h
emuxer_stream.h
ake_text_track_stream.cc
ake_text_track_stream.h
ock_filters.cc
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
tream_parser_buffer.cc
ext_renderer.cc
ext_renderer.h
ext_renderer_unittest.cc
ime_delta_interpolator.cc
ime_delta_interpolator.h
ime_delta_interpolator_unittest.cc
ideo_decoder.h
ideo_frame.cc
ideo_frame.h
ideo_frame_unittest.cc
ideo_renderer.h
ideo_rotation.h
ideo_util.cc
ideo_util.h
|
| 3a3813145f1a83bf03a1c0ba55c41393f7e25ba8 |
26-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Fix build break on mirror-aosp-master
Handle ResourceBusyException generically, as is being done
upstream, so the addition doesn't break mirror-aosp-master.
bug: 13792521
Change-Id: I0ee09f7e1274503bff8a3b17cdea0baf700c9343
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
|
| 489e969ea8162ab3b591496185c5bb30a2d41831 |
25-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Merge "Handle ResourceBusyException from MediaDrm.openSession"
|
| 6d86b77056ed63eb6871182f42a9fd5f07550f90 |
25-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_drm_bridge_unittest.cc
udio_bus.h
udio_decoder.h
ideo_decoder.h
|
| ff5cc0c2da010845caeb2b88b0b294c6ccfc2c2d |
23-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Handle ResourceBusyException from MediaDrm.openSession
bug: 13792521
Change-Id: I123083f60b1af3b7030978bb3ca50b73b4a71daa
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
|
| f8ee788a64d60abd8f2d742a5fdedde054ecd910 |
20-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ndroid/browser_cdm_factory_android.cc
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
udio_decoder.cc
udio_decoder.h
udio_fifo.cc
udio_fifo.h
rowser_cdm.h
rowser_cdm_factory.h
dm_promise.cc
dm_promise.h
emuxer.h
edia_keys.h
ock_filters.h
ipeline.cc
ipeline_unittest.cc
ideo_decoder.cc
ideo_decoder.h
|
| 46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd |
09-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
ndroid/audio_decoder_job.cc
ndroid/audio_decoder_job.h
ndroid/browser_cdm_factory_android.cc
ndroid/cdm_factory_android.cc
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
udio_converter.h
udio_renderer_mixer.cc
udio_renderer_mixer.h
udio_renderer_mixer_input.cc
udio_renderer_mixer_unittest.cc
rowser_cdm.cc
rowser_cdm.h
rowser_cdm_factory.h
dm_factory.h
ecoder_buffer.cc
ecoder_buffer.h
edia.cc
layer_tracker.cc
layer_tracker.h
imd/sinc_resampler_sse.cc
imd/vector_math_sse.cc
inc_resampler.cc
inc_resampler.h
inc_resampler_perftest.cc
inc_resampler_unittest.cc
tream_parser_buffer.cc
tream_parser_buffer.h
ector_math.cc
ector_math.h
ector_math_perftest.cc
ector_math_testing.h
ector_math_unittest.cc
ideo_frame.cc
ideo_frame.h
|
| cedac228d2dd51db4b79ea1e72c7f249408ee061 |
03-Jun-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 273901
This commit was generated by merge_to_master.py.
Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
ndroid/cdm_factory_android.cc
ndroid/demuxer_android.h
ndroid/demuxer_stream_player_params.h
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/UsbMidiDeviceAndroid.java
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_drm_bridge_unittest.cc
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_discard_helper.cc
udio_discard_helper_unittest.cc
udio_hardware_config.cc
udio_hardware_config_unittest.cc
udio_renderer.h
udio_renderer_sink.h
udio_video_metadata_extractor.cc
udio_video_metadata_extractor.h
udio_video_metadata_extractor_unittest.cc
uffering_state.h
dm_factory.h
lock.cc
lock.h
ecoder_buffer.h
edia_file_checker.cc
edia_keys.h
edia_switches.cc
edia_switches.h
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
un_all_perftests.cc
un_all_unittests.cc
erial_runner.cc
erial_runner.h
erial_runner_unittest.cc
tream_parser_buffer.cc
tream_parser_buffer.h
ser_input_monitor_linux.cc
ser_input_monitor_win.cc
ideo_renderer.h
|
| 0de6073388f4e2780db8536178b129cd8f6ab386 |
15-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 269467
This commit was generated by merge_to_master.py.
Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
udio_renderer.h
emuxer.h
edia_log.cc
edia_log_event.h
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
imd/convert_yuva_to_argb_mmx.inc
uv_convert_unittest.cc
|
| 010d83a9304c5a91596085d917d248abff47903a |
14-May-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/java/src/org/chromium/media/UsbMidiDeviceAndroid.java
ndroid/java/src/org/chromium/media/VideoCaptureFactory.java
udio_buffer.cc
udio_buffer.h
udio_buffer_converter.cc
udio_buffer_converter_unittest.cc
udio_buffer_queue_unittest.cc
udio_buffer_unittest.cc
udio_discard_helper.cc
udio_discard_helper.h
udio_discard_helper_unittest.cc
udio_splicer.cc
udio_splicer_unittest.cc
ecoder_buffer.cc
ecoder_buffer.h
edia_switches.cc
edia_switches.h
imd/convert_yuv_to_rgb.h
imd/convert_yuv_to_rgb_c.cc
imd/convert_yuv_to_rgb_mmx.asm
imd/convert_yuv_to_rgb_mmx.inc
imd/convert_yuv_to_rgb_sse.asm
imd/convert_yuv_to_rgb_x86.cc
imd/convert_yuva_to_argb_mmx.asm
imd/convert_yuva_to_argb_mmx.inc
imd/linear_scale_yuv_to_rgb_mmx.asm
imd/linear_scale_yuv_to_rgb_mmx.inc
imd/linear_scale_yuv_to_rgb_mmx_x64.asm
imd/scale_yuv_to_rgb_mmx.asm
imd/scale_yuv_to_rgb_mmx.inc
imd/scale_yuv_to_rgb_sse.asm
imd/scale_yuv_to_rgb_sse2_x64.asm
imd/yuv_to_rgb_table.cc
imd/yuv_to_rgb_table.h
est_helpers.cc
est_helpers.h
ideo_decoder.cc
ideo_decoder.h
ideo_frame.cc
ideo_frame.h
uv_convert.cc
uv_convert.h
uv_convert_perftest.cc
uv_convert_unittest.cc
|
| 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 |
01-May-2014 |
Bo Liu <boliu@google.com> |
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
udio_buffer.h
udio_discard_helper.cc
udio_discard_helper.h
udio_discard_helper_unittest.cc
emuxer.h
ock_filters.h
ipeline.cc
ipeline_unittest.cc
imd/convert_yuv_to_rgb_mmx.inc
imd/convert_yuva_to_argb_mmx.inc
imd/linear_scale_yuv_to_rgb_mmx.inc
imd/scale_yuv_to_rgb_mmx.inc
tream_parser.cc
tream_parser.h
est_helpers.cc
ideo_decoder.h
ideo_frame.cc
ideo_frame.h
ideo_frame_unittest.cc
ideo_renderer.h
uv_convert_perftest.cc
|
| 0529e5d033099cbfc42635f6f6183833b09dff6e |
24-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 265802
This commit was generated by merge_to_master.py.
Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
ndroid/audio_decoder_job.cc
ndroid/audio_decoder_job.h
ndroid/demuxer_stream_player_params.cc
ndroid/demuxer_stream_player_params.h
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
udio_buffer_converter.cc
udio_buffer_converter.h
udio_buffer_converter_unittest.cc
udio_decoder_config.cc
udio_decoder_config.h
udio_hardware_config.cc
udio_hardware_config.h
udio_hardware_config_unittest.cc
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
udio_video_metadata_extractor.cc
udio_video_metadata_extractor.h
udio_video_metadata_extractor_unittest.cc
emuxer.h
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
tream_parser.h
tream_parser_buffer.h
|
| a02191e04bc25c4935f804f2c080ae28663d096d |
16-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 263965
This commit was generated by merge_to_master.py.
Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
ndroid/media_source_player_unittest.cc
tream_parser_buffer.cc
ideo_decoder.cc
ideo_decoder.h
ideo_frame.cc
|
| c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c |
10-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/media_decoder_job.cc
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_drm_bridge_unittest.cc
ndroid/media_source_player_unittest.cc
udio_video_metadata_extractor.cc
udio_video_metadata_extractor.h
udio_video_metadata_extractor_unittest.cc
ata_source.cc
ata_source.h
emuxer.h
emuxer_perftest.cc
ock_data_source_host.cc
ock_data_source_host.h
ock_demuxer_host.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
inc_resampler.cc
inc_resampler.h
ideo_frame.cc
ideo_frame.h
ideo_frame_pool.cc
ideo_frame_pool_unittest.cc
ideo_frame_unittest.cc
|
| e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d |
03-Apr-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 261286
This commit was generated by merge_to_master.py.
Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/java/src/org/chromium/media/VideoCaptureAndroid.java
ndroid/java/src/org/chromium/media/VideoCaptureFactory.java
ndroid/java/src/org/chromium/media/VideoCaptureTango.java
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_jni_registrar.cc
udio_decoder.h
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
ock_filters.h
ideo_decoder.h
|
| effb81e5f8246d0db0270817048dc992db66e9fb |
31-Mar-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/UsbMidiDeviceAndroid.java
ndroid/media_player_android.cc
ndroid/media_player_android.h
udio_buffer.cc
udio_buffer.h
udio_buffer_converter.cc
udio_buffer_converter.h
udio_buffer_converter_unittest.cc
udio_buffer_queue_unittest.cc
udio_buffer_unittest.cc
udio_converter.cc
udio_decoder.h
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
ecoder_buffer.cc
ecoder_buffer.h
emuxer_stream.h
ake_text_track_stream.cc
ake_text_track_stream.h
edia_switches.cc
edia_switches.h
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
un_all_perftests.cc
un_all_unittests.cc
inc_resampler.cc
inc_resampler.h
tream_parser_buffer.cc
tream_parser_buffer.h
est_helpers.cc
est_helpers.h
ideo_frame.cc
ideo_frame.h
ideo_frame_unittest.cc
|
| 23730a6e56a168d1879203e4b3819bb36e3d8f1f |
21-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
ndroid/demuxer_android.h
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_buffer.cc
udio_buffer.h
udio_buffer_queue_unittest.cc
udio_buffer_unittest.cc
udio_converter.cc
udio_converter.h
udio_converter_unittest.cc
udio_decoder_config.cc
udio_decoder_config.h
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
hannel_layout.cc
hannel_layout.h
hannel_mixer.cc
hannel_mixer_unittest.cc
ulti_channel_resampler.cc
ulti_channel_resampler.h
un_all_perftests.cc
un_all_unittests.cc
erial_runner.cc
erial_runner.h
tream_parser.h
est_helpers.cc
est_helpers.h
ext_renderer.cc
ext_renderer.h
ser_input_monitor_linux.cc
ser_input_monitor_win.cc
|
| a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 |
18-Mar-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/UsbMidiDeviceAndroid.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_drm_bridge_unittest.cc
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
udio_buffer_queue_unittest.cc
udio_buffer_unittest.cc
udio_bus.cc
udio_bus.h
udio_decoder.cc
udio_decoder.h
udio_decoder_config.cc
udio_decoder_config.h
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
udio_timestamp_helper.h
ind_to_current_loop.h
ind_to_current_loop.h.pump
ind_to_current_loop_unittest.cc
uffers.h
hannel_layout.cc
hannel_layout.h
hannel_mixer.cc
hannel_mixer_unittest.cc
ecoder_buffer_queue.cc
ecoder_buffer_queue.h
ecoder_buffer_queue_unittest.cc
edia_file_checker.cc
edia_keys.h
edia_log.cc
edia_log.h
edia_switches.cc
edia_switches.h
ock_filters.h
ipeline_status.h
ample_format.cc
ample_format.h
est_data_util.cc
est_helpers.cc
est_helpers.h
ector_math.cc
ector_math.h
ector_math_unittest.cc
ideo_decoder.cc
ideo_decoder.h
ideo_decoder_config.cc
ideo_frame.cc
ideo_frame.h
ideo_frame_pool.cc
ideo_frame_pool_unittest.cc
ideo_frame_unittest.cc
|
| 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 |
21-Feb-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ndroid/OWNERS
ndroid/demuxer_stream_player_params.h
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/AudioRecordInput.java
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/UsbMidiDeviceAndroid.java
ndroid/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_jni_registrar.cc
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_listener.cc
ndroid/media_player_listener.h
ndroid/media_player_manager.h
ndroid/media_resource_getter.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_buffer.h
udio_bus.cc
udio_bus.h
udio_bus_unittest.cc
udio_decoder.h
udio_decoder_config.h
udio_video_metadata_extractor.cc
udio_video_metadata_extractor.h
udio_video_metadata_extractor_unittest.cc
ind_to_current_loop.h
ind_to_current_loop.h.pump
ind_to_current_loop_unittest.cc
ind_to_loop.h
ind_to_loop.h.pump
ind_to_loop_unittest.cc
it_reader.cc
it_reader.h
it_reader_core.cc
it_reader_core.h
it_reader_unittest.cc
allback_holder.h
hannel_mixer_unittest.cc
ontainer_names.h
ecoder_buffer.h
ecrypt_config.cc
ecrypt_config.h
ake_text_track_stream.cc
ake_text_track_stream.h
edia_file_checker.cc
edia_file_checker.h
edia_file_checker_unittest.cc
edia_keys.h
edia_switches.cc
edia_switches.h
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
un_all_perftests.cc
eekable_buffer_unittest.cc
erial_runner.cc
erial_runner.h
imd/convert_rgb_to_yuv_unittest.cc
inc_resampler.h
tream_parser.cc
tream_parser.h
tream_parser_buffer.cc
tream_parser_buffer.h
tream_parser_unittest.cc
est_helpers.cc
ext_ranges.cc
ext_ranges.h
ext_ranges_unittest.cc
ext_renderer.cc
ext_renderer.h
ser_input_monitor_unittest.cc
ector_math_perftest.cc
ector_math_unittest.cc
ideo_decoder.h
ideo_decoder_config.h
ideo_frame.cc
ideo_frame.h
ideo_frame_unittest.cc
ideo_renderer.h
uv_convert.cc
|
| a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 |
18-Dec-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/AudioRecordInput.java
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_decoder_job.cc
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_jni_registrar.cc
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
udio_converter.cc
ontainer_names_unittest.cc
edia_keys.h
edia_switches.cc
edia_switches.h
ipeline.cc
est_data_util.cc
ser_input_monitor_linux.cc
ideo_frame.cc
ideo_frame.h
ideo_frame_pool.cc
ideo_frame_pool.h
ideo_frame_pool_unittest.cc
ideo_frame_unittest.cc
ideo_renderer.h
ideo_util.cc
uv_convert_unittest.cc
|
| f2477e01787aa58f445919b809d89e252beef54f |
28-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_bridge.cc
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_bus.h
udio_bus_perftest.cc
udio_converter_perftest.cc
udio_decoder_config.h
it_reader.cc
emuxer.h
emuxer_perftest.cc
emuxer_stream.h
ake_text_track_stream.cc
ake_text_track_stream.h
ilter_collection.cc
ilter_collection.h
edia_keys.h
edia_log.cc
edia_log_event.h
edia_switches.cc
edia_switches.h
ock_demuxer_host.h
ock_filters.cc
ock_filters.h
ipeline.cc
ipeline.h
ipeline_status.cc
ipeline_status.h
ipeline_unittest.cc
un_all_unittests.cc
imd/vector_math_sse.cc
inc_resampler_perftest.cc
tream_parser.h
ext_cue.cc
ext_cue.h
ext_renderer.cc
ext_renderer.h
ext_renderer_unittest.cc
ext_track.h
ext_track_config.cc
ext_track_config.h
ector_math.cc
ector_math.h
ector_math_perftest.cc
ector_math_testing.h
ector_math_unittest.cc
ideo_decoder_config.cc
ideo_frame.cc
ideo_frame.h
ideo_frame_unittest.cc
|
| 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 |
06-Nov-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/media_decoder_job.cc
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_bus.cc
emuxer_perftest.cc
edia_switches.cc
edia_switches.h
ideo_decoder_config.cc
ideo_frame.cc
ideo_frame.h
|
| 1e9bf3e0803691d0a228da41fc608347b6db4340 |
31-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 232015
This commit was generated by merge_to_master.py.
Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
ndroid/demuxer_android.h
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_bus_perftest.cc
udio_bus_unittest.cc
udio_converter_perftest.cc
udio_converter_unittest.cc
edia_switches.cc
edia_switches.h
inc_resampler.h
inc_resampler_perftest.cc
inc_resampler_unittest.cc
ector_math_perftest.cc
ector_math_unittest.cc
|
| 8bcbed890bc3ce4d7a057a8f32cab53fa534672e |
22-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 230120
This commit was generated by merge_to_master.py.
Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/media_player_android.cc
ndroid/media_player_android.h
ake_audio_renderer_sink.cc
ake_audio_renderer_sink.h
|
| 4e180b6a0b4720a9b8e9e959a882386f690f08ff |
18-Oct-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ndroid/audio_decoder_job.cc
ndroid/audio_decoder_job.h
ndroid/demuxer_android.h
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
ind_to_loop.h
ind_to_loop.h.pump
ata_source.cc
ata_source.h
emuxer.cc
emuxer.h
edia_file_checker.cc
edia_keys.h
edia_switches.cc
edia_switches.h
ipeline.cc
ipeline_unittest.cc
un_all_unittests.cc
inc_resampler.cc
inc_resampler.h
ser_input_monitor_linux.cc
ser_input_monitor_win.cc
|
| 68043e1e95eeb07d5cae7aca370b26518b0867d6 |
26-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 225410
This commit was generated by merge_to_master.py.
Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ndroid/demuxer_android.h
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_renderer_mixer_unittest.cc
edia_keys.h
edia_switches.cc
edia_switches.h
ipeline_unittest.cc
|
| d0247b1b59f9c528cb6df88b4f2b9afaf80d181e |
19-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 224184
This commit was generated by merge_to_master.py.
Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
ndroid/java/src/org/chromium/media/ImageFormat.template
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_codec_bridge.cc
ndroid/media_decoder_job.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_hash.cc
udio_hash.h
udio_hash_unittest.cc
it_reader.cc
eyboard_event_counter.h
coped_histogram_timer_unittest.cc
ser_input_monitor.cc
ser_input_monitor.h
ser_input_monitor_linux.cc
ser_input_monitor_mac.cc
ser_input_monitor_unittest.cc
ser_input_monitor_win.cc
|
| 58537e28ecd584eab876aee8be7156509866d23a |
12-Sep-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
ndroid/audio_decoder_job.cc
ndroid/audio_decoder_job.h
ndroid/demuxer_android.h
ndroid/demuxer_stream_player_params.h
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
udio_decoder_config.cc
udio_decoder_config.h
ecoder_buffer.cc
ecoder_buffer.h
eyboard_event_counter.cc
edia.cc
edia_stub.cc
edia_switches.cc
edia_switches.h
un_all_unittests.cc
imd/convert_rgb_to_yuv_sse2.cc
imd/convert_yuv_to_rgb_c.cc
imd/yuv_to_rgb_table.cc
inc_resampler.cc
ector_math.cc
|
| 424c4d7b64af9d0d8fd9624f381f469654d5e3d2 |
30-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r220549
This commit was generated by merge_to_master.py.
Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
ndroid/audio_decoder_job.cc
ndroid/audio_decoder_job.h
ndroid/demuxer_stream_player_params.cc
ndroid/demuxer_stream_player_params.h
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
emuxer.h
eyboard_event_counter.cc
eyboard_event_counter.h
edia_keys.h
ipeline_unittest.cc
un_all_unittests.cc
erial_runner.cc
erial_runner.h
erial_runner_unittest.cc
tream_parser.h
ser_input_monitor.cc
ser_input_monitor.h
ser_input_monitor_linux.cc
ser_input_monitor_mac.cc
ser_input_monitor_mac.mm
ideo_frame.cc
ideo_frame.h
|
| 3551c9c881056c480085172ff9840cab31610854 |
23-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r219274
This commit was generated by merge_to_master.py.
Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
ndroid/audio_decoder_job.cc
ndroid/audio_decoder_job.h
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaDrmBridge.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_codec_bridge.cc
ndroid/media_decoder_job.cc
ndroid/media_decoder_job.h
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_jni_registrar.cc
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ndroid/video_decoder_job.cc
ndroid/video_decoder_job.h
udio_buffer.cc
udio_buffer.h
udio_capturer_source.h
hannel_layout.cc
hannel_layout.h
emuxer.h
edia_file_checker_unittest.cc
edia_switches.cc
edia_switches.h
ipeline.cc
ipeline_unittest.cc
erial_runner.h
erial_runner_unittest.cc
ser_input_monitor.cc
ser_input_monitor.h
ser_input_monitor_linux.cc
ser_input_monitor_mac.mm
ser_input_monitor_win.cc
|
| ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 |
12-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r216972
This commit was generated by merge_to_master.py.
Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
ndroid/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
ndroid/media_player_bridge.cc
ndroid/webaudio_media_codec_bridge.cc
ndroid/webaudio_media_codec_bridge.h
edia_file_checker.cc
edia_file_checker.h
edia_file_checker_unittest.cc
edia_switches.cc
edia_switches.h
ideo_frame.cc
ideo_frame.h
ideo_util.cc
|
| bb1529ce867d8845a77ec7cdf3e3003ef1771a40 |
08-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r216370
This commit was generated by merge_to_master.py.
Change-Id: I739228187a6f1df6c28c5761160e593a49891113
ncoded_bitstream_buffer.cc
ncoded_bitstream_buffer.h
|
| 3240926e260ce088908e02ac07a6cf7b0c0cbf44 |
07-Aug-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r216133
This commit was generated by merge_to_master.py.
Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
edia_log.cc
edia_log.h
edia_log_event.h
ample_format.cc
ample_format.h
ideo_frame.cc
ideo_frame.h
|
| a36e5920737c6adbddd3e43b760e5de8431db6e0 |
05-Aug-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r215573
This commit was generated by merge_to_master.py.
Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
ndroid/demuxer_stream_player_params.cc
ndroid/demuxer_stream_player_params.h
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_buffer.cc
udio_buffer.h
udio_buffer_unittest.cc
ontainer_names.cc
ontainer_names_unittest.cc
imd/filter_yuv_mmx.cc
|
| d3868032626d59662ff73b372b5d584c1d144c53 |
31-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r214391
This commit was generated by merge_to_master.py.
Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5
ndroid/media_codec_bridge.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
|
| 558790d6acca3451cf3a6b497803a5f07d0bec58 |
30-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r214332
This commit was generated by merge_to_master.py.
Change-Id: I82a7c38de906244dc882493568013be659aa65d1
ndroid/media_codec_bridge.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ock_filters.h
tream_parser.h
ideo_decoder.h
|
| a3f7b4e666c476898878fa745f637129375cd889 |
24-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/media_codec_bridge.h
|
| ca12bfac764ba476d6cd062bf1dde12cc64c3f40 |
23-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r213057
This commit was generated by merge_to_master.py.
Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/media_codec_bridge_unittest.cc
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
ind_to_loop_unittest.cc
ecoder_buffer.cc
ecoder_buffer.h
ecoder_buffer_queue.cc
ecoder_buffer_queue_unittest.cc
ecoder_buffer_unittest.cc
ipeline.cc
ipeline_unittest.cc
erial_runner.cc
tream_parser_buffer.cc
est_data_util.cc
est_helpers.cc
|
| 9ab5563a3196760eb381d102cbb2bc0f7abc6a50 |
18-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r212225
This commit was generated by merge_to_master.py.
Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_source_player_unittest.cc
itstream_buffer.h
ncoded_bitstream_buffer.h
ideo_frame.h
|
| 7dbb3d5cf0c15f500944d211057644d6a2f37371 |
17-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r212014
This commit was generated by merge_to_master.py.
Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/media_codec_bridge.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_listener.cc
ndroid/media_player_listener.h
ndroid/media_player_manager.h
ndroid/media_resource_getter.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_buffer.cc
udio_buffer.h
udio_buffer_queue.cc
udio_buffer_queue.h
udio_buffer_queue_unittest.cc
udio_buffer_unittest.cc
udio_bus.cc
udio_bus.h
udio_decoder.h
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
udio_timestamp_helper.cc
udio_timestamp_helper.h
udio_timestamp_helper_unittest.cc
ecryptor.h
edia_switches.cc
edia_switches.h
ock_filters.h
inc_resampler.cc
inc_resampler.h
est_helpers.cc
est_helpers.h
ideo_decoder.cc
ideo_decoder.h
ideo_util.cc
ideo_util.h
ideo_util_unittest.cc
|
| eb525c5499e34cc9c4b825d6d9e75bb07cc06ace |
10-Jul-2013 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
ndroid/OWNERS
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
ndroid/media_resource_getter.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_buffer.h
udio_buffer_queue.cc
udio_buffer_queue.h
udio_buffer_queue_unittest.cc
udio_buffer_unittest.cc
udio_bus_unittest.cc
udio_converter.h
udio_converter_unittest.cc
udio_renderer.h
udio_renderer_mixer.h
udio_splicer.cc
udio_splicer_unittest.cc
udio_timestamp_helper.h
uffers.h
lock.h
ata_buffer.cc
ata_buffer.h
ata_buffer_unittest.cc
ata_source.h
ecoder_buffer.h
ecoder_buffer_queue.h
ecryptor.h
emuxer.h
ncoded_bitstream_buffer.cc
ncoded_bitstream_buffer.h
edia_keys.cc
edia_keys.h
edia_log.cc
edia_log_event.h
edia_switches.cc
edia_switches.h
ock_filters.h
anges.h
coped_histogram_timer.h
coped_histogram_timer_unittest.cc
eekable_buffer.cc
eekable_buffer_unittest.cc
imd/convert_rgb_to_yuv_c.cc
imd/convert_yuv_to_rgb_c.cc
inc_resampler_unittest.cc
tream_parser.h
est_helpers.cc
est_helpers.h
ext_track.h
ector_math_unittest.cc
ideo_frame.cc
ideo_frame.h
ideo_frame_unittest.cc
ideo_renderer.h
uv_convert_unittest.cc
|
| 7d4cd473f85ac64c3747c96c277f9e506a0d2246 |
19-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_drm_bridge.cc
ndroid/media_drm_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_listener.cc
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/media_source_player_unittest.cc
udio_buffer.cc
udio_buffer.h
udio_buffer_unittest.cc
udio_decoder_config.cc
udio_decoder_config.h
udio_renderer_mixer.cc
udio_renderer_mixer.h
udio_renderer_mixer_unittest.cc
lock.cc
lock.h
lock_unittest.cc
imits.h
edia_keys.h
edia_switches.cc
edia_switches.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
un_all_unittests.cc
ample_format.cc
ample_format.h
|
| 5e3f23d412006dc4db4e659864679f29341e113f |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r205548
This commit was generated by merge_to_master.py.
Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
ndroid/media_source_player.cc
ndroid/media_source_player.h
|
| 868fa2fe829687343ffae624259930155e16dbd8 |
11-Jun-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_listener.cc
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
ndroid/webaudio_media_codec_bridge.cc
ndroid/webaudio_media_codec_bridge.h
udio_bus_unittest.cc
udio_converter_unittest.cc
udio_hash.cc
udio_pull_fifo_unittest.cc
udio_renderer.h
udio_renderer_mixer_input_unittest.cc
udio_renderer_mixer_unittest.cc
udio_renderer_sink.h
ind_to_loop.h
ind_to_loop.h.pump
hannel_mixer_unittest.cc
ontainer_names.cc
ontainer_names_unittest.cc
ata_buffer_unittest.cc
ecoder_buffer_queue.cc
ecoder_buffer_unittest.cc
ecryptor.h
emuxer_stream.h
edia.cc
edia_android.cc
edia_keys.cc
edia_keys.h
edia_switches.cc
edia_switches.h
ock_filters.cc
ock_filters.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
erial_runner.cc
inc_resampler_unittest.cc
ector_math_unittest.cc
ideo_frame.cc
ideo_frame_unittest.cc
ideo_util_unittest.cc
uv_convert.cc
uv_convert.h
|
| 90dce4d38c5ff5333bea97d859d4e484e27edf0c |
29-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
ndroid/demuxer_stream_player_params.cc
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaCodecBridge.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_jni_registrar.cc
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.cc
ndroid/media_player_manager.h
ndroid/media_source_player.cc
ndroid/media_source_player.h
udio_converter.cc
udio_pull_fifo.cc
udio_pull_fifo.h
udio_pull_fifo_unittest.cc
it_reader.cc
it_reader.h
it_reader_unittest.cc
allback_holder.h
allback_holder_unittest.cc
ontainer_names.cc
ontainer_names.h
ontainer_names_unittest.cc
ecoder_buffer.cc
ecoder_buffer.h
edia.cc
anges.h
coped_histogram_timer.h
coped_histogram_timer_unittest.cc
imd/convert_rgb_to_yuv.h
imd/convert_rgb_to_yuv_ssse3.asm
imd/convert_rgb_to_yuv_ssse3.inc
imd/convert_yuv_to_rgb.h
imd/convert_yuv_to_rgb_c.cc
imd/convert_yuv_to_rgb_mmx.inc
imd/convert_yuva_to_argb_mmx.inc
imd/empty_register_state_mmx.asm
imd/filter_yuv.h
imd/filter_yuv_mmx.cc
imd/linear_scale_yuv_to_rgb_mmx.inc
imd/linear_scale_yuv_to_rgb_mmx_x64.asm
imd/media_export.asm
imd/scale_yuv_to_rgb_mmx.inc
imd/scale_yuv_to_rgb_sse2_x64.asm
imd/xcode_hack.c
imd/yuv_to_rgb_table.cc
imd/yuv_to_rgb_table.h
inc_resampler.cc
inc_resampler.h
tream_parser.h
tream_parser_buffer.cc
tream_parser_buffer.h
ext_track.h
ideo_decoder.cc
ideo_decoder.h
uv_convert.cc
uv_convert.h
uv_convert_unittest.cc
|
| a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf |
15-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r200144
This commit was generated by merge_to_master.py.
Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
ndroid/media_player_android.cc
ndroid/webaudio_media_codec_bridge.h
ulti_channel_resampler.cc
ulti_channel_resampler.h
ipeline.cc
|
| b2df76ea8fec9e32f6f3718986dba0d95315b29c |
13-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r199464
This commit was generated by merge_to_master.py.
Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
ndroid/demuxer_stream_player_params.h
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_player_android.cc
ndroid/media_player_android.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_manager.h
udio_converter.cc
udio_converter_unittest.cc
ecryptor.h
emuxer_stream.h
ake_audio_render_callback.cc
edia.cc
edia.h
edia_posix.cc
edia_switches.cc
edia_switches.h
ulti_channel_resampler.cc
ulti_channel_resampler.h
ulti_channel_resampler_unittest.cc
ipeline.cc
ipeline.h
ipeline_unittest.cc
un_all_unittests.cc
inc_resampler.cc
inc_resampler.h
inc_resampler_unittest.cc
ector_math.cc
ector_math.h
|
| c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d |
09-May-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
ndroid/OWNERS
ndroid/demuxer_stream_player_params.cc
ndroid/demuxer_stream_player_params.h
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_jni_registrar.cc
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_bridge_manager.cc
ndroid/media_player_bridge_manager.h
ndroid/media_player_manager.cc
ndroid/media_player_manager.h
ndroid/media_resource_getter.h
ndroid/webaudio_media_codec_bridge.cc
ndroid/webaudio_media_codec_bridge.h
ndroid/webaudio_media_codec_info.h
udio_bus.cc
udio_bus.h
udio_bus_unittest.cc
udio_converter.cc
udio_converter.h
udio_converter_unittest.cc
udio_decoder.h
udio_decoder_config.h
udio_hash.h
udio_renderer.h
udio_renderer_mixer.cc
udio_renderer_mixer.h
udio_renderer_mixer_input.cc
udio_renderer_mixer_input.h
udio_renderer_mixer_input_unittest.cc
udio_renderer_mixer_unittest.cc
udio_renderer_sink.h
ind_to_loop.h
ind_to_loop_unittest.cc
it_reader.cc
it_reader.h
yte_queue.cc
yte_queue.h
hannel_mixer.cc
hannel_mixer.h
hannel_mixer_unittest.cc
ata_buffer.cc
ata_buffer.h
ata_buffer_unittest.cc
ata_source.h
ecoder_buffer.cc
ecoder_buffer.h
ecoder_buffer_unittest.cc
ecryptor.h
emuxer.h
emuxer_stream.h
ilter_collection.cc
ilter_collection.h
edia.cc
edia.h
edia_android.cc
edia_log.cc
edia_log.h
edia_log_event.h
edia_posix.cc
edia_stub.cc
edia_switches.cc
edia_switches.h
edia_win.cc
ock_audio_renderer_sink.h
ock_filters.cc
ock_filters.h
ulti_channel_resampler.cc
ulti_channel_resampler.h
ipeline.cc
ipeline.h
ipeline_unittest.cc
anges_unittest.cc
un_all_unittests.cc
imd/convert_rgb_to_yuv_unittest.cc
imd/convert_yuv_to_rgb.h
imd/convert_yuv_to_rgb_c.cc
imd/convert_yuv_to_rgb_x86.cc
imd/convert_yuva_to_argb_mmx.asm
imd/convert_yuva_to_argb_mmx.inc
imd/vector_math_sse.cc
imd/yuv_to_rgb_table.cc
imd/yuv_to_rgb_table.h
inc_resampler.cc
inc_resampler.h
inc_resampler_unittest.cc
tream_parser.h
est_helpers.cc
est_helpers.h
ector_math.cc
ector_math.h
ector_math_testing.h
ector_math_unittest.cc
ideo_decoder.h
ideo_frame.cc
ideo_frame.h
ideo_renderer.h
ideo_util.cc
ideo_util.h
ideo_util_unittest.cc
uv_convert.cc
uv_convert.h
uv_convert_unittest.cc
|
| 2a99a7e74a7f215066514fe81d2bfa6639d9eddd |
28-Mar-2013 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r190564
This commit was generated by merge_to_master.py.
Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
ndroid/OWNERS
ndroid/cookie_getter.cc
ndroid/cookie_getter.h
ndroid/java/src/org/chromium/media/AudioManagerAndroid.java
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/java/src/org/chromium/media/VideoCapture.java
ndroid/media_codec_bridge.cc
ndroid/media_codec_bridge.h
ndroid/media_codec_bridge_unittest.cc
ndroid/media_jni_registrar.cc
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_listener.cc
ndroid/media_player_listener.h
ndroid/media_resource_getter.cc
ndroid/media_resource_getter.h
udio_bus.cc
udio_bus.h
udio_bus_unittest.cc
udio_capturer_source.h
udio_converter.cc
udio_converter.h
udio_converter_unittest.cc
udio_decoder.h
udio_decoder_config.cc
udio_decoder_config.h
udio_fifo_unittest.cc
udio_hardware_config.cc
udio_hardware_config.h
udio_hardware_config_unittest.cc
udio_hash.cc
udio_hash.h
udio_hash_unittest.cc
udio_pull_fifo.cc
udio_pull_fifo.h
udio_pull_fifo_unittest.cc
udio_renderer.h
udio_renderer_mixer.cc
udio_renderer_mixer.h
udio_renderer_mixer_input.cc
udio_renderer_mixer_input.h
udio_renderer_mixer_input_unittest.cc
udio_renderer_mixer_unittest.cc
udio_renderer_sink.h
udio_splicer.cc
udio_splicer.h
udio_splicer_unittest.cc
udio_timestamp_helper.cc
udio_timestamp_helper.h
udio_timestamp_helper_unittest.cc
ind_to_loop.h
ind_to_loop.h.pump
ind_to_loop_unittest.cc
uffers.cc
uffers.h
uffers_unittest.cc
hannel_layout.cc
hannel_layout.h
hannel_mixer.cc
hannel_mixer.h
hannel_mixer_unittest.cc
lock.cc
lock.h
lock_unittest.cc
ata_buffer.cc
ata_buffer.h
ata_buffer_unittest.cc
ecoder_buffer.cc
ecoder_buffer.h
ecoder_buffer_queue.cc
ecoder_buffer_queue.h
ecoder_buffer_queue_unittest.cc
ecoder_buffer_unittest.cc
ecryptor.h
ecryptor_client.h
ake_audio_render_callback.cc
ake_audio_render_callback.h
ilter_collection.cc
ilter_collection.h
ilter_collection_unittest.cc
mock_callback_support.h
mock_callback_support_unittest.cc
imits.h
edia.h
edia_log.cc
edia_log.h
edia_log_event.h
edia_posix.cc
edia_stub.cc
edia_switches.cc
edia_switches.h
edia_win.cc
essage_loop_factory.cc
essage_loop_factory.h
ock_callback.cc
ock_callback.h
ock_filters.cc
ock_filters.h
ulti_channel_resampler.cc
ulti_channel_resampler.h
ulti_channel_resampler_unittest.cc
ipeline.cc
ipeline.h
ipeline_unittest.cc
un_all_unittests.cc
eekable_buffer.cc
eekable_buffer.h
eekable_buffer_unittest.cc
erial_runner.h
imd/convert_rgb_to_yuv_ssse3.asm
imd/convert_rgb_to_yuv_ssse3.h
imd/convert_yuv_to_rgb.h
imd/convert_yuv_to_rgb_c.cc
imd/convert_yuv_to_rgb_mmx.asm
imd/convert_yuv_to_rgb_sse.asm
imd/convert_yuv_to_rgb_x86.cc
imd/empty_register_state_mmx.asm
imd/linear_scale_yuv_to_rgb_mmx.asm
imd/linear_scale_yuv_to_rgb_mmx_x64.asm
imd/linear_scale_yuv_to_rgb_sse.asm
imd/scale_yuv_to_rgb_mmx.asm
imd/scale_yuv_to_rgb_sse.asm
imd/scale_yuv_to_rgb_sse2_x64.asm
imd/sinc_resampler_sse.cc
imd/vector_math_sse.cc
imd/x86inc.asm
inc_resampler.cc
inc_resampler.h
inc_resampler_unittest.cc
tream_parser.h
tream_parser_buffer.cc
est_data_util.cc
est_data_util.h
est_helpers.cc
est_helpers.h
ector_math.cc
ector_math_testing.h
ector_math_unittest.cc
ideo_decoder.cc
ideo_decoder.h
ideo_decoder_config.cc
ideo_decoder_config.h
ideo_frame.cc
ideo_frame.h
ideo_renderer.h
ideo_util.cc
ideo_util.h
ideo_util_unittest.cc
uv_convert.cc
uv_convert.h
uv_convert_unittest.cc
|
| 5821806d5e7f356e8fa4b058a389a808ea183019 |
14-Nov-2012 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision r167172
This commit was generated by merge_to_master.py.
Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
ndroid/OWNERS
ndroid/cookie_getter.cc
ndroid/cookie_getter.h
ndroid/java/src/org/chromium/media/MediaPlayerBridge.java
ndroid/java/src/org/chromium/media/MediaPlayerListener.java
ndroid/media_jni_registrar.cc
ndroid/media_jni_registrar.h
ndroid/media_player_bridge.cc
ndroid/media_player_bridge.h
ndroid/media_player_bridge_manager.cc
ndroid/media_player_bridge_manager.h
ndroid/media_player_listener.cc
ndroid/media_player_listener.h
udio_bus.cc
udio_bus.h
udio_bus_unittest.cc
udio_decoder.cc
udio_decoder.h
udio_decoder_config.cc
udio_decoder_config.h
udio_fifo.cc
udio_fifo.h
udio_fifo_unittest.cc
udio_pull_fifo.cc
udio_pull_fifo.h
udio_pull_fifo_unittest.cc
udio_renderer.cc
udio_renderer.h
udio_renderer_mixer.cc
udio_renderer_mixer.h
udio_renderer_mixer_input.cc
udio_renderer_mixer_input.h
udio_renderer_mixer_input_unittest.cc
udio_renderer_mixer_unittest.cc
udio_renderer_sink.h
ind_to_loop.h
ind_to_loop.h.pump
ind_to_loop_unittest.cc
it_reader.cc
it_reader.h
it_reader_unittest.cc
itstream_buffer.h
uffers.cc
uffers.h
uffers_unittest.cc
yte_queue.cc
yte_queue.h
hannel_layout.cc
hannel_layout.h
hannel_mixer.cc
hannel_mixer.h
hannel_mixer_unittest.cc
lock.cc
lock.h
lock_unittest.cc
ata_buffer.cc
ata_buffer.h
ata_buffer_unittest.cc
ata_source.cc
ata_source.h
ecoder_buffer.cc
ecoder_buffer.h
ecoder_buffer_unittest.cc
ecrypt_config.cc
ecrypt_config.h
ecryptor.cc
ecryptor.h
ecryptor_client.h
emuxer.cc
emuxer.h
emuxer_stream.cc
emuxer_stream.h
jb2.cc
jb2.h
jb2_unittest.cc
ake_audio_render_callback.cc
ake_audio_render_callback.h
ilter_collection.cc
ilter_collection.h
ilter_collection_unittest.cc
imits.h
edia.h
edia_export.h
edia_log.cc
edia_log.h
edia_log_event.h
edia_posix.cc
edia_stub.cc
edia_switches.cc
edia_switches.h
edia_win.cc
essage_loop_factory.cc
essage_loop_factory.h
ock_audio_renderer_sink.cc
ock_audio_renderer_sink.h
ock_callback.cc
ock_callback.h
ock_data_source_host.cc
ock_data_source_host.h
ock_demuxer_host.cc
ock_demuxer_host.h
ock_filters.cc
ock_filters.h
ulti_channel_resampler.cc
ulti_channel_resampler.h
ulti_channel_resampler_unittest.cc
ipeline.cc
ipeline.h
ipeline_status.cc
ipeline_status.h
ipeline_unittest.cc
anges.cc
anges.h
anges_unittest.cc
un_all_unittests.cc
eekable_buffer.cc
eekable_buffer.h
eekable_buffer_unittest.cc
erial_runner.cc
erial_runner.h
imd/convert_rgb_to_yuv.h
imd/convert_rgb_to_yuv_c.cc
imd/convert_rgb_to_yuv_sse2.cc
imd/convert_rgb_to_yuv_ssse3.asm
imd/convert_rgb_to_yuv_ssse3.cc
imd/convert_rgb_to_yuv_ssse3.h
imd/convert_rgb_to_yuv_ssse3.inc
imd/convert_rgb_to_yuv_unittest.cc
imd/convert_yuv_to_rgb.h
imd/convert_yuv_to_rgb_c.cc
imd/convert_yuv_to_rgb_mmx.asm
imd/convert_yuv_to_rgb_mmx.inc
imd/convert_yuv_to_rgb_sse.asm
imd/convert_yuv_to_rgb_x86.cc
imd/filter_yuv.h
imd/filter_yuv_c.cc
imd/filter_yuv_mmx.cc
imd/filter_yuv_sse2.cc
imd/linear_scale_yuv_to_rgb_mmx.asm
imd/linear_scale_yuv_to_rgb_mmx.inc
imd/linear_scale_yuv_to_rgb_mmx_x64.asm
imd/linear_scale_yuv_to_rgb_sse.asm
imd/scale_yuv_to_rgb_mmx.asm
imd/scale_yuv_to_rgb_mmx.inc
imd/scale_yuv_to_rgb_sse.asm
imd/scale_yuv_to_rgb_sse2_x64.asm
imd/x86inc.asm
imd/yuv_to_rgb_table.cc
imd/yuv_to_rgb_table.h
inc_resampler.cc
inc_resampler.h
inc_resampler_unittest.cc
tream_parser.cc
tream_parser.h
tream_parser_buffer.cc
tream_parser_buffer.h
est_data_util.cc
est_data_util.h
ector_math.cc
ector_math.h
ector_math_testing.h
ector_math_unittest.cc
ideo_decoder.cc
ideo_decoder.h
ideo_decoder_config.cc
ideo_decoder_config.h
ideo_frame.cc
ideo_frame.h
ideo_frame_unittest.cc
ideo_renderer.cc
ideo_renderer.h
ideo_util.cc
ideo_util.h
ideo_util_unittest.cc
uv_convert.cc
uv_convert.h
uv_convert_unittest.cc
|