Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side 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: Added tests for video decoder, video decoder now reports current time. 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:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 '../skia/skia.gyp:skia', 1100 '../skia/skia.gyp:skia',
1101 '../testing/gmock.gyp:gmock', 1101 '../testing/gmock.gyp:gmock',
1102 '../testing/gtest.gyp:gtest', 1102 '../testing/gtest.gyp:gtest',
1103 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 1103 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
1104 '../ui/gfx/gfx.gyp:gfx', 1104 '../ui/gfx/gfx.gyp:gfx',
1105 '../ui/gfx/gfx.gyp:gfx_geometry', 1105 '../ui/gfx/gfx.gyp:gfx_geometry',
1106 '../ui/gfx/gfx.gyp:gfx_test_support', 1106 '../ui/gfx/gfx.gyp:gfx_test_support',
1107 '../url/url.gyp:url_lib', 1107 '../url/url.gyp:url_lib',
1108 ], 1108 ],
1109 'sources': [ 1109 'sources': [
1110 'base/android/access_unit_queue_unittest.cc',
1110 'base/android/media_codec_bridge_unittest.cc', 1111 'base/android/media_codec_bridge_unittest.cc',
1112 'base/android/media_codec_decoder_unittest.cc',
1111 'base/android/media_drm_bridge_unittest.cc', 1113 'base/android/media_drm_bridge_unittest.cc',
1112 'base/android/media_source_player_unittest.cc', 1114 'base/android/media_source_player_unittest.cc',
1113 'base/audio_block_fifo_unittest.cc', 1115 'base/audio_block_fifo_unittest.cc',
1114 'base/audio_buffer_converter_unittest.cc', 1116 'base/audio_buffer_converter_unittest.cc',
1115 'base/audio_buffer_queue_unittest.cc', 1117 'base/audio_buffer_queue_unittest.cc',
1116 'base/audio_buffer_unittest.cc', 1118 'base/audio_buffer_unittest.cc',
1117 'base/audio_bus_unittest.cc', 1119 'base/audio_bus_unittest.cc',
1118 'base/audio_converter_unittest.cc', 1120 'base/audio_converter_unittest.cc',
1119 'base/audio_discard_helper_unittest.cc', 1121 'base/audio_discard_helper_unittest.cc',
1120 'base/audio_fifo_unittest.cc', 1122 'base/audio_fifo_unittest.cc',
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
1703 'variables': { 1705 'variables': {
1704 'jni_gen_package': 'media', 1706 'jni_gen_package': 'media',
1705 }, 1707 },
1706 'includes': ['../build/jni_generator.gypi'], 1708 'includes': ['../build/jni_generator.gypi'],
1707 }, 1709 },
1708 { 1710 {
1709 # GN: //media/base/android:android 1711 # GN: //media/base/android:android
1710 'target_name': 'player_android', 1712 'target_name': 'player_android',
1711 'type': 'static_library', 1713 'type': 'static_library',
1712 'sources': [ 1714 'sources': [
1715 'base/android/access_unit_queue.cc',
1716 'base/android/access_unit_queue.h',
1713 'base/android/audio_decoder_job.cc', 1717 'base/android/audio_decoder_job.cc',
1714 'base/android/audio_decoder_job.h', 1718 'base/android/audio_decoder_job.h',
1715 'base/android/browser_cdm_factory_android.cc', 1719 'base/android/browser_cdm_factory_android.cc',
1716 'base/android/browser_cdm_factory_android.h', 1720 'base/android/browser_cdm_factory_android.h',
1717 'base/android/demuxer_android.h', 1721 'base/android/demuxer_android.h',
1718 'base/android/demuxer_stream_player_params.cc', 1722 'base/android/demuxer_stream_player_params.cc',
1719 'base/android/demuxer_stream_player_params.h', 1723 'base/android/demuxer_stream_player_params.h',
1720 'base/android/media_client_android.cc', 1724 'base/android/media_client_android.cc',
1721 'base/android/media_client_android.h', 1725 'base/android/media_client_android.h',
1726 'base/android/media_codec_audio_decoder.cc',
1727 'base/android/media_codec_audio_decoder.h',
1722 'base/android/media_codec_bridge.cc', 1728 'base/android/media_codec_bridge.cc',
1723 'base/android/media_codec_bridge.h', 1729 'base/android/media_codec_bridge.h',
1730 'base/android/media_codec_decoder.cc',
1731 'base/android/media_codec_decoder.h',
1724 'base/android/media_codec_player.cc', 1732 'base/android/media_codec_player.cc',
1725 'base/android/media_codec_player.h', 1733 'base/android/media_codec_player.h',
1734 'base/android/media_codec_video_decoder.cc',
1735 'base/android/media_codec_video_decoder.h',
1726 'base/android/media_common_android.h', 1736 'base/android/media_common_android.h',
1727 'base/android/media_decoder_job.cc', 1737 'base/android/media_decoder_job.cc',
1728 'base/android/media_decoder_job.h', 1738 'base/android/media_decoder_job.h',
1729 'base/android/media_drm_bridge.cc', 1739 'base/android/media_drm_bridge.cc',
1730 'base/android/media_drm_bridge.h', 1740 'base/android/media_drm_bridge.h',
1731 'base/android/media_drm_bridge_delegate.cc', 1741 'base/android/media_drm_bridge_delegate.cc',
1732 'base/android/media_drm_bridge_delegate.h', 1742 'base/android/media_drm_bridge_delegate.h',
1733 'base/android/media_jni_registrar.cc', 1743 'base/android/media_jni_registrar.cc',
1734 'base/android/media_jni_registrar.h', 1744 'base/android/media_jni_registrar.h',
1735 'base/android/media_player_android.cc', 1745 'base/android/media_player_android.cc',
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1952 'dependencies': [ 1962 'dependencies': [
1953 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1963 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1954 ], 1964 ],
1955 }], 1965 }],
1956 ], 1966 ],
1957 }, 1967 },
1958 ], 1968 ],
1959 }], 1969 }],
1960 ], 1970 ],
1961 } 1971 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698