Implemented HEVC video demuxing and parsing

media/media.gyp

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 626 matching lines @@
             'filters/ffmpeg_aac_bitstream_converter.h',
             'filters/ffmpeg_audio_decoder.cc',
             'filters/ffmpeg_audio_decoder.h',
             'filters/ffmpeg_bitstream_converter.h',
             'filters/ffmpeg_demuxer.cc',
             'filters/ffmpeg_demuxer.h',
             'filters/ffmpeg_glue.cc',
             'filters/ffmpeg_glue.h',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.cc',
             'filters/ffmpeg_h264_to_annex_b_bitstream_converter.h',
+            'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',

[ddorwin, 2015/06/12 00:52:27]

Should we block these on a separate hevc variable that is only set when
'chromecast==1'?

[servolk, 2015/06/12 21:57:31]

We had a separate lengthy discussion with rsleevi@ and brettw@ about this.
Earlier patchsets of this CL used to add a new global gyp flag in
build/common.gypi for toggling HEVC support (e.g. see patchset #17). But
rsleevi@ and brettw@ we against introducing any new global gyp flags and
suggested that instead we should use the '#if defined(ENABLE_HEVC_DEMUXING)'
approach everywhere. So if you look, for example at
fmpeg_h265_to_annex_b_bitstream_converter.cc, it has #if at the very top of the
file, to ensure no HEVC code is included into any builds that didn't enable it
explicitly. I think that's the best we can do without global gyp flag.

[ddorwin, 2015/06/19 21:40:14]

They didn't want *global* GYP flags. What I'm proposing is a GYP flag local to
this GYP file, which I believe is entirely acceptable. It's essentially a way of
defining a local variable to avoid duplicating logic.

We could #ifdef every Android-specific file, but we don't - we use GYP flags.

If you want to be extra careful, you could #error if ENABLE_HEVC_DEMUXING is not
defined in those files.

Speaking of that discussion, were they okay with ENABLE_HEVC_DEMUXING in
common.gypi? That has a similar cost to the entire project. See my comments
there.

+            'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
             'filters/ffmpeg_video_decoder.cc',
             'filters/ffmpeg_video_decoder.h',
             'filters/in_memory_url_protocol.cc',
             'filters/in_memory_url_protocol.h',
           ],
           'defines': [
             'MEDIA_DISABLE_FFMPEG',
           ],
           'direct_dependent_settings': {
             'defines': [
@@ skipping 321 matching lines @@
               'msvs_disabled_warnings': [ 4267, ],
             }],
           ],
         }],
         ['proprietary_codecs==1', {
           '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',
+            'filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc',
+            'filters/ffmpeg_h265_to_annex_b_bitstream_converter.h',
             'filters/h264_to_annex_b_bitstream_converter.cc',
             'filters/h264_to_annex_b_bitstream_converter.h',
+            'filters/h265_parser.cc',
+            'filters/h265_parser.h',
             'formats/mp2t/es_adapter_video.cc',
             'formats/mp2t/es_adapter_video.h',
             'formats/mp2t/es_parser.cc',
             'formats/mp2t/es_parser.h',
             'formats/mp2t/es_parser_adts.cc',
             'formats/mp2t/es_parser_adts.h',
             'formats/mp2t/es_parser_h264.cc',
             'formats/mp2t/es_parser_h264.h',
             'formats/mp2t/es_parser_mpeg1audio.cc',
             'formats/mp2t/es_parser_mpeg1audio.h',
@@ skipping 18 matching lines @@
             'formats/mp4/avc.cc',
             'formats/mp4/avc.h',
             'formats/mp4/box_definitions.cc',
             'formats/mp4/box_definitions.h',
             'formats/mp4/box_reader.cc',
             'formats/mp4/box_reader.h',
             'formats/mp4/cenc.cc',
             'formats/mp4/cenc.h',
             'formats/mp4/es_descriptor.cc',
             'formats/mp4/es_descriptor.h',
+            'formats/mp4/hevc.cc',
+            'formats/mp4/hevc.h',
             'formats/mp4/mp4_stream_parser.cc',
             'formats/mp4/mp4_stream_parser.h',
             'formats/mp4/sample_to_group_iterator.cc',
             'formats/mp4/sample_to_group_iterator.h',
             'formats/mp4/track_run_iterator.cc',
             'formats/mp4/track_run_iterator.h',
             'formats/mpeg/adts_constants.cc',
             'formats/mpeg/adts_constants.h',
             'formats/mpeg/adts_stream_parser.cc',
             'formats/mpeg/adts_stream_parser.h',
@@ skipping 187 matching lines @@
       'include_dirs': [
         # Needed by media_drm_bridge.cc.
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['arm_neon==1', {
           'defines': [
             'USE_NEON'
           ],
         }],
+        ['proprietary_codecs==1', {
+          'sources': [
+            'filters/h265_parser_unittest.cc',
+          ],
+        }],
         ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
         }, {  # media_use_ffmpeg== 0
           'sources!': [
             'base/audio_video_metadata_extractor_unittest.cc',
             'base/container_names_unittest.cc',
             'base/media_file_checker_unittest.cc',
             'ffmpeg/ffmpeg_common_unittest.cc',
@@ skipping 717 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'audio_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }