Implemented HEVC video demuxing and parsing

media/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 import("//media/media_options.gni")
@@ skipping 14 matching lines @@
   }
   if (use_pulseaudio) {
     defines += [ "USE_PULSEAUDIO" ]
     if (!link_pulseaudio) {
       defines += [ "DLOPEN_PULSEAUDIO" ]
     }
   }
   if (use_cras) {
     defines += [ "USE_CRAS" ]
   }
+  if (proprietary_codecs && enable_hevc_demuxing) {
+    defines += [ "ENABLE_HEVC_DEMUXING" ]
+  }
 }
 
 config("media_implementation") {
   defines = [ "MEDIA_IMPLEMENTATION" ]
 }
 
 config("media_dependent_config") {
   defines = []
   if (!media_use_libvpx) {
     defines += [ "MEDIA_DISABLE_LIBVPX" ]
@@ skipping 275 matching lines @@
     if (proprietary_codecs) {
       sources += [
         "filters/ffmpeg_aac_bitstream_converter.cc",
         "filters/ffmpeg_aac_bitstream_converter.h",
         "filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc",
         "filters/ffmpeg_h264_to_annex_b_bitstream_converter.h",
       ]
     }
   }
 
+  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" ]
   }
 
   if (media_use_libvpx) {
     sources += [
       "filters/vpx_video_decoder.cc",
       "filters/vpx_video_decoder.h",
     ]
     deps += [ "//third_party/libvpx" ]
@@ skipping 339 matching lines @@
       "formats/mp4/track_run_iterator_unittest.cc",
       "formats/mpeg/adts_stream_parser_unittest.cc",
       "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc",
     ]
     if (media_use_ffmpeg) {
       sources += [
         "filters/ffmpeg_aac_bitstream_converter_unittest.cc",
         "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 wonder whether we can just
enforce that enable_hevc_demuxing is never set without proprietary_codecs in
some higher level file.

[servolk, 2015/09/08 20:27:25]

This code is inside 'if (proprietary_codecs)' body. Would you prefer to keep it
here or move it out of the outer if body and make the condition more explicit
('proprietary_codecs && enable_hevc_demuxing')?

[servolk, 2015/09/08 20:48:44]

FYI: I've moved this code out of the outer 'if' and updated the condition to
explicitly mention enable_hevc_demuxing

[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 fine.

[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) {
     deps += [ "//media/base/mac" ]
   }
 
   if (is_mac) {
     sources +=
         [ "capture/video/mac/video_capture_device_factory_mac_unittest.mm" ]
   }
@@ skipping 108 matching lines @@
       "//media/base:test_support",
       "//media/test:pipeline_integration_tests",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/ffmpeg",
       "//ui/gfx/geometry",
       "//ui/gfx:test_support",
     ]
   }
 }