media/media.gyp - Issue 1176993005: Audio and video decoders for MediaCodecPlayer

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/media.gyp

Issue 1176993005: Audio and video decoders for MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: A better unittest fix, increased timeout for video Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index a83911d55cb2d291c028bdc371b8c020a79a101e..a33391ce467dbf4ce60eb07a6e7eed6c1c1ce1b7 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -1125,8 +1125,11 @@

'sources': [

'base/android/access_unit_queue_unittest.cc',

'base/android/media_codec_bridge_unittest.cc',

+ 'base/android/media_codec_decoder_unittest.cc',

'base/android/media_drm_bridge_unittest.cc',

'base/android/media_source_player_unittest.cc',

+ 'base/android/test_data_factory.cc',

+ 'base/android/test_data_factory.h',

'base/audio_block_fifo_unittest.cc',

'base/audio_buffer_converter_unittest.cc',

'base/audio_buffer_queue_unittest.cc',

@@ -1742,10 +1745,16 @@

'base/android/demuxer_stream_player_params.h',

'base/android/media_client_android.cc',

'base/android/media_client_android.h',

+ 'base/android/media_codec_audio_decoder.cc',

+ 'base/android/media_codec_audio_decoder.h',

'base/android/media_codec_bridge.cc',

'base/android/media_codec_bridge.h',

+ 'base/android/media_codec_decoder.cc',

+ 'base/android/media_codec_decoder.h',

'base/android/media_codec_player.cc',

'base/android/media_codec_player.h',

+ 'base/android/media_codec_video_decoder.cc',

+ 'base/android/media_codec_video_decoder.h',

'base/android/media_common_android.h',

'base/android/media_decoder_job.cc',

'base/android/media_decoder_job.h',

« no previous file with comments | « media/base/android/test_data_factory.cc ('k') | media/test/data/h264-320x180-frame-0 » ('j') | no next file with comments »