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

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: CR feedback from ddorwin@ Created 5 years, 3 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..51fb153a530c861a07413ee33e73ecb25ea3b602 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" ]
}
@@ -686,6 +704,9 @@ test("media_unittests") {
"filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc",
]
}
+ 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
+ sources += [ "filters/h265_parser_unittest.cc" ]
+ }
}
if (is_mac || is_ios) {

Powered by Google App Engine
This is Rietveld 408576698