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

Unified Diff: media/BUILD.gn

Issue 816353010: Implemented HEVC video demuxing and parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
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) {
wolenetz 2015/09/02 20:43:18 ditto my content/...gn question about 'enable_hevc
DaleCurtis 2015/09/02 21:20:41 This file imports the media_options.gni file so it
servolk 2015/09/03 00:17:51 Yes, in this case we are importing enable_hevc_dem
+ 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",
"formats/common/stream_parser_test_base.cc",
"formats/common/stream_parser_test_base.h",
"formats/mp2t/es_adapter_video_unittest.cc",

Powered by Google App Engine
This is Rietveld 408576698