From c1b47e256bad2405bd6834c9666f26fda6c31796 Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Wed, 1 Oct 2014 12:35:23 -0700 Subject: [PATCH] Clean up include files for third_party libs Change-Id: Ie1b48d3c22d646a58472d759963f98614a444cce --- app/libcrypto_threading_posix.cc | 4 +-- media/file/udp_file.cc | 2 +- media/formats/mp2t/adts_header.cc | 2 +- media/formats/wvm/wvm.gyp | 14 +++----- media/formats/wvm/wvm_media_parser.cc | 51 ++++++++++++++------------- media/formats/wvm/wvm_media_parser.h | 7 ++-- 6 files changed, 37 insertions(+), 43 deletions(-) diff --git a/app/libcrypto_threading_posix.cc b/app/libcrypto_threading_posix.cc index 461c1e5914..4f03bf5c1b 100644 --- a/app/libcrypto_threading_posix.cc +++ b/app/libcrypto_threading_posix.cc @@ -6,10 +6,10 @@ #include "app/libcrypto_threading.h" +#include #include -#include -#include "openssl/crypto.h" +#include namespace { diff --git a/media/file/udp_file.cc b/media/file/udp_file.cc index 01d334e63d..33291cd006 100644 --- a/media/file/udp_file.cc +++ b/media/file/udp_file.cc @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -16,7 +17,6 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" -#include "gflags/gflags.h" // TODO(tinskip): Adapt to work with winsock. diff --git a/media/formats/mp2t/adts_header.cc b/media/formats/mp2t/adts_header.cc index 419442e78d..d4b1156faf 100644 --- a/media/formats/mp2t/adts_header.cc +++ b/media/formats/mp2t/adts_header.cc @@ -4,7 +4,7 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "adts_header.h" +#include "media/formats/mp2t/adts_header.h" #include "media/base/bit_reader.h" #include "media/formats/mp2t/mp2t_common.h" diff --git a/media/formats/wvm/wvm.gyp b/media/formats/wvm/wvm.gyp index 1a95930cf4..df0d085672 100644 --- a/media/formats/wvm/wvm.gyp +++ b/media/formats/wvm/wvm.gyp @@ -5,15 +5,9 @@ # https://developers.google.com/open-source/licenses/bsd { - 'variables': { - # Compile as chromium code to enable warnings and warnings-as-errors. - 'chromium_code': 1, - }, - 'target_defaults': { - 'include_dirs': [ - '../../..', - ], - }, + 'includes': [ + '../../../common.gypi', + ], 'targets': [ { 'target_name': 'wvm', @@ -25,7 +19,7 @@ 'dependencies': [ '../../base/media_base.gyp:base', '../../filters/filters.gyp:filters', - '../../formats/mp2t/mp2t.gyp:mp2t', + '../../formats/mp2t/mp2t.gyp:mp2t', '../mpeg/mpeg.gyp:mpeg', ], }, diff --git a/media/formats/wvm/wvm_media_parser.cc b/media/formats/wvm/wvm_media_parser.cc index 161f9d7f39..251bd7c43f 100644 --- a/media/formats/wvm/wvm_media_parser.cc +++ b/media/formats/wvm/wvm_media_parser.cc @@ -2,16 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include -#include +#include "media/formats/wvm/wvm_media_parser.h" + #include #include #include #include "base/strings/string_number_conversions.h" +#include "media/base/audio_stream_info.h" +#include "media/base/media_sample.h" +#include "media/base/video_stream_info.h" #include "media/formats/mp2t/adts_header.h" -#include "media/formats/wvm/wvm_media_parser.h" - #define HAS_HEADER_EXTENSION(x) ((x != 0xBC) && (x != 0xBE) && (x != 0xBF) \ && (x != 0xF0) && (x != 0xF2) && (x != 0xF8) \ @@ -41,28 +42,28 @@ const uint32_t kPesStreamIdVideo = 0xE0; const uint32_t kPesStreamIdAudioMask = 0xE0; const uint32_t kPesStreamIdAudio = 0xC0; const uint32_t kVersion4 = 4; - const int kAdtsHeaderMinSize = 7; - const uint8_t kAacSampleSizeBits = 16; - // Applies to all video streams. - const uint8_t kNaluLengthSize = 4; // unit is bytes. - // Placeholder sampling frequency for all audio streams, which - // will be overwritten after filter parsing. - const uint32_t kDefaultSamplingFrequency = 100; +const int kAdtsHeaderMinSize = 7; +const uint8_t kAacSampleSizeBits = 16; +// Applies to all video streams. +const uint8_t kNaluLengthSize = 4; // unit is bytes. +// Placeholder sampling frequency for all audio streams, which +// will be overwritten after filter parsing. +const uint32_t kDefaultSamplingFrequency = 100; - enum Type { - Type_void = 0, - Type_uint8 = 1, - Type_int8 = 2, - Type_uint16 = 3, - Type_int16 = 4, - Type_uint32 = 5, - Type_int32 = 6, - Type_uint64 = 7, - Type_int64 = 8, - Type_string = 9, - Type_BinaryData = 10 - }; -} +enum Type { + Type_void = 0, + Type_uint8 = 1, + Type_int8 = 2, + Type_uint16 = 3, + Type_int16 = 4, + Type_uint32 = 5, + Type_int32 = 6, + Type_uint64 = 7, + Type_int64 = 8, + Type_string = 9, + Type_BinaryData = 10 +}; +} // namespace namespace edash_packager { namespace media { diff --git a/media/formats/wvm/wvm_media_parser.h b/media/formats/wvm/wvm_media_parser.h index 26a6e2ba0a..354bd51c6c 100644 --- a/media/formats/wvm/wvm_media_parser.h +++ b/media/formats/wvm/wvm_media_parser.h @@ -6,18 +6,17 @@ #ifndef MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_ #define MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_ +#include + #include #include #include #include + #include "base/memory/scoped_ptr.h" #include "media/base/media_parser.h" -#include "media/base/audio_stream_info.h" -#include "media/base/video_stream_info.h" -#include "media/base/media_sample.h" #include "media/base/network_util.h" #include "media/filters/h264_byte_to_unit_stream_converter.h" -#include "openssl/sha.h" namespace edash_packager { namespace media {