Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename filters directory to codecs 

Also move codecs related classes in mp4 to codecs directory.

Change-Id: I83db2bcf9e66b405fcceed78918b762b26cd7fce
This commit is contained in:
Kongqun Yang 2016-05-25 11:03:17 -07:00
parent 6d281c6676
commit 32482c0bce
80 changed files with 185 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packager/media/formats/mp4/aac_audio_specific_config.cc → packager/media/codecs/aac_audio_specific_config.cc
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "packager/media/formats/mp4/aac_audio_specific_config.h" #include "packager/media/codecs/aac_audio_specific_config.h"
#include <algorithm> #include <algorithm>
@ -25,8 +25,6 @@ const uint8_t kChannelConfigs[] = {0, 1, 2, 3, 4, 5, 6, 8};
namespace shaka { namespace shaka {
namespace media { namespace media {
namespace mp4 {
AACAudioSpecificConfig::AACAudioSpecificConfig() AACAudioSpecificConfig::AACAudioSpecificConfig()
: audio_object_type_(0), : audio_object_type_(0),
frequency_index_(0), frequency_index_(0),
@ -260,7 +258,5 @@ bool AACAudioSpecificConfig::SkipGASpecificConfig(BitReader* bit_reader) const {
return true; return true;
} }
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka

9
packager/media/formats/mp4/aac_audio_specific_config.h → packager/media/codecs/aac_audio_specific_config.h
View File

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_ #ifndef MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
#define MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_ #define MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -15,8 +15,6 @@ namespace media {
class BitReader; class BitReader;
namespace mp4 {
// Methods are virtual for mocking. // Methods are virtual for mocking.
/// This class parses the AAC information from decoder specific information /// This class parses the AAC information from decoder specific information
/// embedded in the @b esds box in an ISO BMFF file. /// embedded in the @b esds box in an ISO BMFF file.
@ -85,8 +83,7 @@ class AACAudioSpecificConfig {
uint8_t num_channels_; uint8_t num_channels_;
}; };
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FORMATS_MP4_AAC_AUDIO_SPECIFIC_CONFIG_H_ #endif // MEDIA_CODECS_AAC_AUDIO_SPECIFIC_CONFIG_H_

4
packager/media/formats/mp4/aac_audio_specific_config_unittest.cc → packager/media/codecs/aac_audio_specific_config_unittest.cc
View File

@ -4,11 +4,10 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/media/formats/mp4/aac_audio_specific_config.h" #include "packager/media/codecs/aac_audio_specific_config.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
namespace mp4 {
TEST(AACAudioSpecificConfigTest, BasicProfileTest) { TEST(AACAudioSpecificConfigTest, BasicProfileTest) {
AACAudioSpecificConfig aac_audio_specific_config; AACAudioSpecificConfig aac_audio_specific_config;
@ -141,6 +140,5 @@ TEST(AACAudioSpecificConfigTest, IncorrectChannelTest) {
EXPECT_TRUE(aac_audio_specific_config.Parse(data)); EXPECT_TRUE(aac_audio_specific_config.Parse(data));
} }
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka

4
packager/media/filters/avc_decoder_configuration_record.cc → packager/media/codecs/avc_decoder_configuration_record.cc
View File

@ -4,13 +4,13 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/avc_decoder_configuration_record.h" #include "packager/media/codecs/avc_decoder_configuration_record.h"
#include "packager/base/strings/string_number_conversions.h" #include "packager/base/strings/string_number_conversions.h"
#include "packager/base/strings/string_util.h" #include "packager/base/strings/string_util.h"
#include "packager/media/base/buffer_reader.h" #include "packager/media/base/buffer_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"
#include "packager/media/filters/h264_parser.h" #include "packager/media/codecs/h264_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

8
packager/media/filters/avc_decoder_configuration_record.h → packager/media/codecs/avc_decoder_configuration_record.h
View File

@ -4,15 +4,15 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_AVC_DECODER_CONFIGURATION_RECORD_H_ #ifndef MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
#define MEDIA_FILTERS_AVC_DECODER_CONFIGURATION_RECORD_H_ #define MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#include <vector> #include <vector>
#include "packager/base/macros.h" #include "packager/base/macros.h"
#include "packager/media/filters/decoder_configuration_record.h" #include "packager/media/codecs/decoder_configuration_record.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -61,4 +61,4 @@ class AVCDecoderConfigurationRecord : public DecoderConfigurationRecord {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_AVC_DECODER_CONFIGURATION_RECORD_H_ #endif // MEDIA_CODECS_AVC_DECODER_CONFIGURATION_RECORD_H_

2
packager/media/filters/avc_decoder_configuration_record_unittest.cc → packager/media/codecs/avc_decoder_configuration_record_unittest.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/avc_decoder_configuration_record.h" #include "packager/media/codecs/avc_decoder_configuration_record.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>

17
packager/media/filters/filters.gyp → packager/media/codecs/codecs.gyp
View File

@ -1,7 +1,7 @@
# Copyright 2014 Google Inc. All rights reserved. # Copyright 2014 Google Inc. All rights reserved.
# #
# Use of this source code is governed by a BSD-style # Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE filters or at # license that can be found in the LICENSE file or at
# https://developers.google.com/open-source/licenses/bsd # https://developers.google.com/open-source/licenses/bsd
{ {
@ -10,15 +10,19 @@
], ],
'targets': [ 'targets': [
{ {
'target_name': 'filters', 'target_name': 'codecs',
'type': '<(component)', 'type': '<(component)',
'sources': [ 'sources': [
'aac_audio_specific_config.cc',
'aac_audio_specific_config.h',
'avc_decoder_configuration_record.cc', 'avc_decoder_configuration_record.cc',
'avc_decoder_configuration_record.h', 'avc_decoder_configuration_record.h',
'decoder_configuration_record.cc', 'decoder_configuration_record.cc',
'decoder_configuration_record.h', 'decoder_configuration_record.h',
'ec3_audio_util.cc', 'ec3_audio_util.cc',
'ec3_audio_util.h', 'ec3_audio_util.h',
'es_descriptor.cc',
'es_descriptor.h',
'h264_byte_to_unit_stream_converter.cc', 'h264_byte_to_unit_stream_converter.cc',
'h264_byte_to_unit_stream_converter.h', 'h264_byte_to_unit_stream_converter.h',
'h264_parser.cc', 'h264_parser.cc',
@ -37,6 +41,8 @@
'nal_unit_to_byte_stream_converter.h', 'nal_unit_to_byte_stream_converter.h',
'nalu_reader.cc', 'nalu_reader.cc',
'nalu_reader.h', 'nalu_reader.h',
'video_slice_header_parser.cc',
'video_slice_header_parser.h',
'vp_codec_configuration_record.cc', 'vp_codec_configuration_record.cc',
'vp_codec_configuration_record.h', 'vp_codec_configuration_record.h',
'vp8_parser.cc', 'vp8_parser.cc',
@ -50,11 +56,13 @@
], ],
}, },
{ {
'target_name': 'filters_unittest', 'target_name': 'codecs_unittest',
'type': '<(gtest_target_type)', 'type': '<(gtest_target_type)',
'sources': [ 'sources': [
'aac_audio_specific_config_unittest.cc',
'avc_decoder_configuration_record_unittest.cc', 'avc_decoder_configuration_record_unittest.cc',
'ec3_audio_util_unittest.cc', 'ec3_audio_util_unittest.cc',
'es_descriptor_unittest.cc',
'h264_byte_to_unit_stream_converter_unittest.cc', 'h264_byte_to_unit_stream_converter_unittest.cc',
'h264_parser_unittest.cc', 'h264_parser_unittest.cc',
'h265_byte_to_unit_stream_converter_unittest.cc', 'h265_byte_to_unit_stream_converter_unittest.cc',
@ -63,6 +71,7 @@
'hevc_decoder_configuration_record_unittest.cc', 'hevc_decoder_configuration_record_unittest.cc',
'nal_unit_to_byte_stream_converter_unittest.cc', 'nal_unit_to_byte_stream_converter_unittest.cc',
'nalu_reader_unittest.cc', 'nalu_reader_unittest.cc',
'video_slice_header_parser_unittest.cc',
'vp_codec_configuration_record_unittest.cc', 'vp_codec_configuration_record_unittest.cc',
'vp8_parser_unittest.cc', 'vp8_parser_unittest.cc',
'vp9_parser_unittest.cc', 'vp9_parser_unittest.cc',
@ -72,7 +81,7 @@
'../../testing/gmock.gyp:gmock', '../../testing/gmock.gyp:gmock',
'../../testing/gtest.gyp:gtest', '../../testing/gtest.gyp:gtest',
'../test/media_test.gyp:media_test_support', '../test/media_test.gyp:media_test_support',
'filters', 'codecs',
], ],
}, },
], ],

2
packager/media/filters/decoder_configuration_record.cc → packager/media/codecs/decoder_configuration_record.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/decoder_configuration_record.h" #include "packager/media/codecs/decoder_configuration_record.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

8
packager/media/filters/decoder_configuration_record.h → packager/media/codecs/decoder_configuration_record.h
View File

@ -4,14 +4,14 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_DECODER_CONFIGURATION_RECORD_H_ #ifndef MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_
#define MEDIA_FILTERS_DECODER_CONFIGURATION_RECORD_H_ #define MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_
#include <vector> #include <vector>
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/base/macros.h" #include "packager/base/macros.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -77,4 +77,4 @@ class DecoderConfigurationRecord {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_DECODER_CONFIGURATION_RECORD_H_ #endif // MEDIA_CODECS_DECODER_CONFIGURATION_RECORD_H_

2
packager/media/filters/ec3_audio_util.cc → packager/media/codecs/ec3_audio_util.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"
#include "packager/media/filters/ec3_audio_util.h" #include "packager/media/codecs/ec3_audio_util.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

6
packager/media/filters/ec3_audio_util.h → packager/media/codecs/ec3_audio_util.h
View File

@ -6,8 +6,8 @@
// //
// Enhanced AC3 audio utility functions. // Enhanced AC3 audio utility functions.
#ifndef MEDIA_FILTERS_EC3_AUDIO_UTIL_H_ #ifndef MEDIA_CODECS_EC3_AUDIO_UTIL_H_
#define MEDIA_FILTERS_EC3_AUDIO_UTIL_H_ #define MEDIA_CODECS_EC3_AUDIO_UTIL_H_
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
@ -24,4 +24,4 @@ bool CalculateEC3ChannelMap(const std::vector<uint8_t>& ec3_data,
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_EC3_AUDIO_UTIL_H_ #endif // MEDIA_CODECS_EC3_AUDIO_UTIL_H_

2
packager/media/filters/ec3_audio_util_unittest.cc → packager/media/codecs/ec3_audio_util_unittest.cc
View File

@ -7,7 +7,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/base/macros.h" #include "packager/base/macros.h"
#include "packager/media/filters/ec3_audio_util.h" #include "packager/media/codecs/ec3_audio_util.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

6
packager/media/formats/mp4/es_descriptor.cc → packager/media/codecs/es_descriptor.cc
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "packager/media/formats/mp4/es_descriptor.h" #include "packager/media/codecs/es_descriptor.h"
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
@ -62,8 +62,6 @@ const uint32_t kUnknownBitrate = 0;
} // namespace } // namespace
namespace mp4 {
ESDescriptor::ESDescriptor() ESDescriptor::ESDescriptor()
: esid_(0), : esid_(0),
object_type_(kForbidden), object_type_(kForbidden),
@ -190,7 +188,5 @@ size_t ESDescriptor::ComputeSize() const {
return es_size + kHeaderSize; return es_size + kHeaderSize;
} }
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka

10
packager/media/formats/mp4/es_descriptor.h → packager/media/codecs/es_descriptor.h
View File

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_ #ifndef MEDIA_CODECS_ES_DESCRIPTOR_H_
#define MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_ #define MEDIA_CODECS_ES_DESCRIPTOR_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -16,8 +16,6 @@ namespace media {
class BitReader; class BitReader;
class BufferWriter; class BufferWriter;
namespace mp4 {
// The following values are extracted from ISO 14496 Part 1 Table 5 - // The following values are extracted from ISO 14496 Part 1 Table 5 -
// objectTypeIndication Values. Only values currently in use are included. // objectTypeIndication Values. Only values currently in use are included.
enum ObjectType { enum ObjectType {
@ -90,9 +88,7 @@ class ESDescriptor {
std::vector<uint8_t> decoder_specific_info_; std::vector<uint8_t> decoder_specific_info_;
}; };
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FORMATS_MP4_ES_DESCRIPTOR_H_ #endif // MEDIA_CODECS_ES_DESCRIPTOR_H_

6
packager/media/formats/mp4/es_descriptor_unittest.cc → packager/media/codecs/es_descriptor_unittest.cc
View File

@ -4,13 +4,11 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/media/formats/mp4/es_descriptor.h" #include "packager/media/codecs/es_descriptor.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
namespace mp4 {
TEST(ESDescriptorTest, SingleByteLengthTest) { TEST(ESDescriptorTest, SingleByteLengthTest) {
ESDescriptor es_desc; ESDescriptor es_desc;
uint8_t buffer[] = {0x03, 0x19, 0x00, 0x01, 0x00, 0x04, 0x11, 0x40, 0x15, uint8_t buffer[] = {0x03, 0x19, 0x00, 0x01, 0x00, 0x04, 0x11, 0x40, 0x15,
@ -76,7 +74,5 @@ TEST(ESDescriptorTest, FiveByteLengthTest) {
EXPECT_EQ(es_desc.decoder_specific_info().size(), 0u); EXPECT_EQ(es_desc.decoder_specific_info().size(), 0u);
} }
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka

4
packager/media/filters/h264_byte_to_unit_stream_converter.cc → packager/media/codecs/h264_byte_to_unit_stream_converter.cc
View File

@ -4,13 +4,13 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h264_byte_to_unit_stream_converter.h"
#include <limits> #include <limits>
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/filters/h264_parser.h" #include "packager/media/codecs/h264_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

8
packager/media/filters/h264_byte_to_unit_stream_converter.h → packager/media/codecs/h264_byte_to_unit_stream_converter.h
View File

@ -4,15 +4,15 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #ifndef MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
#define MEDIA_FILTERS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #define MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include "packager/media/filters/h26x_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h26x_byte_to_unit_stream_converter.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -42,4 +42,4 @@ class H264ByteToUnitStreamConverter : public H26xByteToUnitStreamConverter {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #endif // MEDIA_CODECS_H264_BYTE_TO_UNIT_STREAM_CONVERTER_H_

2
packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc → packager/media/codecs/h264_byte_to_unit_stream_converter_unittest.cc
View File

@ -8,7 +8,7 @@
#include <stdio.h> #include <stdio.h>
#include "packager/base/strings/string_number_conversions.h" #include "packager/base/strings/string_number_conversions.h"
#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h264_byte_to_unit_stream_converter.h"
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"
namespace { namespace {

2
packager/media/filters/h264_parser.cc → packager/media/codecs/h264_parser.cc
View File

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "packager/media/filters/h264_parser.h" #include "packager/media/codecs/h264_parser.h"
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/base/memory/scoped_ptr.h" #include "packager/base/memory/scoped_ptr.h"

10
packager/media/filters/h264_parser.h → packager/media/codecs/h264_parser.h
View File

@ -4,16 +4,16 @@
// //
// This file contains an implementation of an H264 Annex-B video stream parser. // This file contains an implementation of an H264 Annex-B video stream parser.
#ifndef MEDIA_FILTERS_H264_PARSER_H_ #ifndef MEDIA_CODECS_H264_PARSER_H_
#define MEDIA_FILTERS_H264_PARSER_H_ #define MEDIA_CODECS_H264_PARSER_H_
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <map> #include <map>
#include "packager/media/filters/h26x_bit_reader.h" #include "packager/media/codecs/h26x_bit_reader.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -335,4 +335,4 @@ class H264Parser {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_H264_PARSER_H_ #endif // MEDIA_CODECS_H264_PARSER_H_

2
packager/media/filters/h264_parser_unittest.cc → packager/media/codecs/h264_parser_unittest.cc
View File

@ -5,8 +5,8 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/media/codecs/h264_parser.h"
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"
#include "packager/media/filters/h264_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

4
packager/media/filters/h265_byte_to_unit_stream_converter.cc → packager/media/codecs/h265_byte_to_unit_stream_converter.cc
View File

@ -4,14 +4,14 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/h265_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h265_byte_to_unit_stream_converter.h"
#include <limits> #include <limits>
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"
#include "packager/media/filters/h265_parser.h" #include "packager/media/codecs/h265_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

8
packager/media/filters/h265_byte_to_unit_stream_converter.h → packager/media/codecs/h265_byte_to_unit_stream_converter.h
View File

@ -4,15 +4,15 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #ifndef MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
#define MEDIA_FILTERS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #define MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include "packager/media/filters/h26x_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h26x_byte_to_unit_stream_converter.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -43,4 +43,4 @@ class H265ByteToUnitStreamConverter : public H26xByteToUnitStreamConverter {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #endif // MEDIA_CODECS_H265_BYTE_TO_UNIT_STREAM_CONVERTER_H_

4
packager/media/filters/h265_byte_to_unit_stream_converter_unittest.cc → packager/media/codecs/h265_byte_to_unit_stream_converter_unittest.cc
View File

@ -8,8 +8,8 @@
#include <stdio.h> #include <stdio.h>
#include "packager/base/strings/string_number_conversions.h" #include "packager/base/strings/string_number_conversions.h"
#include "packager/media/filters/h265_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h265_byte_to_unit_stream_converter.h"
#include "packager/media/filters/hevc_decoder_configuration_record.h" #include "packager/media/codecs/hevc_decoder_configuration_record.h"
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"
namespace { namespace {

4
packager/media/filters/h265_parser.cc → packager/media/codecs/h265_parser.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/h265_parser.h" #include "packager/media/codecs/h265_parser.h"
#include <algorithm> #include <algorithm>
#include <math.h> #include <math.h>
@ -12,7 +12,7 @@
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/base/stl_util.h" #include "packager/base/stl_util.h"
#include "packager/media/base/macros.h" #include "packager/media/base/macros.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
#define TRUE_OR_RETURN(a) \ #define TRUE_OR_RETURN(a) \
do { \ do { \

8
packager/media/filters/h265_parser.h → packager/media/codecs/h265_parser.h
View File

@ -4,14 +4,14 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_H265_PARSER_H_ #ifndef MEDIA_CODECS_H265_PARSER_H_
#define MEDIA_FILTERS_H265_PARSER_H_ #define MEDIA_CODECS_H265_PARSER_H_
#include <map> #include <map>
#include <vector> #include <vector>
#include "packager/base/memory/scoped_ptr.h" #include "packager/base/memory/scoped_ptr.h"
#include "packager/media/filters/h26x_bit_reader.h" #include "packager/media/codecs/h26x_bit_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -354,4 +354,4 @@ class H265Parser {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_H265_PARSER_H_ #endif // MEDIA_CODECS_H265_PARSER_H_

4
packager/media/filters/h265_parser_unittest.cc → packager/media/codecs/h265_parser_unittest.cc
View File

@ -6,8 +6,8 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/media/filters/h265_parser.h" #include "packager/media/codecs/h265_parser.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/filters/h26x_bit_reader.cc → packager/media/codecs/h26x_bit_reader.cc
View File

@ -3,7 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/media/filters/h26x_bit_reader.h" #include "packager/media/codecs/h26x_bit_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

6
packager/media/filters/h26x_bit_reader.h → packager/media/codecs/h26x_bit_reader.h
View File

@ -4,8 +4,8 @@
// //
// This file contains an implementation of an H264 Annex-B video stream parser. // This file contains an implementation of an H264 Annex-B video stream parser.
#ifndef MEDIA_FILTERS_H264_BIT_READER_H_ #ifndef MEDIA_CODECS_H264_BIT_READER_H_
#define MEDIA_FILTERS_H264_BIT_READER_H_ #define MEDIA_CODECS_H264_BIT_READER_H_
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
@ -98,4 +98,4 @@ class H26xBitReader {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_H264_BIT_READER_H_ #endif // MEDIA_CODECS_H264_BIT_READER_H_

2
packager/media/filters/h26x_bit_reader_unittest.cc → packager/media/codecs/h26x_bit_reader_unittest.cc
View File

@ -4,7 +4,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/media/filters/h26x_bit_reader.h" #include "packager/media/codecs/h26x_bit_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/filters/h26x_byte_to_unit_stream_converter.cc → packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/h26x_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h26x_byte_to_unit_stream_converter.h"
#include <limits> #include <limits>

8
packager/media/filters/h26x_byte_to_unit_stream_converter.h → packager/media/codecs/h26x_byte_to_unit_stream_converter.h
View File

@ -4,14 +4,14 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #ifndef MEDIA_CODECS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_
#define MEDIA_FILTERS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #define MEDIA_CODECS_H26X_BYTE_TO_UNIT_STREAM_CONVERTER_H_
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -60,5 +60,5 @@ class H26xByteToUnitStreamConverter {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_H26x_BYTE_TO_UNIT_STREAM_CONVERTER_H_ #endif // MEDIA_CODECS_H26x_BYTE_TO_UNIT_STREAM_CONVERTER_H_

2
packager/media/filters/hevc_decoder_configuration_record.cc → packager/media/codecs/hevc_decoder_configuration_record.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/hevc_decoder_configuration_record.h" #include "packager/media/codecs/hevc_decoder_configuration_record.h"
#include "packager/base/strings/string_number_conversions.h" #include "packager/base/strings/string_number_conversions.h"
#include "packager/base/strings/string_util.h" #include "packager/base/strings/string_util.h"

8
packager/media/filters/hevc_decoder_configuration_record.h → packager/media/codecs/hevc_decoder_configuration_record.h
View File

@ -4,8 +4,8 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_HEVC_DECODER_CONFIGURATION_RECORD_H_ #ifndef MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
#define MEDIA_FILTERS_HEVC_DECODER_CONFIGURATION_RECORD_H_ #define MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
@ -13,7 +13,7 @@
#include "packager/base/macros.h" #include "packager/base/macros.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/decoder_configuration_record.h" #include "packager/media/codecs/decoder_configuration_record.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -44,4 +44,4 @@ class HEVCDecoderConfigurationRecord : public DecoderConfigurationRecord {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_HEVC_DECODER_CONFIGURATION_RECORD_H_ #endif // MEDIA_CODECS_HEVC_DECODER_CONFIGURATION_RECORD_H_

2
packager/media/filters/hevc_decoder_configuration_record_unittest.cc → packager/media/codecs/hevc_decoder_configuration_record_unittest.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/hevc_decoder_configuration_record.h" #include "packager/media/codecs/hevc_decoder_configuration_record.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>

6
packager/media/filters/nal_unit_to_byte_stream_converter.cc → packager/media/codecs/nal_unit_to_byte_stream_converter.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/nal_unit_to_byte_stream_converter.h" #include "packager/media/codecs/nal_unit_to_byte_stream_converter.h"
#include <list> #include <list>
@ -13,8 +13,8 @@
#include "packager/media/base/buffer_reader.h" #include "packager/media/base/buffer_reader.h"
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/base/macros.h" #include "packager/media/base/macros.h"
#include "packager/media/filters/avc_decoder_configuration_record.h" #include "packager/media/codecs/avc_decoder_configuration_record.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

6
packager/media/filters/nal_unit_to_byte_stream_converter.h → packager/media/codecs/nal_unit_to_byte_stream_converter.h
View File

@ -4,8 +4,8 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef PACKAGER_MEDIA_FILTERS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_ #ifndef PACKAGER_MEDIA_CODECS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_
#define PACKAGER_MEDIA_FILTERS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_ #define PACKAGER_MEDIA_CODECS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
@ -73,4 +73,4 @@ class NalUnitToByteStreamConverter {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // PACKAGER_MEDIA_FILTERS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_ #endif // PACKAGER_MEDIA_CODECS_NAL_UNIT_TO_BYTE_STREAM_CONVERTER_H_

2
packager/media/filters/nal_unit_to_byte_stream_converter_unittest.cc → packager/media/codecs/nal_unit_to_byte_stream_converter_unittest.cc
View File

@ -7,7 +7,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/filters/nal_unit_to_byte_stream_converter.h" #include "packager/media/codecs/nal_unit_to_byte_stream_converter.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

4
packager/media/filters/nalu_reader.cc → packager/media/codecs/nalu_reader.cc
View File

@ -4,13 +4,13 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
#include <iostream> #include <iostream>
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/media/base/buffer_reader.h" #include "packager/media/base/buffer_reader.h"
#include "packager/media/filters/h264_parser.h" #include "packager/media/codecs/h264_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

6
packager/media/filters/nalu_reader.h → packager/media/codecs/nalu_reader.h
View File

@ -4,8 +4,8 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_NALU_READER_H_ #ifndef MEDIA_CODECS_NALU_READER_H_
#define MEDIA_FILTERS_NALU_READER_H_ #define MEDIA_CODECS_NALU_READER_H_
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@ -214,4 +214,4 @@ class NaluReader {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_NALU_READER_H_ #endif // MEDIA_CODECS_NALU_READER_H_

2
packager/media/filters/nalu_reader_unittest.cc → packager/media/codecs/nalu_reader_unittest.cc
View File

@ -6,7 +6,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

8
packager/media/formats/mp4/video_slice_header_parser.cc → packager/media/codecs/video_slice_header_parser.cc
View File

@ -4,15 +4,14 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/formats/mp4/video_slice_header_parser.h" #include "packager/media/codecs/video_slice_header_parser.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"
#include "packager/media/filters/avc_decoder_configuration_record.h" #include "packager/media/codecs/avc_decoder_configuration_record.h"
#include "packager/media/filters/hevc_decoder_configuration_record.h" #include "packager/media/codecs/hevc_decoder_configuration_record.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
namespace mp4 {
namespace { namespace {
@ -90,7 +89,6 @@ int64_t H265VideoSliceHeaderParser::GetHeaderSize(const Nalu& nalu) {
return NumBitsToNumBytes(slice_header.header_bit_size); return NumBitsToNumBytes(slice_header.header_bit_size);
} }
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka

12
packager/media/formats/mp4/video_slice_header_parser.h → packager/media/codecs/video_slice_header_parser.h
View File

@ -4,18 +4,17 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FORMATS_MP4_VIDEO_SLICE_HEADER_PARSER_H_ #ifndef MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_
#define MEDIA_FORMATS_MP4_VIDEO_SLICE_HEADER_PARSER_H_ #define MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_
#include <vector> #include <vector>
#include "packager/media/base/macros.h" #include "packager/media/base/macros.h"
#include "packager/media/filters/h264_parser.h" #include "packager/media/codecs/h264_parser.h"
#include "packager/media/filters/h265_parser.h" #include "packager/media/codecs/h265_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
namespace mp4 {
class VideoSliceHeaderParser { class VideoSliceHeaderParser {
public: public:
@ -68,9 +67,8 @@ class H265VideoSliceHeaderParser : public VideoSliceHeaderParser {
DISALLOW_COPY_AND_ASSIGN(H265VideoSliceHeaderParser); DISALLOW_COPY_AND_ASSIGN(H265VideoSliceHeaderParser);
}; };
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FORMATS_MP4_VIDEO_SLICE_HEADER_PARSER_H_ #endif // MEDIA_CODECS_VIDEO_SLICE_HEADER_PARSER_H_

4
packager/media/formats/mp4/video_slice_header_parser_unittest.cc → packager/media/codecs/video_slice_header_parser_unittest.cc
View File

@ -6,11 +6,10 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "packager/media/formats/mp4/video_slice_header_parser.h" #include "packager/media/codecs/video_slice_header_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
namespace mp4 {
TEST(H264VideoSliceHeaderParserTest, BasicSupport) { TEST(H264VideoSliceHeaderParserTest, BasicSupport) {
// Taken from bear-640x360.mp4 (video) // Taken from bear-640x360.mp4 (video)
@ -152,6 +151,5 @@ TEST(H264VideoSliceHeaderParserTest, ErrorsForEOSWithinEntry) {
EXPECT_FALSE(parser.Initialize(extra_data)); EXPECT_FALSE(parser.Initialize(extra_data));
} }
} // namespace mp4
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka

2
packager/media/filters/vp8_parser.cc → packager/media/codecs/vp8_parser.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/vp8_parser.h" #include "packager/media/codecs/vp8_parser.h"
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"

8
packager/media/filters/vp8_parser.h → packager/media/codecs/vp8_parser.h
View File

@ -4,14 +4,14 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_VP8_PARSER_H_ #ifndef MEDIA_CODECS_VP8_PARSER_H_
#define MEDIA_FILTERS_VP8_PARSER_H_ #define MEDIA_CODECS_VP8_PARSER_H_
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "packager/base/macros.h" #include "packager/base/macros.h"
#include "packager/media/filters/vpx_parser.h" #include "packager/media/codecs/vpx_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -52,4 +52,4 @@ class VP8Parser : public VPxParser {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_VP8_PARSER_H_ #endif // MEDIA_CODECS_VP8_PARSER_H_

2
packager/media/filters/vp8_parser_unittest.cc → packager/media/codecs/vp8_parser_unittest.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/vp8_parser.h" #include "packager/media/codecs/vp8_parser.h"
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>

2
packager/media/filters/vp9_parser.cc → packager/media/codecs/vp9_parser.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/vp9_parser.h" #include "packager/media/codecs/vp9_parser.h"
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"

8
packager/media/filters/vp9_parser.h → packager/media/codecs/vp9_parser.h
View File

@ -4,14 +4,14 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_VP9_PARSER_H_ #ifndef MEDIA_CODECS_VP9_PARSER_H_
#define MEDIA_FILTERS_VP9_PARSER_H_ #define MEDIA_CODECS_VP9_PARSER_H_
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "packager/base/macros.h" #include "packager/base/macros.h"
#include "packager/media/filters/vpx_parser.h" #include "packager/media/codecs/vpx_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -51,4 +51,4 @@ class VP9Parser : public VPxParser {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_VP9_PARSER_H_ #endif // MEDIA_CODECS_VP9_PARSER_H_

2
packager/media/filters/vp9_parser_unittest.cc → packager/media/codecs/vp9_parser_unittest.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/vp9_parser.h" #include "packager/media/codecs/vp9_parser.h"
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>

2
packager/media/filters/vp_codec_configuration_record.cc → packager/media/codecs/vp_codec_configuration_record.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/vp_codec_configuration_record.h" #include "packager/media/codecs/vp_codec_configuration_record.h"
#include "packager/base/strings/string_number_conversions.h" #include "packager/base/strings/string_number_conversions.h"
#include "packager/base/strings/string_util.h" #include "packager/base/strings/string_util.h"

6
packager/media/filters/vp_codec_configuration_record.h → packager/media/codecs/vp_codec_configuration_record.h
View File

@ -4,8 +4,8 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_VP_CODEC_CONFIGURATION_RECORD_H_ #ifndef MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
#define MEDIA_FILTERS_VP_CODEC_CONFIGURATION_RECORD_H_ #define MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
@ -102,4 +102,4 @@ class VPCodecConfigurationRecord {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_VP_CODEC_CONFIGURATION_RECORD_H_ #endif // MEDIA_CODECS_VP_CODEC_CONFIGURATION_RECORD_H_

2
packager/media/filters/vp_codec_configuration_record_unittest.cc → packager/media/codecs/vp_codec_configuration_record_unittest.cc
View File

@ -4,7 +4,7 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include "packager/media/filters/vp_codec_configuration_record.h" #include "packager/media/codecs/vp_codec_configuration_record.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>

8
packager/media/filters/vpx_parser.h → packager/media/codecs/vpx_parser.h
View File

@ -4,14 +4,14 @@
// license that can be found in the LICENSE file or at // license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#ifndef MEDIA_FILTERS_VPX_PARSER_H_ #ifndef MEDIA_CODECS_VPX_PARSER_H_
#define MEDIA_FILTERS_VPX_PARSER_H_ #define MEDIA_CODECS_VPX_PARSER_H_
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "packager/base/macros.h" #include "packager/base/macros.h"
#include "packager/media/filters/vp_codec_configuration_record.h" #include "packager/media/codecs/vp_codec_configuration_record.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -57,4 +57,4 @@ class VPxParser {
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // MEDIA_FILTERS_VPX_PARSER_H_ #endif // MEDIA_CODECS_VPX_PARSER_H_

6
packager/media/filters/webvtt_util.h → packager/media/codecs/webvtt_util.h
View File

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef PACKAGER_MEDIA_FILTERS_WEBVTT_UTIL_H_ #ifndef PACKAGER_MEDIA_CODECS_WEBVTT_UTIL_H_
#define PACKAGER_MEDIA_FILTERS_WEBVTT_UTIL_H_ #define PACKAGER_MEDIA_CODECS_WEBVTT_UTIL_H_
#include <vector> #include <vector>
@ -29,4 +29,4 @@ void MakeSideData(T id_begin, T id_end,
} // namespace media } // namespace media
} // namespace shaka } // namespace shaka
#endif // PACKAGER_MEDIA_FILTERS_WEBVTT_UTIL_H_ #endif // PACKAGER_MEDIA_CODECS_WEBVTT_UTIL_H_

2
packager/media/event/media_event.gyp
View File

@ -28,8 +28,8 @@
# Depends on full protobuf to read/write with TextFormat. # Depends on full protobuf to read/write with TextFormat.
'../../third_party/protobuf/protobuf.gyp:protobuf_full_do_not_use', '../../third_party/protobuf/protobuf.gyp:protobuf_full_do_not_use',
'../base/media_base.gyp:media_base', '../base/media_base.gyp:media_base',
'../codecs/codecs.gyp:codecs',
'../file/file.gyp:file', '../file/file.gyp:file',
'../filters/filters.gyp:filters',
], ],
}, },
{ {

2
packager/media/event/muxer_listener_internal.cc
View File

@ -15,7 +15,7 @@
#include "packager/media/base/muxer_options.h" #include "packager/media/base/muxer_options.h"
#include "packager/media/base/protection_system_specific_info.h" #include "packager/media/base/protection_system_specific_info.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/ec3_audio_util.h" #include "packager/media/codecs/ec3_audio_util.h"
#include "packager/mpd/base/media_info.pb.h" #include "packager/mpd/base/media_info.pb.h"
namespace shaka { namespace shaka {

6
packager/media/formats/mp2t/es_parser_h264.cc
View File

@ -10,9 +10,9 @@
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/timestamp.h" #include "packager/media/base/timestamp.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/avc_decoder_configuration_record.h" #include "packager/media/codecs/avc_decoder_configuration_record.h"
#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h264_byte_to_unit_stream_converter.h"
#include "packager/media/filters/h264_parser.h" #include "packager/media/codecs/h264_parser.h"
#include "packager/media/formats/mp2t/mp2t_common.h" #include "packager/media/formats/mp2t/mp2t_common.h"
namespace shaka { namespace shaka {

2
packager/media/formats/mp2t/es_parser_h264_unittest.cc
View File

@ -12,7 +12,7 @@
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/timestamp.h" #include "packager/media/base/timestamp.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/h264_parser.h" #include "packager/media/codecs/h264_parser.h"
#include "packager/media/formats/mp2t/es_parser_h264.h" #include "packager/media/formats/mp2t/es_parser_h264.h"
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"

6
packager/media/formats/mp2t/es_parser_h265.cc
View File

@ -13,9 +13,9 @@
#include "packager/media/base/offset_byte_queue.h" #include "packager/media/base/offset_byte_queue.h"
#include "packager/media/base/timestamp.h" #include "packager/media/base/timestamp.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/hevc_decoder_configuration_record.h" #include "packager/media/codecs/h265_byte_to_unit_stream_converter.h"
#include "packager/media/filters/h265_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h265_parser.h"
#include "packager/media/filters/h265_parser.h" #include "packager/media/codecs/hevc_decoder_configuration_record.h"
#include "packager/media/formats/mp2t/mp2t_common.h" #include "packager/media/formats/mp2t/mp2t_common.h"
namespace shaka { namespace shaka {

4
packager/media/formats/mp2t/es_parser_h26x.cc
View File

@ -12,8 +12,8 @@
#include "packager/media/base/offset_byte_queue.h" #include "packager/media/base/offset_byte_queue.h"
#include "packager/media/base/timestamp.h" #include "packager/media/base/timestamp.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h264_byte_to_unit_stream_converter.h"
#include "packager/media/filters/h265_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h265_byte_to_unit_stream_converter.h"
#include "packager/media/formats/mp2t/mp2t_common.h" #include "packager/media/formats/mp2t/mp2t_common.h"
namespace shaka { namespace shaka {

2
packager/media/formats/mp2t/es_parser_h26x.h
View File

@ -12,7 +12,7 @@
#include "packager/base/callback.h" #include "packager/base/callback.h"
#include "packager/base/compiler_specific.h" #include "packager/base/compiler_specific.h"
#include "packager/base/memory/scoped_ptr.h" #include "packager/base/memory/scoped_ptr.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
#include "packager/media/formats/mp2t/es_parser.h" #include "packager/media/formats/mp2t/es_parser.h"
namespace shaka { namespace shaka {

2
packager/media/formats/mp2t/es_parser_h26x_unittest.cc
View File

@ -13,7 +13,7 @@
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/stream_info.h" #include "packager/media/base/stream_info.h"
#include "packager/media/base/timestamp.h" #include "packager/media/base/timestamp.h"
#include "packager/media/filters/h26x_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h26x_byte_to_unit_stream_converter.h"
#include "packager/media/formats/mp2t/es_parser_h26x.h" #include "packager/media/formats/mp2t/es_parser_h26x.h"
namespace shaka { namespace shaka {

7
packager/media/formats/mp2t/mp2t.gyp
View File

@ -55,10 +55,7 @@
], ],
'dependencies': [ 'dependencies': [
'../../base/media_base.gyp:media_base', '../../base/media_base.gyp:media_base',
'../../filters/filters.gyp:filters', '../../codecs/codecs.gyp:codecs',
# TODO(rkuroiwa): AACAudioSpecificConfig is used to create ADTS.
# Break this dependency on mp4 by moving it to media/filters.
'../../formats/mp4/mp4.gyp:mp4',
], ],
}, },
{ {
@ -77,8 +74,8 @@
'dependencies': [ 'dependencies': [
'../../../testing/gtest.gyp:gtest', '../../../testing/gtest.gyp:gtest',
'../../../testing/gmock.gyp:gmock', '../../../testing/gmock.gyp:gmock',
'../../codecs/codecs.gyp:codecs',
'../../event/media_event.gyp:mock_muxer_listener', '../../event/media_event.gyp:mock_muxer_listener',
'../../filters/filters.gyp:filters',
'../../test/media_test.gyp:media_test_support', '../../test/media_test.gyp:media_test_support',
'../mpeg/mpeg.gyp:mpeg', '../mpeg/mpeg.gyp:mpeg',
'mp2t', 'mp2t',

8
packager/media/formats/mp2t/pes_packet_generator.cc
View File

@ -15,10 +15,10 @@
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/nal_unit_to_byte_stream_converter.h" #include "packager/media/codecs/aac_audio_specific_config.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nal_unit_to_byte_stream_converter.h"
#include "packager/media/codecs/nalu_reader.h"
#include "packager/media/formats/mp2t/pes_packet.h" #include "packager/media/formats/mp2t/pes_packet.h"
#include "packager/media/formats/mp4/aac_audio_specific_config.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -116,7 +116,7 @@ bool PesPacketGenerator::Initialize(const StreamInfo& stream_info) {
return false; return false;
} }
timescale_scale_ = kTsTimescale / audio_stream_info.time_scale(); timescale_scale_ = kTsTimescale / audio_stream_info.time_scale();
adts_converter_.reset(new mp4::AACAudioSpecificConfig()); adts_converter_.reset(new AACAudioSpecificConfig());
return adts_converter_->Parse(audio_stream_info.extra_data()); return adts_converter_->Parse(audio_stream_info.extra_data());
} }

7
packager/media/formats/mp2t/pes_packet_generator.h
View File

@ -19,13 +19,10 @@
namespace shaka { namespace shaka {
namespace media { namespace media {
class AACAudioSpecificConfig;
class NalUnitToByteStreamConverter; class NalUnitToByteStreamConverter;
class StreamInfo; class StreamInfo;
namespace mp4 {
class AACAudioSpecificConfig;
} // namespace mp4
namespace mp2t { namespace mp2t {
class PesPacket; class PesPacket;
@ -79,7 +76,7 @@ class PesPacketGenerator {
double timescale_scale_ = 0.0; double timescale_scale_ = 0.0;
scoped_ptr<NalUnitToByteStreamConverter> converter_; scoped_ptr<NalUnitToByteStreamConverter> converter_;
scoped_ptr<mp4::AACAudioSpecificConfig> adts_converter_; scoped_ptr<AACAudioSpecificConfig> adts_converter_;
// This is the PES packet that this object is currently working on. // This is the PES packet that this object is currently working on.
// This can be used to create a PES from multiple audio samples. // This can be used to create a PES from multiple audio samples.

6
packager/media/formats/mp2t/pes_packet_generator_unittest.cc
View File

@ -11,10 +11,10 @@
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/text_stream_info.h" #include "packager/media/base/text_stream_info.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/nal_unit_to_byte_stream_converter.h" #include "packager/media/codecs/aac_audio_specific_config.h"
#include "packager/media/codecs/nal_unit_to_byte_stream_converter.h"
#include "packager/media/formats/mp2t/pes_packet.h" #include "packager/media/formats/mp2t/pes_packet.h"
#include "packager/media/formats/mp2t/pes_packet_generator.h" #include "packager/media/formats/mp2t/pes_packet_generator.h"
#include "packager/media/formats/mp4/aac_audio_specific_config.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -96,7 +96,7 @@ class MockNalUnitToByteStreamConverter : public NalUnitToByteStreamConverter {
std::vector<uint8_t>* output)); std::vector<uint8_t>* output));
}; };
class MockAACAudioSpecificConfig : public mp4::AACAudioSpecificConfig { class MockAACAudioSpecificConfig : public AACAudioSpecificConfig {
public: public:
MOCK_METHOD1(Parse, bool(const std::vector<uint8_t>& data)); MOCK_METHOD1(Parse, bool(const std::vector<uint8_t>& data));
MOCK_CONST_METHOD1(ConvertToADTS, bool(std::vector<uint8_t>* buffer)); MOCK_CONST_METHOD1(ConvertToADTS, bool(std::vector<uint8_t>* buffer));

4
packager/media/formats/mp2t/program_map_table_writer.cc
View File

@ -11,9 +11,9 @@
#include "packager/base/logging.h" #include "packager/base/logging.h"
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/base/fourccs.h" #include "packager/media/base/fourccs.h"
#include "packager/media/codecs/aac_audio_specific_config.h"
#include "packager/media/formats/mp2t/continuity_counter.h" #include "packager/media/formats/mp2t/continuity_counter.h"
#include "packager/media/formats/mp2t/ts_packet_writer_util.h" #include "packager/media/formats/mp2t/ts_packet_writer_util.h"
#include "packager/media/formats/mp4/aac_audio_specific_config.h"
namespace shaka { namespace shaka {
namespace media { namespace media {
@ -199,7 +199,7 @@ void WritePrivateDataIndicatorDescriptor(FourCC fourcc, BufferWriter* output) {
bool WriteAacAudioSetupInformation(const uint8_t* aac_audio_specific_config, bool WriteAacAudioSetupInformation(const uint8_t* aac_audio_specific_config,
size_t aac_audio_specific_config_size, size_t aac_audio_specific_config_size,
BufferWriter* audio_setup_information) { BufferWriter* audio_setup_information) {
mp4::AACAudioSpecificConfig config; AACAudioSpecificConfig config;
const bool result = config.Parse(std::vector<uint8_t>( const bool result = config.Parse(std::vector<uint8_t>(
aac_audio_specific_config, aac_audio_specific_config,
aac_audio_specific_config + aac_audio_specific_config_size)); aac_audio_specific_config + aac_audio_specific_config_size));

4
packager/media/formats/mp4/box_definitions.h
View File

@ -9,9 +9,9 @@
#include "packager/media/base/decrypt_config.h" #include "packager/media/base/decrypt_config.h"
#include "packager/media/base/fourccs.h" #include "packager/media/base/fourccs.h"
#include "packager/media/formats/mp4/aac_audio_specific_config.h" #include "packager/media/codecs/aac_audio_specific_config.h"
#include "packager/media/codecs/es_descriptor.h"
#include "packager/media/formats/mp4/box.h" #include "packager/media/formats/mp4/box.h"
#include "packager/media/formats/mp4/es_descriptor.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

6
packager/media/formats/mp4/encrypting_fragmenter.cc
View File

@ -13,9 +13,9 @@
#include "packager/media/base/buffer_reader.h" #include "packager/media/base/buffer_reader.h"
#include "packager/media/base/key_source.h" #include "packager/media/base/key_source.h"
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/filters/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"
#include "packager/media/filters/vp8_parser.h" #include "packager/media/codecs/vp8_parser.h"
#include "packager/media/filters/vp9_parser.h" #include "packager/media/codecs/vp9_parser.h"
#include "packager/media/formats/mp4/box_definitions.h" #include "packager/media/formats/mp4/box_definitions.h"
namespace shaka { namespace shaka {

4
packager/media/formats/mp4/encrypting_fragmenter.h
View File

@ -10,9 +10,9 @@
#include "packager/base/memory/ref_counted.h" #include "packager/base/memory/ref_counted.h"
#include "packager/base/memory/scoped_ptr.h" #include "packager/base/memory/scoped_ptr.h"
#include "packager/media/base/fourccs.h" #include "packager/media/base/fourccs.h"
#include "packager/media/filters/vpx_parser.h" #include "packager/media/codecs/video_slice_header_parser.h"
#include "packager/media/codecs/vpx_parser.h"
#include "packager/media/formats/mp4/fragmenter.h" #include "packager/media/formats/mp4/fragmenter.h"
#include "packager/media/formats/mp4/video_slice_header_parser.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

11
packager/media/formats/mp4/mp4.gyp
View File

@ -13,8 +13,6 @@
'target_name': 'mp4', 'target_name': 'mp4',
'type': '<(component)', 'type': '<(component)',
'sources': [ 'sources': [
'aac_audio_specific_config.cc',
'aac_audio_specific_config.h',
'box.cc', 'box.cc',
'box.h', 'box.h',
'box_buffer.h', 'box_buffer.h',
@ -30,8 +28,6 @@
'decoding_time_iterator.h', 'decoding_time_iterator.h',
'encrypting_fragmenter.cc', 'encrypting_fragmenter.cc',
'encrypting_fragmenter.h', 'encrypting_fragmenter.h',
'es_descriptor.cc',
'es_descriptor.h',
'fragmenter.cc', 'fragmenter.cc',
'fragmenter.h', 'fragmenter.h',
'key_rotation_fragmenter.cc', 'key_rotation_fragmenter.cc',
@ -50,31 +46,26 @@
'sync_sample_iterator.h', 'sync_sample_iterator.h',
'track_run_iterator.cc', 'track_run_iterator.cc',
'track_run_iterator.h', 'track_run_iterator.h',
'video_slice_header_parser.cc',
'video_slice_header_parser.h',
], ],
'dependencies': [ 'dependencies': [
'../../../third_party/boringssl/boringssl.gyp:boringssl', '../../../third_party/boringssl/boringssl.gyp:boringssl',
'../../base/media_base.gyp:media_base', '../../base/media_base.gyp:media_base',
'../../codecs/codecs.gyp:codecs',
'../../event/media_event.gyp:media_event', '../../event/media_event.gyp:media_event',
'../../filters/filters.gyp:filters',
], ],
}, },
{ {
'target_name': 'mp4_unittest', 'target_name': 'mp4_unittest',
'type': '<(gtest_target_type)', 'type': '<(gtest_target_type)',
'sources': [ 'sources': [
'aac_audio_specific_config_unittest.cc',
'box_definitions_unittest.cc', 'box_definitions_unittest.cc',
'box_reader_unittest.cc', 'box_reader_unittest.cc',
'chunk_info_iterator_unittest.cc', 'chunk_info_iterator_unittest.cc',
'composition_offset_iterator_unittest.cc', 'composition_offset_iterator_unittest.cc',
'decoding_time_iterator_unittest.cc', 'decoding_time_iterator_unittest.cc',
'es_descriptor_unittest.cc',
'mp4_media_parser_unittest.cc', 'mp4_media_parser_unittest.cc',
'sync_sample_iterator_unittest.cc', 'sync_sample_iterator_unittest.cc',
'track_run_iterator_unittest.cc', 'track_run_iterator_unittest.cc',
'video_slice_header_parser_unittest.cc',
], ],
'dependencies': [ 'dependencies': [
'../../../testing/gtest.gyp:gtest', '../../../testing/gtest.gyp:gtest',

8
packager/media/formats/mp4/mp4_media_parser.cc
View File

@ -19,14 +19,14 @@
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/codecs/avc_decoder_configuration_record.h"
#include "packager/media/codecs/es_descriptor.h"
#include "packager/media/codecs/hevc_decoder_configuration_record.h"
#include "packager/media/codecs/vp_codec_configuration_record.h"
#include "packager/media/file/file.h" #include "packager/media/file/file.h"
#include "packager/media/file/file_closer.h" #include "packager/media/file/file_closer.h"
#include "packager/media/filters/avc_decoder_configuration_record.h"
#include "packager/media/filters/hevc_decoder_configuration_record.h"
#include "packager/media/filters/vp_codec_configuration_record.h"
#include "packager/media/formats/mp4/box_definitions.h" #include "packager/media/formats/mp4/box_definitions.h"
#include "packager/media/formats/mp4/box_reader.h" #include "packager/media/formats/mp4/box_reader.h"
#include "packager/media/formats/mp4/es_descriptor.h"
#include "packager/media/formats/mp4/track_run_iterator.h" #include "packager/media/formats/mp4/track_run_iterator.h"
namespace shaka { namespace shaka {

2
packager/media/formats/mp4/mp4_muxer.cc
View File

@ -15,10 +15,10 @@
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/media_stream.h" #include "packager/media/base/media_stream.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/codecs/es_descriptor.h"
#include "packager/media/event/muxer_listener.h" #include "packager/media/event/muxer_listener.h"
#include "packager/media/file/file.h" #include "packager/media/file/file.h"
#include "packager/media/formats/mp4/box_definitions.h" #include "packager/media/formats/mp4/box_definitions.h"
#include "packager/media/formats/mp4/es_descriptor.h"
#include "packager/media/formats/mp4/multi_segment_segmenter.h" #include "packager/media/formats/mp4/multi_segment_segmenter.h"
#include "packager/media/formats/mp4/single_segment_segmenter.h" #include "packager/media/formats/mp4/single_segment_segmenter.h"

2
packager/media/formats/webm/webm.gyp
View File

@ -58,7 +58,7 @@
'../../../third_party/boringssl/boringssl.gyp:boringssl', '../../../third_party/boringssl/boringssl.gyp:boringssl',
'../../../third_party/libwebm/libwebm.gyp:mkvmuxer', '../../../third_party/libwebm/libwebm.gyp:mkvmuxer',
'../../base/media_base.gyp:media_base', '../../base/media_base.gyp:media_base',
'../../filters/filters.gyp:filters' '../../codecs/codecs.gyp:codecs'
], ],
}, },
{ {

6
packager/media/formats/webm/webm_cluster_parser.cc
View File

@ -10,9 +10,9 @@
#include "packager/base/sys_byteorder.h" #include "packager/base/sys_byteorder.h"
#include "packager/media/base/decrypt_config.h" #include "packager/media/base/decrypt_config.h"
#include "packager/media/base/timestamp.h" #include "packager/media/base/timestamp.h"
#include "packager/media/filters/vp8_parser.h" #include "packager/media/codecs/vp8_parser.h"
#include "packager/media/filters/vp9_parser.h" #include "packager/media/codecs/vp9_parser.h"
#include "packager/media/filters/webvtt_util.h" #include "packager/media/codecs/webvtt_util.h"
#include "packager/media/formats/webm/webm_constants.h" #include "packager/media/formats/webm/webm_constants.h"
#include "packager/media/formats/webm/webm_crypto_helpers.h" #include "packager/media/formats/webm/webm_crypto_helpers.h"
#include "packager/media/formats/webm/webm_webvtt_parser.h" #include "packager/media/formats/webm/webm_webvtt_parser.h"

3
packager/media/formats/wvm/wvm.gyp
View File

@ -18,9 +18,8 @@
], ],
'dependencies': [ 'dependencies': [
'../../base/media_base.gyp:media_base', '../../base/media_base.gyp:media_base',
'../../filters/filters.gyp:filters', '../../codecs/codecs.gyp:codecs',
'../../formats/mp2t/mp2t.gyp:mp2t', '../../formats/mp2t/mp2t.gyp:mp2t',
'../../formats/mp4/mp4.gyp:mp4',
'../mpeg/mpeg.gyp:mpeg', '../mpeg/mpeg.gyp:mpeg',
], ],
}, },

10
packager/media/formats/wvm/wvm_media_parser.cc
View File

@ -15,10 +15,10 @@
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/media/base/status.h" #include "packager/media/base/status.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/media/filters/avc_decoder_configuration_record.h" #include "packager/media/codecs/aac_audio_specific_config.h"
#include "packager/media/codecs/avc_decoder_configuration_record.h"
#include "packager/media/codecs/es_descriptor.h"
#include "packager/media/formats/mp2t/adts_header.h" #include "packager/media/formats/mp2t/adts_header.h"
#include "packager/media/formats/mp4/aac_audio_specific_config.h"
#include "packager/media/formats/mp4/es_descriptor.h"
#define HAS_HEADER_EXTENSION(x) ((x != 0xBC) && (x != 0xBE) && (x != 0xBF) \ #define HAS_HEADER_EXTENSION(x) ((x != 0xBC) && (x != 0xBE) && (x != 0xBF) \
&& (x != 0xF0) && (x != 0xF2) && (x != 0xF8) \ && (x != 0xF0) && (x != 0xF2) && (x != 0xF8) \
@ -711,7 +711,7 @@ bool WvmMediaParser::ParseIndexEntry() {
pixel_height = static_cast<uint32_t>(value); pixel_height = static_cast<uint32_t>(value);
break; break;
case Audio_EsDescriptor: { case Audio_EsDescriptor: {
mp4::ESDescriptor descriptor; ESDescriptor descriptor;
if (!descriptor.Parse(binary_data)) { if (!descriptor.Parse(binary_data)) {
LOG(ERROR) << LOG(ERROR) <<
"Could not extract AudioSpecificConfig from ES_Descriptor"; "Could not extract AudioSpecificConfig from ES_Descriptor";
@ -929,7 +929,7 @@ bool WvmMediaParser::Output(bool output_encrypted_sample) {
} else { } else {
// Set AudioStreamInfo fields using information from the // Set AudioStreamInfo fields using information from the
// AACAudioSpecificConfig record. // AACAudioSpecificConfig record.
mp4::AACAudioSpecificConfig aac_config; AACAudioSpecificConfig aac_config;
if (!aac_config.Parse(stream_infos_[i]->extra_data())) { if (!aac_config.Parse(stream_infos_[i]->extra_data())) {
LOG(ERROR) << "Could not parse AACAudioSpecificconfig"; LOG(ERROR) << "Could not parse AACAudioSpecificconfig";
return false; return false;

2
packager/media/formats/wvm/wvm_media_parser.h
View File

@ -15,7 +15,7 @@
#include "packager/base/memory/scoped_ptr.h" #include "packager/base/memory/scoped_ptr.h"
#include "packager/media/base/media_parser.h" #include "packager/media/base/media_parser.h"
#include "packager/media/base/network_util.h" #include "packager/media/base/network_util.h"
#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h264_byte_to_unit_stream_converter.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

6
packager/packager.gyp
View File

@ -35,9 +35,9 @@
], ],
'dependencies': [ 'dependencies': [
'hls/hls.gyp:hls_builder', 'hls/hls.gyp:hls_builder',
'media/codecs/codecs.gyp:codecs',
'media/event/media_event.gyp:media_event', 'media/event/media_event.gyp:media_event',
'media/file/file.gyp:file', 'media/file/file.gyp:file',
'media/filters/filters.gyp:filters',
'media/formats/mp2t/mp2t.gyp:mp2t', 'media/formats/mp2t/mp2t.gyp:mp2t',
'media/formats/mp4/mp4.gyp:mp4', 'media/formats/mp4/mp4.gyp:mp4',
'media/formats/mpeg/mpeg.gyp:mpeg', 'media/formats/mpeg/mpeg.gyp:mpeg',
@ -78,8 +78,8 @@
'media/test/packager_test.cc', 'media/test/packager_test.cc',
], ],
'dependencies': [ 'dependencies': [
'media/codecs/codecs.gyp:codecs',
'media/file/file.gyp:file', 'media/file/file.gyp:file',
'media/filters/filters.gyp:filters',
'media/formats/mp2t/mp2t.gyp:mp2t', 'media/formats/mp2t/mp2t.gyp:mp2t',
'media/formats/mp4/mp4.gyp:mp4', 'media/formats/mp4/mp4.gyp:mp4',
'media/formats/mpeg/mpeg.gyp:mpeg', 'media/formats/mpeg/mpeg.gyp:mpeg',
@ -109,9 +109,9 @@
'dependencies': [ 'dependencies': [
'hls/hls.gyp:hls_unittest', 'hls/hls.gyp:hls_unittest',
'media/base/media_base.gyp:media_base_unittest', 'media/base/media_base.gyp:media_base_unittest',
'media/codecs/codecs.gyp:codecs_unittest',
'media/event/media_event.gyp:media_event_unittest', 'media/event/media_event.gyp:media_event_unittest',
'media/file/file.gyp:file_unittest', 'media/file/file.gyp:file_unittest',
'media/filters/filters.gyp:filters_unittest',
'media/formats/mp2t/mp2t.gyp:mp2t_unittest', 'media/formats/mp2t/mp2t.gyp:mp2t_unittest',
'media/formats/mp4/mp4.gyp:mp4_unittest', 'media/formats/mp4/mp4.gyp:mp4_unittest',
'media/formats/webm/webm.gyp:webm_unittest', 'media/formats/webm/webm.gyp:webm_unittest',