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

Side by Side Diff: media/media.gyp

Issue 10651006: Add Common Encryption support to BMFF, including subsample decryption. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add wrong subsample size test Created 8 years, 5 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 PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
774 ], 774 ],
775 }], 775 }],
776 ['proprietary_codecs==1 or branding=="Chrome"', { 776 ['proprietary_codecs==1 or branding=="Chrome"', {
777 'sources': [ 777 'sources': [
778 'mp4/aac_unittest.cc', 778 'mp4/aac_unittest.cc',
779 'mp4/avc_unittest.cc', 779 'mp4/avc_unittest.cc',
780 'mp4/box_reader_unittest.cc', 780 'mp4/box_reader_unittest.cc',
781 'mp4/es_descriptor_unittest.cc', 781 'mp4/es_descriptor_unittest.cc',
782 'mp4/mp4_stream_parser_unittest.cc', 782 'mp4/mp4_stream_parser_unittest.cc',
783 'mp4/offset_byte_queue_unittest.cc', 783 'mp4/offset_byte_queue_unittest.cc',
784 'mp4/track_run_iterator_unittest.cc',
784 ], 785 ],
785 }], 786 }],
786 ], 787 ],
787 }, 788 },
788 { 789 {
789 'target_name': 'media_test_support', 790 'target_name': 'media_test_support',
790 'type': 'static_library', 791 'type': 'static_library',
791 'dependencies': [ 792 'dependencies': [
792 'media', 793 'media',
793 '../base/base.gyp:base', 794 '../base/base.gyp:base',
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 1114 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
1114 ], 1115 ],
1115 'sources': [ 1116 'sources': [
1116 'tools/media_bench/media_bench.cc', 1117 'tools/media_bench/media_bench.cc',
1117 ], 1118 ],
1118 }, 1119 },
1119 ], 1120 ],
1120 }] 1121 }]
1121 ], 1122 ],
1122 } 1123 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698