Index: media/BUILD.gn |
diff --git a/media/BUILD.gn b/media/BUILD.gn |
index 0308bc049ceeee109209c3fff39434fecbcb7c3d..9a7dda0aa55acf92dd782846e9412b09acb264e6 100644 |
--- a/media/BUILD.gn |
+++ b/media/BUILD.gn |
@@ -32,6 +32,9 @@ config("media_config") { |
if (use_cras) { |
defines += [ "USE_CRAS" ] |
} |
+ if (proprietary_codecs && enable_hevc_demuxing) { |
+ defines += [ "ENABLE_HEVC_DEMUXING" ] |
+ } |
} |
config("media_implementation") { |
@@ -327,6 +330,21 @@ component("media") { |
} |
} |
+ if (proprietary_codecs && enable_hevc_demuxing) { |
+ sources += [ |
+ "filters/h265_parser.cc", |
+ "filters/h265_parser.h", |
+ "formats/mp4/hevc.cc", |
+ "formats/mp4/hevc.h", |
+ ] |
+ if (media_use_ffmpeg) { |
+ sources += [ |
+ "filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc", |
+ "filters/ffmpeg_h265_to_annex_b_bitstream_converter.h", |
+ ] |
+ } |
+ } |
+ |
if (current_cpu == "arm" && arm_use_neon) { |
defines += [ "USE_NEON" ] |
} |
@@ -660,6 +678,7 @@ test("media_unittests") { |
sources += [ |
"cdm/cenc_utils_unittest.cc", |
"filters/h264_to_annex_b_bitstream_converter_unittest.cc", |
+ "filters/h265_parser_unittest.cc", |
ddorwin
2015/09/08 18:55:44
Requires enable_hevc_demuxing
servolk
2015/09/08 19:22:02
Done.
|
"formats/common/stream_parser_test_base.cc", |
"formats/common/stream_parser_test_base.h", |
"formats/mp2t/es_adapter_video_unittest.cc", |