OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import("//build/config/android/config.gni") | 5 import("//build/config/android/config.gni") |
6 import("//build/config/arm.gni") | 6 import("//build/config/arm.gni") |
7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
8 import("//build/config/linux/pkg_config.gni") | 8 import("//build/config/linux/pkg_config.gni") |
9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
10 import("//media/media_options.gni") | 10 import("//media/media_options.gni") |
(...skipping 14 matching lines...) Expand all Loading... | |
25 } | 25 } |
26 if (use_pulseaudio) { | 26 if (use_pulseaudio) { |
27 defines += [ "USE_PULSEAUDIO" ] | 27 defines += [ "USE_PULSEAUDIO" ] |
28 if (!link_pulseaudio) { | 28 if (!link_pulseaudio) { |
29 defines += [ "DLOPEN_PULSEAUDIO" ] | 29 defines += [ "DLOPEN_PULSEAUDIO" ] |
30 } | 30 } |
31 } | 31 } |
32 if (use_cras) { | 32 if (use_cras) { |
33 defines += [ "USE_CRAS" ] | 33 defines += [ "USE_CRAS" ] |
34 } | 34 } |
35 if (proprietary_codecs && enable_hevc_demuxing) { | |
36 defines += [ "ENABLE_HEVC_DEMUXING" ] | |
37 } | |
35 } | 38 } |
36 | 39 |
37 config("media_implementation") { | 40 config("media_implementation") { |
38 defines = [ "MEDIA_IMPLEMENTATION" ] | 41 defines = [ "MEDIA_IMPLEMENTATION" ] |
39 } | 42 } |
40 | 43 |
41 config("media_dependent_config") { | 44 config("media_dependent_config") { |
42 defines = [] | 45 defines = [] |
43 if (!media_use_libvpx) { | 46 if (!media_use_libvpx) { |
44 defines += [ "MEDIA_DISABLE_LIBVPX" ] | 47 defines += [ "MEDIA_DISABLE_LIBVPX" ] |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
320 if (proprietary_codecs) { | 323 if (proprietary_codecs) { |
321 sources += [ | 324 sources += [ |
322 "filters/ffmpeg_aac_bitstream_converter.cc", | 325 "filters/ffmpeg_aac_bitstream_converter.cc", |
323 "filters/ffmpeg_aac_bitstream_converter.h", | 326 "filters/ffmpeg_aac_bitstream_converter.h", |
324 "filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc", | 327 "filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc", |
325 "filters/ffmpeg_h264_to_annex_b_bitstream_converter.h", | 328 "filters/ffmpeg_h264_to_annex_b_bitstream_converter.h", |
326 ] | 329 ] |
327 } | 330 } |
328 } | 331 } |
329 | 332 |
333 if (proprietary_codecs && enable_hevc_demuxing) { | |
334 sources += [ | |
335 "filters/h265_parser.cc", | |
336 "filters/h265_parser.h", | |
337 "formats/mp4/hevc.cc", | |
338 "formats/mp4/hevc.h", | |
339 ] | |
340 if (media_use_ffmpeg) { | |
341 sources += [ | |
342 "filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc", | |
343 "filters/ffmpeg_h265_to_annex_b_bitstream_converter.h", | |
344 ] | |
345 } | |
346 } | |
347 | |
330 if (current_cpu == "arm" && arm_use_neon) { | 348 if (current_cpu == "arm" && arm_use_neon) { |
331 defines += [ "USE_NEON" ] | 349 defines += [ "USE_NEON" ] |
332 } | 350 } |
333 | 351 |
334 if (media_use_libvpx) { | 352 if (media_use_libvpx) { |
335 sources += [ | 353 sources += [ |
336 "filters/vpx_video_decoder.cc", | 354 "filters/vpx_video_decoder.cc", |
337 "filters/vpx_video_decoder.h", | 355 "filters/vpx_video_decoder.h", |
338 ] | 356 ] |
339 deps += [ "//third_party/libvpx" ] | 357 deps += [ "//third_party/libvpx" ] |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
679 "formats/mp4/track_run_iterator_unittest.cc", | 697 "formats/mp4/track_run_iterator_unittest.cc", |
680 "formats/mpeg/adts_stream_parser_unittest.cc", | 698 "formats/mpeg/adts_stream_parser_unittest.cc", |
681 "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc", | 699 "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc", |
682 ] | 700 ] |
683 if (media_use_ffmpeg) { | 701 if (media_use_ffmpeg) { |
684 sources += [ | 702 sources += [ |
685 "filters/ffmpeg_aac_bitstream_converter_unittest.cc", | 703 "filters/ffmpeg_aac_bitstream_converter_unittest.cc", |
686 "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc", | 704 "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc", |
687 ] | 705 ] |
688 } | 706 } |
707 if (enable_hevc_demuxing) { | |
ddorwin
2015/09/08 19:54:36
Add "proprietary_codecs && " for consistency? I wo
servolk
2015/09/08 20:27:25
This code is inside 'if (proprietary_codecs)' body
servolk
2015/09/08 20:48:44
FYI: I've moved this code out of the outer 'if' an
ddorwin
2015/09/08 20:53:28
It was probably fine and perhaps better.
ddorwin
2015/09/08 20:53:28
Oh, I didn't see the nesting correctly. That was f
servolk
2015/09/08 21:17:56
Ok, moved it back in PS #60
| |
708 sources += [ "filters/h265_parser_unittest.cc" ] | |
709 } | |
689 } | 710 } |
690 | 711 |
691 if (is_mac || is_ios) { | 712 if (is_mac || is_ios) { |
692 deps += [ "//media/base/mac" ] | 713 deps += [ "//media/base/mac" ] |
693 } | 714 } |
694 | 715 |
695 if (is_mac) { | 716 if (is_mac) { |
696 sources += | 717 sources += |
697 [ "capture/video/mac/video_capture_device_factory_mac_unittest.mm" ] | 718 [ "capture/video/mac/video_capture_device_factory_mac_unittest.mm" ] |
698 } | 719 } |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
807 "//media/base:test_support", | 828 "//media/base:test_support", |
808 "//media/test:pipeline_integration_tests", | 829 "//media/test:pipeline_integration_tests", |
809 "//testing/gmock", | 830 "//testing/gmock", |
810 "//testing/gtest", | 831 "//testing/gtest", |
811 "//third_party/ffmpeg", | 832 "//third_party/ffmpeg", |
812 "//ui/gfx/geometry", | 833 "//ui/gfx/geometry", |
813 "//ui/gfx:test_support", | 834 "//ui/gfx:test_support", |
814 ] | 835 ] |
815 } | 836 } |
816 } | 837 } |
OLD | NEW |