From 15ae26e12fb22b73757a21ef159c71a6df86e541 Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Wed, 1 Oct 2014 15:10:21 -0700 Subject: [PATCH] Modify include headers to have "packager" in the path This is a follow up to previous CL. Generated using command: find {media,app,mpd} -type f -exec sed -r -i 's/#include "(.*)"/#include "packager\/\1"/' {} \; common.gypi and mpd.gyp are also modified to take the path change into consideration. Change-Id: I1fb102b4eb73ae5fde5f4ab303a12cec09b05c33 --- packager/app/fixed_key_encryption_flags.cc | 2 +- packager/app/libcrypto_threading.cc | 2 +- packager/app/libcrypto_threading.h | 2 +- packager/app/libcrypto_threading_posix.cc | 2 +- packager/app/mpd_flags.cc | 2 +- packager/app/mpd_generator.cc | 10 ++--- packager/app/muxer_flags.cc | 2 +- packager/app/packager_main.cc | 42 +++++++++---------- packager/app/packager_util.cc | 28 ++++++------- packager/app/packager_util.h | 2 +- packager/app/stream_descriptor.cc | 10 ++--- packager/app/widevine_encryption_flags.cc | 6 +-- packager/common.gypi | 1 + packager/media/base/aes_encryptor.cc | 4 +- packager/media/base/aes_encryptor.h | 4 +- packager/media/base/aes_encryptor_unittest.cc | 8 ++-- packager/media/base/audio_stream_info.cc | 10 ++--- packager/media/base/audio_stream_info.h | 2 +- packager/media/base/audio_timestamp_helper.cc | 6 +-- packager/media/base/audio_timestamp_helper.h | 2 +- .../base/audio_timestamp_helper_unittest.cc | 4 +- packager/media/base/bit_reader.cc | 2 +- packager/media/base/bit_reader.h | 2 +- packager/media/base/bit_reader_unittest.cc | 2 +- packager/media/base/buffer_reader.cc | 4 +- packager/media/base/buffer_reader.h | 4 +- packager/media/base/buffer_writer.cc | 6 +-- packager/media/base/buffer_writer.h | 4 +- packager/media/base/buffer_writer_unittest.cc | 12 +++--- packager/media/base/byte_queue.cc | 4 +- packager/media/base/byte_queue.h | 2 +- packager/media/base/closure_thread.cc | 2 +- packager/media/base/closure_thread.h | 4 +- .../media/base/closure_thread_unittest.cc | 8 ++-- packager/media/base/container_names.cc | 6 +-- .../media/base/container_names_unittest.cc | 6 +-- packager/media/base/decrypt_config.cc | 4 +- packager/media/base/decrypt_config.h | 2 +- packager/media/base/decryptor_source.h | 6 +-- packager/media/base/demuxer.cc | 28 ++++++------- packager/media/base/demuxer.h | 8 ++-- packager/media/base/fake_prng.cc | 8 ++-- packager/media/base/http_fetcher.cc | 4 +- packager/media/base/http_fetcher.h | 4 +- packager/media/base/http_fetcher_unittest.cc | 10 ++--- packager/media/base/key_source.cc | 8 ++-- packager/media/base/key_source.h | 4 +- packager/media/base/media_parser.h | 8 ++-- packager/media/base/media_sample.cc | 6 +-- packager/media/base/media_sample.h | 6 +-- packager/media/base/media_stream.cc | 14 +++---- packager/media/base/media_stream.h | 6 +-- packager/media/base/muxer.cc | 6 +-- packager/media/base/muxer.h | 10 ++--- packager/media/base/muxer_options.cc | 2 +- packager/media/base/muxer_util.cc | 10 ++--- packager/media/base/muxer_util_unittest.cc | 2 +- packager/media/base/network_util.cc | 2 +- packager/media/base/offset_byte_queue.cc | 4 +- packager/media/base/offset_byte_queue.h | 2 +- .../media/base/offset_byte_queue_unittest.cc | 4 +- packager/media/base/producer_consumer_queue.h | 10 ++--- .../base/producer_consumer_queue_unittest.cc | 10 ++--- packager/media/base/request_signer.cc | 10 ++--- packager/media/base/request_signer.h | 2 +- packager/media/base/rsa_key.cc | 8 ++-- packager/media/base/rsa_key.h | 2 +- packager/media/base/rsa_key_unittest.cc | 8 ++-- packager/media/base/rsa_test_data.cc | 2 +- packager/media/base/rsa_test_data.h | 2 +- packager/media/base/status.cc | 4 +- packager/media/base/status.h | 2 +- packager/media/base/status_test_util.h | 2 +- .../media/base/status_test_util_unittest.cc | 2 +- packager/media/base/status_unittest.cc | 4 +- packager/media/base/stream_info.cc | 6 +-- packager/media/base/stream_info.h | 2 +- packager/media/base/text_track.h | 6 +-- packager/media/base/video_stream_info.cc | 10 ++--- packager/media/base/video_stream_info.h | 2 +- packager/media/base/widevine_key_source.cc | 20 ++++----- packager/media/base/widevine_key_source.h | 10 ++--- .../base/widevine_key_source_unittest.cc | 14 +++---- .../media/event/mpd_notify_muxer_listener.cc | 14 +++---- .../media/event/mpd_notify_muxer_listener.h | 8 ++-- .../media/event/muxer_listener_internal.cc | 12 +++--- .../media/event/muxer_listener_internal.h | 2 +- .../vod_media_info_dump_muxer_listener.cc | 14 +++---- .../vod_media_info_dump_muxer_listener.h | 8 ++-- ...media_info_dump_muxer_listener_unittest.cc | 16 +++---- packager/media/file/file.cc | 12 +++--- packager/media/file/file.h | 2 +- packager/media/file/file_closer.h | 4 +- packager/media/file/file_unittest.cc | 4 +- packager/media/file/local_file.cc | 6 +-- packager/media/file/local_file.h | 4 +- packager/media/file/udp_file.cc | 6 +-- packager/media/file/udp_file.h | 4 +- packager/media/filters/h264_bit_reader.cc | 4 +- packager/media/filters/h264_bit_reader.h | 2 +- .../media/filters/h264_bit_reader_unittest.cc | 2 +- .../h264_byte_to_unit_stream_converter.cc | 8 ++-- ..._byte_to_unit_stream_converter_unittest.cc | 6 +-- packager/media/filters/h264_parser.cc | 8 ++-- packager/media/filters/h264_parser.h | 2 +- .../media/filters/h264_parser_unittest.cc | 14 +++---- packager/media/formats/mp2t/adts_header.cc | 8 ++-- packager/media/formats/mp2t/adts_header.h | 2 +- .../formats/mp2t/adts_header_unittest.cc | 6 +-- packager/media/formats/mp2t/es_parser.h | 4 +- packager/media/formats/mp2t/es_parser_adts.cc | 20 ++++----- packager/media/formats/mp2t/es_parser_adts.h | 12 +++--- packager/media/formats/mp2t/es_parser_h264.cc | 20 ++++----- packager/media/formats/mp2t/es_parser_h264.h | 8 ++-- .../formats/mp2t/es_parser_h264_unittest.cc | 20 ++++----- .../media/formats/mp2t/mp2t_media_parser.cc | 30 ++++++------- .../media/formats/mp2t/mp2t_media_parser.h | 10 ++--- .../mp2t/mp2t_media_parser_unittest.cc | 22 +++++----- packager/media/formats/mp2t/ts_packet.cc | 8 ++-- packager/media/formats/mp2t/ts_packet.h | 2 +- packager/media/formats/mp2t/ts_section_pat.cc | 8 ++-- packager/media/formats/mp2t/ts_section_pat.h | 6 +-- packager/media/formats/mp2t/ts_section_pes.cc | 14 +++---- packager/media/formats/mp2t/ts_section_pes.h | 8 ++-- packager/media/formats/mp2t/ts_section_pmt.cc | 8 ++-- packager/media/formats/mp2t/ts_section_pmt.h | 6 +-- packager/media/formats/mp2t/ts_section_psi.cc | 8 ++-- packager/media/formats/mp2t/ts_section_psi.h | 6 +-- .../formats/mp4/aac_audio_specific_config.cc | 8 ++-- .../mp4/aac_audio_specific_config_unittest.cc | 2 +- packager/media/formats/mp4/box.cc | 6 +-- packager/media/formats/mp4/box.h | 4 +- packager/media/formats/mp4/box_buffer.h | 8 ++-- packager/media/formats/mp4/box_definitions.cc | 10 ++--- packager/media/formats/mp4/box_definitions.h | 8 ++-- .../formats/mp4/box_definitions_comparison.h | 2 +- .../formats/mp4/box_definitions_unittest.cc | 10 ++--- packager/media/formats/mp4/box_reader.cc | 10 ++--- packager/media/formats/mp4/box_reader.h | 10 ++--- .../media/formats/mp4/box_reader_unittest.cc | 8 ++-- packager/media/formats/mp4/cenc.cc | 8 ++-- packager/media/formats/mp4/cenc.h | 2 +- .../media/formats/mp4/chunk_info_iterator.cc | 4 +- .../media/formats/mp4/chunk_info_iterator.h | 4 +- .../mp4/chunk_info_iterator_unittest.cc | 6 +-- .../mp4/composition_offset_iterator.cc | 4 +- .../formats/mp4/composition_offset_iterator.h | 4 +- .../composition_offset_iterator_unittest.cc | 4 +- .../formats/mp4/decoding_time_iterator.cc | 4 +- .../formats/mp4/decoding_time_iterator.h | 4 +- .../mp4/decoding_time_iterator_unittest.cc | 4 +- .../formats/mp4/encrypting_fragmenter.cc | 14 +++---- .../media/formats/mp4/encrypting_fragmenter.h | 2 +- packager/media/formats/mp4/es_descriptor.cc | 8 ++-- .../formats/mp4/es_descriptor_unittest.cc | 2 +- packager/media/formats/mp4/fragmenter.cc | 8 ++-- packager/media/formats/mp4/fragmenter.h | 6 +-- .../formats/mp4/key_rotation_fragmenter.cc | 6 +-- .../formats/mp4/key_rotation_fragmenter.h | 4 +- .../media/formats/mp4/mp4_media_parser.cc | 34 +++++++-------- packager/media/formats/mp4/mp4_media_parser.h | 14 +++---- .../formats/mp4/mp4_media_parser_unittest.cc | 10 ++--- packager/media/formats/mp4/mp4_muxer.cc | 32 +++++++------- packager/media/formats/mp4/mp4_muxer.h | 4 +- .../formats/mp4/multi_segment_segmenter.cc | 20 ++++----- .../formats/mp4/multi_segment_segmenter.h | 2 +- packager/media/formats/mp4/rcheck.h | 2 +- packager/media/formats/mp4/segmenter.cc | 20 ++++----- packager/media/formats/mp4/segmenter.h | 6 +-- .../formats/mp4/single_segment_segmenter.cc | 14 +++---- .../formats/mp4/single_segment_segmenter.h | 4 +- .../media/formats/mp4/sync_sample_iterator.cc | 2 +- .../media/formats/mp4/sync_sample_iterator.h | 4 +- .../mp4/sync_sample_iterator_unittest.cc | 2 +- .../media/formats/mp4/track_run_iterator.cc | 14 +++---- .../media/formats/mp4/track_run_iterator.h | 6 +-- .../mp4/track_run_iterator_unittest.cc | 10 ++--- packager/media/formats/mpeg/adts_constants.cc | 4 +- .../media/formats/wvm/wvm_media_parser.cc | 41 +++++++++--------- packager/media/formats/wvm/wvm_media_parser.h | 13 +++--- .../formats/wvm/wvm_media_parser_unittest.cc | 24 +++++------ packager/media/test/packager_test.cc | 24 +++++------ .../test/run_tests_with_atexit_manager.cc | 6 +-- packager/media/test/test_data_util.cc | 8 ++-- packager/media/test/test_data_util.h | 2 +- packager/mpd/base/bandwidth_estimator.cc | 4 +- packager/mpd/base/bandwidth_estimator_test.cc | 4 +- .../mpd/base/content_protection_element.cc | 2 +- packager/mpd/base/mpd_builder.cc | 20 ++++----- packager/mpd/base/mpd_builder.h | 20 ++++----- packager/mpd/base/mpd_builder_unittest.cc | 20 ++++----- packager/mpd/base/mpd_utils.cc | 12 +++--- packager/mpd/base/simple_mpd_notifier.cc | 10 ++--- packager/mpd/base/simple_mpd_notifier.h | 6 +-- packager/mpd/base/simple_vod_mpd_notifier.cc | 8 ++-- packager/mpd/base/simple_vod_mpd_notifier.h | 4 +- packager/mpd/base/xml/scoped_xml_ptr.h | 2 +- packager/mpd/base/xml/xml_node.cc | 12 +++--- packager/mpd/base/xml/xml_node.h | 6 +-- packager/mpd/base/xml/xml_node_unittest.cc | 10 ++--- packager/mpd/mpd.gyp | 2 +- packager/mpd/test/mpd_builder_test_helper.cc | 14 +++---- packager/mpd/test/xml_compare.cc | 6 +-- packager/mpd/util/mpd_writer.cc | 6 +-- packager/mpd/util/mpd_writer.h | 2 +- packager/mpd/util/mpd_writer_unittest.cc | 8 ++-- 206 files changed, 803 insertions(+), 804 deletions(-) diff --git a/packager/app/fixed_key_encryption_flags.cc b/packager/app/fixed_key_encryption_flags.cc index 4eb2e9f499..63cda83395 100644 --- a/packager/app/fixed_key_encryption_flags.cc +++ b/packager/app/fixed_key_encryption_flags.cc @@ -6,7 +6,7 @@ // // Defines command line flags for fixed key encryption. -#include "app/fixed_key_encryption_flags.h" +#include "packager/app/fixed_key_encryption_flags.h" DEFINE_bool(enable_fixed_key_encryption, false, diff --git a/packager/app/libcrypto_threading.cc b/packager/app/libcrypto_threading.cc index d80d8f7281..46c4e62828 100644 --- a/packager/app/libcrypto_threading.cc +++ b/packager/app/libcrypto_threading.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 "app/libcrypto_threading.h" +#include "packager/app/libcrypto_threading.h" namespace edash_packager { namespace media { diff --git a/packager/app/libcrypto_threading.h b/packager/app/libcrypto_threading.h index db53f3d24f..e672ec3193 100644 --- a/packager/app/libcrypto_threading.h +++ b/packager/app/libcrypto_threading.h @@ -7,7 +7,7 @@ #ifndef APP_LIBCRYPTO_THREADING_H_ #define APP_LIBCRYPTO_THREADING_H_ -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/app/libcrypto_threading_posix.cc b/packager/app/libcrypto_threading_posix.cc index 4f03bf5c1b..6cc188881b 100644 --- a/packager/app/libcrypto_threading_posix.cc +++ b/packager/app/libcrypto_threading_posix.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 "app/libcrypto_threading.h" +#include "packager/app/libcrypto_threading.h" #include #include diff --git a/packager/app/mpd_flags.cc b/packager/app/mpd_flags.cc index fb6be2693b..147ad6decc 100644 --- a/packager/app/mpd_flags.cc +++ b/packager/app/mpd_flags.cc @@ -6,7 +6,7 @@ // // Defines Mpd flags. -#include "app/mpd_flags.h" +#include "packager/app/mpd_flags.h" // TODO(rkuroiwa, kqyang): Remove the 'Exclusive' statements once // --output_media_info can work together with --mpd_output. diff --git a/packager/app/mpd_generator.cc b/packager/app/mpd_generator.cc index efeb4bc64b..bd05ea541a 100644 --- a/packager/app/mpd_generator.cc +++ b/packager/app/mpd_generator.cc @@ -4,11 +4,11 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "app/mpd_generator_flags.h" -#include "base/logging.h" -#include "base/strings/string_split.h" -#include "base/strings/stringprintf.h" -#include "mpd/util/mpd_writer.h" +#include "packager/app/mpd_generator_flags.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_split.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/mpd/util/mpd_writer.h" namespace { const char kUsage[] = diff --git a/packager/app/muxer_flags.cc b/packager/app/muxer_flags.cc index 3925b9b1b0..ba8db86500 100644 --- a/packager/app/muxer_flags.cc +++ b/packager/app/muxer_flags.cc @@ -6,7 +6,7 @@ // // Defines Muxer flags. -#include "app/muxer_flags.h" +#include "packager/app/muxer_flags.h" DEFINE_string(profile, "", diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc index fb124aa2bc..b7bacbe943 100644 --- a/packager/app/packager_main.cc +++ b/packager/app/packager_main.cc @@ -6,27 +6,27 @@ #include -#include "app/fixed_key_encryption_flags.h" -#include "app/libcrypto_threading.h" -#include "app/mpd_flags.h" -#include "app/muxer_flags.h" -#include "app/packager_util.h" -#include "app/stream_descriptor.h" -#include "app/widevine_encryption_flags.h" -#include "base/logging.h" -#include "base/stl_util.h" -#include "base/strings/string_split.h" -#include "base/strings/stringprintf.h" -#include "base/threading/simple_thread.h" -#include "media/base/demuxer.h" -#include "media/base/key_source.h" -#include "media/base/muxer_options.h" -#include "media/base/muxer_util.h" -#include "media/event/mpd_notify_muxer_listener.h" -#include "media/event/vod_media_info_dump_muxer_listener.h" -#include "media/formats/mp4/mp4_muxer.h" -#include "mpd/base/mpd_builder.h" -#include "mpd/base/simple_mpd_notifier.h" +#include "packager/app/fixed_key_encryption_flags.h" +#include "packager/app/libcrypto_threading.h" +#include "packager/app/mpd_flags.h" +#include "packager/app/muxer_flags.h" +#include "packager/app/packager_util.h" +#include "packager/app/stream_descriptor.h" +#include "packager/app/widevine_encryption_flags.h" +#include "packager/base/logging.h" +#include "packager/base/stl_util.h" +#include "packager/base/strings/string_split.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/base/threading/simple_thread.h" +#include "packager/media/base/demuxer.h" +#include "packager/media/base/key_source.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/base/muxer_util.h" +#include "packager/media/event/mpd_notify_muxer_listener.h" +#include "packager/media/event/vod_media_info_dump_muxer_listener.h" +#include "packager/media/formats/mp4/mp4_muxer.h" +#include "packager/mpd/base/mpd_builder.h" +#include "packager/mpd/base/simple_mpd_notifier.h" namespace { const char kUsage[] = diff --git a/packager/app/packager_util.cc b/packager/app/packager_util.cc index 9cc9b725dc..27daeea970 100644 --- a/packager/app/packager_util.cc +++ b/packager/app/packager_util.cc @@ -7,20 +7,20 @@ #include #include -#include "app/fixed_key_encryption_flags.h" -#include "app/mpd_flags.h" -#include "app/muxer_flags.h" -#include "app/widevine_encryption_flags.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "media/base/media_stream.h" -#include "media/base/muxer.h" -#include "media/base/muxer_options.h" -#include "media/base/request_signer.h" -#include "media/base/stream_info.h" -#include "media/base/widevine_key_source.h" -#include "media/file/file.h" -#include "mpd/base/mpd_builder.h" +#include "packager/app/fixed_key_encryption_flags.h" +#include "packager/app/mpd_flags.h" +#include "packager/app/muxer_flags.h" +#include "packager/app/widevine_encryption_flags.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/media_stream.h" +#include "packager/media/base/muxer.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/base/request_signer.h" +#include "packager/media/base/stream_info.h" +#include "packager/media/base/widevine_key_source.h" +#include "packager/media/file/file.h" +#include "packager/mpd/base/mpd_builder.h" DEFINE_bool(dump_stream_info, false, "Dump demuxed stream info."); diff --git a/packager/app/packager_util.h b/packager/app/packager_util.h index d80ddb1151..e495e7d02d 100644 --- a/packager/app/packager_util.h +++ b/packager/app/packager_util.h @@ -13,7 +13,7 @@ #include #include -#include "base/memory/scoped_ptr.h" +#include "packager/base/memory/scoped_ptr.h" DECLARE_bool(dump_stream_info); diff --git a/packager/app/stream_descriptor.cc b/packager/app/stream_descriptor.cc index 6c82072444..0178bdc030 100644 --- a/packager/app/stream_descriptor.cc +++ b/packager/app/stream_descriptor.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "app/stream_descriptor.h" +#include "packager/app/stream_descriptor.h" -#include "app/packager_util.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_split.h" +#include "packager/app/packager_util.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/string_split.h" namespace edash_packager { namespace media { diff --git a/packager/app/widevine_encryption_flags.cc b/packager/app/widevine_encryption_flags.cc index 1585fb204a..dc18062b44 100644 --- a/packager/app/widevine_encryption_flags.cc +++ b/packager/app/widevine_encryption_flags.cc @@ -6,10 +6,10 @@ // // Defines command line flags for widevine_encryption. -#include "app/widevine_encryption_flags.h" +#include "packager/app/widevine_encryption_flags.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" DEFINE_bool(enable_widevine_encryption, false, diff --git a/packager/common.gypi b/packager/common.gypi index 5d477fbd57..b3a5a43821 100644 --- a/packager/common.gypi +++ b/packager/common.gypi @@ -14,6 +14,7 @@ 'target_defaults': { 'include_dirs': [ '.', + '..', ], 'conditions': [ ['clang==1', { diff --git a/packager/media/base/aes_encryptor.cc b/packager/media/base/aes_encryptor.cc index 089e66b9ca..c7e096ef09 100644 --- a/packager/media/base/aes_encryptor.cc +++ b/packager/media/base/aes_encryptor.cc @@ -4,13 +4,13 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/aes_encryptor.h" +#include "packager/media/base/aes_encryptor.h" #include #include #include -#include "base/logging.h" +#include "packager/base/logging.h" namespace { diff --git a/packager/media/base/aes_encryptor.h b/packager/media/base/aes_encryptor.h index 23ee67d807..d061e692ca 100644 --- a/packager/media/base/aes_encryptor.h +++ b/packager/media/base/aes_encryptor.h @@ -12,8 +12,8 @@ #include #include -#include "base/memory/scoped_ptr.h" -#include "base/stl_util.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/stl_util.h" struct aes_key_st; typedef struct aes_key_st AES_KEY; diff --git a/packager/media/base/aes_encryptor_unittest.cc b/packager/media/base/aes_encryptor_unittest.cc index 6d6e057d33..f2089ee1d0 100644 --- a/packager/media/base/aes_encryptor_unittest.cc +++ b/packager/media/base/aes_encryptor_unittest.cc @@ -6,10 +6,10 @@ #include -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "base/strings/string_number_conversions.h" -#include "media/base/aes_encryptor.h" +#include "packager/base/logging.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/aes_encryptor.h" namespace { diff --git a/packager/media/base/audio_stream_info.cc b/packager/media/base/audio_stream_info.cc index 452a8d30e1..1af46c0f54 100644 --- a/packager/media/base/audio_stream_info.cc +++ b/packager/media/base/audio_stream_info.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/audio_stream_info.h" +#include "packager/media/base/audio_stream_info.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" -#include "media/base/limits.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/media/base/limits.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/audio_stream_info.h b/packager/media/base/audio_stream_info.h index b4190c6847..63b6db6662 100644 --- a/packager/media/base/audio_stream_info.h +++ b/packager/media/base/audio_stream_info.h @@ -9,7 +9,7 @@ #include -#include "media/base/stream_info.h" +#include "packager/media/base/stream_info.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/audio_timestamp_helper.cc b/packager/media/base/audio_timestamp_helper.cc index 5c84e6e91a..e8ce03ce41 100644 --- a/packager/media/base/audio_timestamp_helper.cc +++ b/packager/media/base/audio_timestamp_helper.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/base/audio_timestamp_helper.h" +#include "packager/media/base/audio_timestamp_helper.h" -#include "base/logging.h" -#include "media/base/timestamp.h" +#include "packager/base/logging.h" +#include "packager/media/base/timestamp.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/audio_timestamp_helper.h b/packager/media/base/audio_timestamp_helper.h index 53ba37924b..e709aaf202 100644 --- a/packager/media/base/audio_timestamp_helper.h +++ b/packager/media/base/audio_timestamp_helper.h @@ -7,7 +7,7 @@ #include -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/audio_timestamp_helper_unittest.cc b/packager/media/base/audio_timestamp_helper_unittest.cc index 6cb65d2f8f..46036f5ca8 100644 --- a/packager/media/base/audio_timestamp_helper_unittest.cc +++ b/packager/media/base/audio_timestamp_helper_unittest.cc @@ -4,8 +4,8 @@ #include -#include "media/base/audio_timestamp_helper.h" -#include "media/base/timestamp.h" +#include "packager/media/base/audio_timestamp_helper.h" +#include "packager/media/base/timestamp.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/bit_reader.cc b/packager/media/base/bit_reader.cc index 5177953591..0b5e49475d 100644 --- a/packager/media/base/bit_reader.cc +++ b/packager/media/base/bit_reader.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/base/bit_reader.h" +#include "packager/media/base/bit_reader.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/bit_reader.h b/packager/media/base/bit_reader.h index 850c84ba35..65a494056b 100644 --- a/packager/media/base/bit_reader.h +++ b/packager/media/base/bit_reader.h @@ -8,7 +8,7 @@ #include #include -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/bit_reader_unittest.cc b/packager/media/base/bit_reader_unittest.cc index 94bb83bbaf..b07541e6b7 100644 --- a/packager/media/base/bit_reader_unittest.cc +++ b/packager/media/base/bit_reader_unittest.cc @@ -4,7 +4,7 @@ #include -#include "media/base/bit_reader.h" +#include "packager/media/base/bit_reader.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/buffer_reader.cc b/packager/media/base/buffer_reader.cc index 100ab71cb9..7189ea1a66 100644 --- a/packager/media/base/buffer_reader.cc +++ b/packager/media/base/buffer_reader.cc @@ -4,9 +4,9 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/buffer_reader.h" +#include "packager/media/base/buffer_reader.h" -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/buffer_reader.h b/packager/media/base/buffer_reader.h index 1780e16e84..2d85a7764f 100644 --- a/packager/media/base/buffer_reader.h +++ b/packager/media/base/buffer_reader.h @@ -11,8 +11,8 @@ #include -#include "base/compiler_specific.h" -#include "base/macros.h" +#include "packager/base/compiler_specific.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/buffer_writer.cc b/packager/media/base/buffer_writer.cc index 9f487b1350..31570770cf 100644 --- a/packager/media/base/buffer_writer.cc +++ b/packager/media/base/buffer_writer.cc @@ -4,10 +4,10 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/buffer_writer.h" +#include "packager/media/base/buffer_writer.h" -#include "base/sys_byteorder.h" -#include "media/file/file.h" +#include "packager/base/sys_byteorder.h" +#include "packager/media/file/file.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/buffer_writer.h b/packager/media/base/buffer_writer.h index b5adedfe0f..b97e73982b 100644 --- a/packager/media/base/buffer_writer.h +++ b/packager/media/base/buffer_writer.h @@ -9,8 +9,8 @@ #include -#include "base/stl_util.h" -#include "media/base/status.h" +#include "packager/base/stl_util.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/buffer_writer_unittest.cc b/packager/media/base/buffer_writer_unittest.cc index 337f93dd94..40680d5358 100644 --- a/packager/media/base/buffer_writer_unittest.cc +++ b/packager/media/base/buffer_writer_unittest.cc @@ -4,15 +4,15 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/buffer_writer.h" +#include "packager/media/base/buffer_writer.h" #include -#include "base/file_util.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/buffer_reader.h" -#include "media/base/status_test_util.h" -#include "media/file/file.h" +#include "packager/base/file_util.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/buffer_reader.h" +#include "packager/media/base/status_test_util.h" +#include "packager/media/file/file.h" namespace { const int kReservedBufferCapacity = 1000; diff --git a/packager/media/base/byte_queue.cc b/packager/media/base/byte_queue.cc index d5155e6798..1a6c83a195 100644 --- a/packager/media/base/byte_queue.cc +++ b/packager/media/base/byte_queue.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/base/byte_queue.h" +#include "packager/media/base/byte_queue.h" -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/byte_queue.h b/packager/media/base/byte_queue.h index 3573019c21..8f69c3dd3e 100644 --- a/packager/media/base/byte_queue.h +++ b/packager/media/base/byte_queue.h @@ -7,7 +7,7 @@ #include -#include "base/memory/scoped_ptr.h" +#include "packager/base/memory/scoped_ptr.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/closure_thread.cc b/packager/media/base/closure_thread.cc index 8a171f20c5..c61de450a4 100644 --- a/packager/media/base/closure_thread.cc +++ b/packager/media/base/closure_thread.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 "media/base/closure_thread.h" +#include "packager/media/base/closure_thread.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/closure_thread.h b/packager/media/base/closure_thread.h index d850cbc68f..f751bee980 100644 --- a/packager/media/base/closure_thread.h +++ b/packager/media/base/closure_thread.h @@ -7,8 +7,8 @@ #ifndef MEDIA_BASE_CLOSURE_THREAD_H_ #define MEDIA_BASE_CLOSURE_THREAD_H_ -#include "base/callback.h" -#include "base/threading/simple_thread.h" +#include "packager/base/callback.h" +#include "packager/base/threading/simple_thread.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/closure_thread_unittest.cc b/packager/media/base/closure_thread_unittest.cc index a0d8c125c9..9365342a67 100644 --- a/packager/media/base/closure_thread_unittest.cc +++ b/packager/media/base/closure_thread_unittest.cc @@ -7,10 +7,10 @@ #include #include -#include "base/bind.h" -#include "base/memory/scoped_ptr.h" -#include "base/synchronization/waitable_event.h" -#include "media/base/closure_thread.h" +#include "packager/base/bind.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/synchronization/waitable_event.h" +#include "packager/media/base/closure_thread.h" using ::testing::DoAll; using ::testing::Invoke; diff --git a/packager/media/base/container_names.cc b/packager/media/base/container_names.cc index 35b3c7c2e2..7f108edec2 100644 --- a/packager/media/base/container_names.cc +++ b/packager/media/base/container_names.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/base/container_names.h" +#include "packager/media/base/container_names.h" #include #include #include -#include "base/logging.h" -#include "media/base/bit_reader.h" +#include "packager/base/logging.h" +#include "packager/media/base/bit_reader.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/container_names_unittest.cc b/packager/media/base/container_names_unittest.cc index 6b8ba75b48..0334a5a81a 100644 --- a/packager/media/base/container_names_unittest.cc +++ b/packager/media/base/container_names_unittest.cc @@ -4,9 +4,9 @@ #include -#include "base/file_util.h" -#include "media/base/container_names.h" -#include "media/test/test_data_util.h" +#include "packager/base/file_util.h" +#include "packager/media/base/container_names.h" +#include "packager/media/test/test_data_util.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/decrypt_config.cc b/packager/media/base/decrypt_config.cc index adcdd768bc..65587e52bc 100644 --- a/packager/media/base/decrypt_config.cc +++ b/packager/media/base/decrypt_config.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/base/decrypt_config.h" +#include "packager/media/base/decrypt_config.h" -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/decrypt_config.h b/packager/media/base/decrypt_config.h index 4d27cd3818..90a3d471ba 100644 --- a/packager/media/base/decrypt_config.h +++ b/packager/media/base/decrypt_config.h @@ -10,7 +10,7 @@ #include #include -#include "base/memory/scoped_ptr.h" +#include "packager/base/memory/scoped_ptr.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/decryptor_source.h b/packager/media/base/decryptor_source.h index 4ac45b11f0..3a04556adb 100644 --- a/packager/media/base/decryptor_source.h +++ b/packager/media/base/decryptor_source.h @@ -7,9 +7,9 @@ #ifndef MEDIA_BASE_DECRYPTOR_SOURCE_H_ #define MEDIA_BASE_DECRYPTOR_SOURCE_H_ -#include "base/memory/scoped_ptr.h" -#include "media/base/container_names.h" -#include "media/base/status.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/container_names.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/demuxer.cc b/packager/media/base/demuxer.cc index 7c2f906b3d..0d73dee2b5 100644 --- a/packager/media/base/demuxer.cc +++ b/packager/media/base/demuxer.cc @@ -4,21 +4,21 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/demuxer.h" +#include "packager/media/base/demuxer.h" -#include "base/bind.h" -#include "base/logging.h" -#include "base/stl_util.h" -#include "media/base/container_names.h" -#include "media/base/decryptor_source.h" -#include "media/base/key_source.h" -#include "media/base/media_sample.h" -#include "media/base/media_stream.h" -#include "media/base/stream_info.h" -#include "media/file/file.h" -#include "media/formats/mp2t/mp2t_media_parser.h" -#include "media/formats/mp4/mp4_media_parser.h" -#include "media/formats/wvm/wvm_media_parser.h" +#include "packager/base/bind.h" +#include "packager/base/logging.h" +#include "packager/base/stl_util.h" +#include "packager/media/base/container_names.h" +#include "packager/media/base/decryptor_source.h" +#include "packager/media/base/key_source.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/media_stream.h" +#include "packager/media/base/stream_info.h" +#include "packager/media/file/file.h" +#include "packager/media/formats/mp2t/mp2t_media_parser.h" +#include "packager/media/formats/mp4/mp4_media_parser.h" +#include "packager/media/formats/wvm/wvm_media_parser.h" namespace { const size_t kBufSize = 0x40000; // 256KB. diff --git a/packager/media/base/demuxer.h b/packager/media/base/demuxer.h index fff1b2fee4..3e51cd992c 100644 --- a/packager/media/base/demuxer.h +++ b/packager/media/base/demuxer.h @@ -9,10 +9,10 @@ #include -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/container_names.h" -#include "media/base/status.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/container_names.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/fake_prng.cc b/packager/media/base/fake_prng.cc index 0780da866c..c047656562 100644 --- a/packager/media/base/fake_prng.cc +++ b/packager/media/base/fake_prng.cc @@ -4,13 +4,13 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/fake_prng.h" +#include "packager/media/base/fake_prng.h" #include -#include "base/file_util.h" -#include "base/logging.h" -#include "media/test/test_data_util.h" +#include "packager/base/file_util.h" +#include "packager/base/logging.h" +#include "packager/media/test/test_data_util.h" namespace { diff --git a/packager/media/base/http_fetcher.cc b/packager/media/base/http_fetcher.cc index 59d84db73a..b897ec2c50 100644 --- a/packager/media/base/http_fetcher.cc +++ b/packager/media/base/http_fetcher.cc @@ -4,10 +4,10 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/http_fetcher.h" +#include "packager/media/base/http_fetcher.h" #include -#include "base/strings/stringprintf.h" +#include "packager/base/strings/stringprintf.h" namespace { const char kUserAgentString[] = "edash-packager-http_fetcher/1.0"; diff --git a/packager/media/base/http_fetcher.h b/packager/media/base/http_fetcher.h index 14fded317f..69b488c5bc 100644 --- a/packager/media/base/http_fetcher.h +++ b/packager/media/base/http_fetcher.h @@ -7,8 +7,8 @@ #ifndef MEDIA_BASE_HTTP_FETCHER_H_ #define MEDIA_BASE_HTTP_FETCHER_H_ -#include "base/compiler_specific.h" -#include "media/base/status.h" +#include "packager/base/compiler_specific.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/http_fetcher_unittest.cc b/packager/media/base/http_fetcher_unittest.cc index 644ffdc550..4308c3ffc1 100644 --- a/packager/media/base/http_fetcher_unittest.cc +++ b/packager/media/base/http_fetcher_unittest.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/http_fetcher.h" +#include "packager/media/base/http_fetcher.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_util.h" -#include "media/base/status_test_util.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/string_util.h" +#include "packager/media/base/status_test_util.h" namespace { const char kTestUrl[] = "http://packager-test.appspot.com/http_test"; diff --git a/packager/media/base/key_source.cc b/packager/media/base/key_source.cc index d68d131285..51a2ab1641 100644 --- a/packager/media/base/key_source.cc +++ b/packager/media/base/key_source.cc @@ -4,11 +4,11 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/key_source.h" +#include "packager/media/base/key_source.h" -#include "base/strings/string_number_conversions.h" -#include "media/base/aes_encryptor.h" -#include "media/base/buffer_writer.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/aes_encryptor.h" +#include "packager/media/base/buffer_writer.h" namespace { const uint8_t kWidevineSystemId[] = {0xed, 0xef, 0x8b, 0xa9, 0x79, 0xd6, diff --git a/packager/media/base/key_source.h b/packager/media/base/key_source.h index 2f07498151..0a18f7c505 100644 --- a/packager/media/base/key_source.h +++ b/packager/media/base/key_source.h @@ -9,8 +9,8 @@ #include -#include "base/memory/scoped_ptr.h" -#include "media/base/status.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/media_parser.h b/packager/media/base/media_parser.h index 23f651106d..34987288d1 100644 --- a/packager/media/base/media_parser.h +++ b/packager/media/base/media_parser.h @@ -10,10 +10,10 @@ #include #include -#include "base/callback.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/container_names.h" +#include "packager/base/callback.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/container_names.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/media_sample.cc b/packager/media/base/media_sample.cc index d3054ebe2c..dcd1873c74 100644 --- a/packager/media/base/media_sample.cc +++ b/packager/media/base/media_sample.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/media_sample.h" +#include "packager/media/base/media_sample.h" #include -#include "base/logging.h" -#include "base/strings/stringprintf.h" +#include "packager/base/logging.h" +#include "packager/base/strings/stringprintf.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/media_sample.h b/packager/media/base/media_sample.h index 2d2c3c4697..f90fa6e7d7 100644 --- a/packager/media/base/media_sample.h +++ b/packager/media/base/media_sample.h @@ -11,9 +11,9 @@ #include #include -#include "base/logging.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" +#include "packager/base/logging.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/media_stream.cc b/packager/media/base/media_stream.cc index 3b186371fe..f77f9e60bb 100644 --- a/packager/media/base/media_stream.cc +++ b/packager/media/base/media_stream.cc @@ -4,14 +4,14 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/media_stream.h" +#include "packager/media/base/media_stream.h" -#include "base/logging.h" -#include "base/strings/stringprintf.h" -#include "media/base/demuxer.h" -#include "media/base/media_sample.h" -#include "media/base/muxer.h" -#include "media/base/stream_info.h" +#include "packager/base/logging.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/media/base/demuxer.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/muxer.h" +#include "packager/media/base/stream_info.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/media_stream.h b/packager/media/base/media_stream.h index bd845a5350..ce10c42f05 100644 --- a/packager/media/base/media_stream.h +++ b/packager/media/base/media_stream.h @@ -9,9 +9,9 @@ #include -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/status.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/muxer.cc b/packager/media/base/muxer.cc index 0b0b40d526..74096ac2cc 100644 --- a/packager/media/base/muxer.cc +++ b/packager/media/base/muxer.cc @@ -4,10 +4,10 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/muxer.h" +#include "packager/media/base/muxer.h" -#include "media/base/media_sample.h" -#include "media/base/media_stream.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/media_stream.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/muxer.h b/packager/media/base/muxer.h index 3a34e71eaf..37d7548a4c 100644 --- a/packager/media/base/muxer.h +++ b/packager/media/base/muxer.h @@ -11,11 +11,11 @@ #include -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "base/time/clock.h" -#include "media/base/muxer_options.h" -#include "media/base/status.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/time/clock.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/muxer_options.cc b/packager/media/base/muxer_options.cc index 8adbb8ae56..1bc323a8ef 100644 --- a/packager/media/base/muxer_options.cc +++ b/packager/media/base/muxer_options.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 "media/base/muxer_options.h" +#include "packager/media/base/muxer_options.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/muxer_util.cc b/packager/media/base/muxer_util.cc index 65d544d4e4..f93ff80f99 100644 --- a/packager/media/base/muxer_util.cc +++ b/packager/media/base/muxer_util.cc @@ -4,17 +4,17 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/muxer_util.h" +#include "packager/media/base/muxer_util.h" #include #include #include -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_split.h" -#include "base/strings/stringprintf.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/string_split.h" +#include "packager/base/strings/stringprintf.h" namespace edash_packager { namespace { diff --git a/packager/media/base/muxer_util_unittest.cc b/packager/media/base/muxer_util_unittest.cc index bc75a087a7..e886529007 100644 --- a/packager/media/base/muxer_util_unittest.cc +++ b/packager/media/base/muxer_util_unittest.cc @@ -6,7 +6,7 @@ #include -#include "media/base/muxer_util.h" +#include "packager/media/base/muxer_util.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/network_util.cc b/packager/media/base/network_util.cc index a09b775e36..b1a1320f6c 100644 --- a/packager/media/base/network_util.cc +++ b/packager/media/base/network_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/base/network_util.h" +#include "packager/media/base/network_util.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/offset_byte_queue.cc b/packager/media/base/offset_byte_queue.cc index 9320e33601..b05a300b20 100644 --- a/packager/media/base/offset_byte_queue.cc +++ b/packager/media/base/offset_byte_queue.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/base/offset_byte_queue.h" +#include "packager/media/base/offset_byte_queue.h" #include -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/offset_byte_queue.h b/packager/media/base/offset_byte_queue.h index 34cb5a2d4d..47fea1f4ea 100644 --- a/packager/media/base/offset_byte_queue.h +++ b/packager/media/base/offset_byte_queue.h @@ -7,7 +7,7 @@ #include -#include "media/base/byte_queue.h" +#include "packager/media/base/byte_queue.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/offset_byte_queue_unittest.cc b/packager/media/base/offset_byte_queue_unittest.cc index 84e67e7985..79d068054d 100644 --- a/packager/media/base/offset_byte_queue_unittest.cc +++ b/packager/media/base/offset_byte_queue_unittest.cc @@ -6,8 +6,8 @@ #include #include -#include "base/memory/scoped_ptr.h" -#include "media/base/offset_byte_queue.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/offset_byte_queue.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/producer_consumer_queue.h b/packager/media/base/producer_consumer_queue.h index 4102d6cc0f..4910eed49b 100644 --- a/packager/media/base/producer_consumer_queue.h +++ b/packager/media/base/producer_consumer_queue.h @@ -9,11 +9,11 @@ #include -#include "base/strings/stringprintf.h" -#include "base/synchronization/condition_variable.h" -#include "base/synchronization/lock.h" -#include "base/timer/elapsed_timer.h" -#include "media/base/status.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/base/synchronization/condition_variable.h" +#include "packager/base/synchronization/lock.h" +#include "packager/base/timer/elapsed_timer.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/producer_consumer_queue_unittest.cc b/packager/media/base/producer_consumer_queue_unittest.cc index 2b89a27d4a..f585928924 100644 --- a/packager/media/base/producer_consumer_queue_unittest.cc +++ b/packager/media/base/producer_consumer_queue_unittest.cc @@ -6,11 +6,11 @@ #include -#include "base/bind.h" -#include "base/synchronization/waitable_event.h" -#include "media/base/closure_thread.h" -#include "media/base/producer_consumer_queue.h" -#include "media/base/status_test_util.h" +#include "packager/base/bind.h" +#include "packager/base/synchronization/waitable_event.h" +#include "packager/media/base/closure_thread.h" +#include "packager/media/base/producer_consumer_queue.h" +#include "packager/media/base/status_test_util.h" namespace { const size_t kCapacity = 10u; diff --git a/packager/media/base/request_signer.cc b/packager/media/base/request_signer.cc index 757ed79fec..38cae863b1 100644 --- a/packager/media/base/request_signer.cc +++ b/packager/media/base/request_signer.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/request_signer.h" +#include "packager/media/base/request_signer.h" -#include "base/sha1.h" -#include "base/strings/string_number_conversions.h" -#include "media/base/aes_encryptor.h" -#include "media/base/rsa_key.h" +#include "packager/base/sha1.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/aes_encryptor.h" +#include "packager/media/base/rsa_key.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/request_signer.h b/packager/media/base/request_signer.h index 0416b41bba..f64757fb90 100644 --- a/packager/media/base/request_signer.h +++ b/packager/media/base/request_signer.h @@ -9,7 +9,7 @@ #include -#include "base/memory/scoped_ptr.h" +#include "packager/base/memory/scoped_ptr.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/rsa_key.cc b/packager/media/base/rsa_key.cc index bb2fb13ccf..ae7cb00b00 100644 --- a/packager/media/base/rsa_key.cc +++ b/packager/media/base/rsa_key.cc @@ -16,16 +16,16 @@ // Mask generation function: mgf1SHA1 // Label (encoding paramter): empty std::string -#include "media/base/rsa_key.h" +#include "packager/media/base/rsa_key.h" #include #include #include #include -#include "base/logging.h" -#include "base/sha1.h" -#include "base/stl_util.h" +#include "packager/base/logging.h" +#include "packager/base/sha1.h" +#include "packager/base/stl_util.h" namespace { diff --git a/packager/media/base/rsa_key.h b/packager/media/base/rsa_key.h index 683fd180cb..83f9bf71cd 100644 --- a/packager/media/base/rsa_key.h +++ b/packager/media/base/rsa_key.h @@ -12,7 +12,7 @@ #include -#include "base/macros.h" +#include "packager/base/macros.h" struct rsa_st; typedef struct rsa_st RSA; diff --git a/packager/media/base/rsa_key_unittest.cc b/packager/media/base/rsa_key_unittest.cc index 5f3d33f190..0db071e0bb 100644 --- a/packager/media/base/rsa_key_unittest.cc +++ b/packager/media/base/rsa_key_unittest.cc @@ -8,10 +8,10 @@ #include -#include "base/memory/scoped_ptr.h" -#include "media/base/fake_prng.h" -#include "media/base/rsa_key.h" -#include "media/base/rsa_test_data.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/fake_prng.h" +#include "packager/media/base/rsa_key.h" +#include "packager/media/base/rsa_test_data.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/rsa_test_data.cc b/packager/media/base/rsa_test_data.cc index 46f1196d2c..3cc61418c3 100644 --- a/packager/media/base/rsa_test_data.cc +++ b/packager/media/base/rsa_test_data.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 "media/base/rsa_test_data.h" +#include "packager/media/base/rsa_test_data.h" #include diff --git a/packager/media/base/rsa_test_data.h b/packager/media/base/rsa_test_data.h index 8c84b6bd00..61d22bbe43 100644 --- a/packager/media/base/rsa_test_data.h +++ b/packager/media/base/rsa_test_data.h @@ -11,7 +11,7 @@ #include -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/status.cc b/packager/media/base/status.cc index 4ba7d4a82b..297e617a6c 100644 --- a/packager/media/base/status.cc +++ b/packager/media/base/status.cc @@ -4,9 +4,9 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/status.h" +#include "packager/media/base/status.h" -#include "base/strings/stringprintf.h" +#include "packager/base/strings/stringprintf.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/status.h b/packager/media/base/status.h index dfda7fc80d..209b479f42 100644 --- a/packager/media/base/status.h +++ b/packager/media/base/status.h @@ -9,7 +9,7 @@ #include -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/status_test_util.h b/packager/media/base/status_test_util.h index 207f0982aa..fa48754173 100644 --- a/packager/media/base/status_test_util.h +++ b/packager/media/base/status_test_util.h @@ -9,7 +9,7 @@ #include -#include "media/base/status.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/status_test_util_unittest.cc b/packager/media/base/status_test_util_unittest.cc index 09cbb81cd2..b7c3b22624 100644 --- a/packager/media/base/status_test_util_unittest.cc +++ b/packager/media/base/status_test_util_unittest.cc @@ -6,7 +6,7 @@ #include -#include "media/base/status_test_util.h" +#include "packager/media/base/status_test_util.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/status_unittest.cc b/packager/media/base/status_unittest.cc index a970e675a3..23591e7d57 100644 --- a/packager/media/base/status_unittest.cc +++ b/packager/media/base/status_unittest.cc @@ -7,8 +7,8 @@ #include #include -#include "base/strings/string_number_conversions.h" -#include "media/base/status.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/stream_info.cc b/packager/media/base/stream_info.cc index 64493d1b67..c324b93635 100644 --- a/packager/media/base/stream_info.cc +++ b/packager/media/base/stream_info.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/stream_info.h" +#include "packager/media/base/stream_info.h" #include -#include "base/logging.h" -#include "base/strings/stringprintf.h" +#include "packager/base/logging.h" +#include "packager/base/strings/stringprintf.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/stream_info.h b/packager/media/base/stream_info.h index 9e1d45748d..2f539ea9a1 100644 --- a/packager/media/base/stream_info.h +++ b/packager/media/base/stream_info.h @@ -10,7 +10,7 @@ #include #include -#include "base/memory/ref_counted.h" +#include "packager/base/memory/ref_counted.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/text_track.h b/packager/media/base/text_track.h index e586e1c2dd..5e84d7f184 100644 --- a/packager/media/base/text_track.h +++ b/packager/media/base/text_track.h @@ -7,9 +7,9 @@ #include -#include "base/callback.h" -#include "base/memory/scoped_ptr.h" -#include "base/time/time.h" +#include "packager/base/callback.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/time/time.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/video_stream_info.cc b/packager/media/base/video_stream_info.cc index 94661fa992..0a179f666f 100644 --- a/packager/media/base/video_stream_info.cc +++ b/packager/media/base/video_stream_info.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/video_stream_info.h" +#include "packager/media/base/video_stream_info.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" -#include "media/base/limits.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/string_util.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/media/base/limits.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/video_stream_info.h b/packager/media/base/video_stream_info.h index e461b0fb67..4fd78f8ff7 100644 --- a/packager/media/base/video_stream_info.h +++ b/packager/media/base/video_stream_info.h @@ -7,7 +7,7 @@ #ifndef MEDIA_BASE_VIDEO_STREAM_INFO_H_ #define MEDIA_BASE_VIDEO_STREAM_INFO_H_ -#include "media/base/stream_info.h" +#include "packager/media/base/stream_info.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/widevine_key_source.cc b/packager/media/base/widevine_key_source.cc index d17817215b..d436f223ae 100644 --- a/packager/media/base/widevine_key_source.cc +++ b/packager/media/base/widevine_key_source.cc @@ -4,17 +4,17 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/base/widevine_key_source.h" +#include "packager/media/base/widevine_key_source.h" -#include "base/base64.h" -#include "base/bind.h" -#include "base/json/json_reader.h" -#include "base/json/json_writer.h" -#include "base/memory/ref_counted.h" -#include "base/stl_util.h" -#include "media/base/http_fetcher.h" -#include "media/base/producer_consumer_queue.h" -#include "media/base/request_signer.h" +#include "packager/base/base64.h" +#include "packager/base/bind.h" +#include "packager/base/json/json_reader.h" +#include "packager/base/json/json_writer.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/stl_util.h" +#include "packager/media/base/http_fetcher.h" +#include "packager/media/base/producer_consumer_queue.h" +#include "packager/media/base/request_signer.h" #define RCHECK(x) \ do { \ diff --git a/packager/media/base/widevine_key_source.h b/packager/media/base/widevine_key_source.h index acf6228d81..b099aa9912 100644 --- a/packager/media/base/widevine_key_source.h +++ b/packager/media/base/widevine_key_source.h @@ -9,11 +9,11 @@ #include -#include "base/memory/scoped_ptr.h" -#include "base/synchronization/waitable_event.h" -#include "base/values.h" -#include "media/base/closure_thread.h" -#include "media/base/key_source.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/synchronization/waitable_event.h" +#include "packager/base/values.h" +#include "packager/media/base/closure_thread.h" +#include "packager/media/base/key_source.h" namespace edash_packager { namespace media { diff --git a/packager/media/base/widevine_key_source_unittest.cc b/packager/media/base/widevine_key_source_unittest.cc index a410ab0a8d..4294348702 100644 --- a/packager/media/base/widevine_key_source_unittest.cc +++ b/packager/media/base/widevine_key_source_unittest.cc @@ -7,13 +7,13 @@ #include #include -#include "base/base64.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" -#include "media/base/http_fetcher.h" -#include "media/base/request_signer.h" -#include "media/base/status_test_util.h" -#include "media/base/widevine_key_source.h" +#include "packager/base/base64.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/media/base/http_fetcher.h" +#include "packager/media/base/request_signer.h" +#include "packager/media/base/status_test_util.h" +#include "packager/media/base/widevine_key_source.h" namespace { const char kServerUrl[] = "http://www.foo.com/getcontentkey"; diff --git a/packager/media/event/mpd_notify_muxer_listener.cc b/packager/media/event/mpd_notify_muxer_listener.cc index 4dc8cd8743..8a4651ecb3 100644 --- a/packager/media/event/mpd_notify_muxer_listener.cc +++ b/packager/media/event/mpd_notify_muxer_listener.cc @@ -4,16 +4,16 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/event/mpd_notify_muxer_listener.h" +#include "packager/media/event/mpd_notify_muxer_listener.h" #include -#include "base/logging.h" -#include "media/base/audio_stream_info.h" -#include "media/base/video_stream_info.h" -#include "media/event/muxer_listener_internal.h" -#include "mpd/base/media_info.pb.h" -#include "mpd/base/mpd_notifier.h" +#include "packager/base/logging.h" +#include "packager/media/base/audio_stream_info.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/media/event/muxer_listener_internal.h" +#include "packager/mpd/base/media_info.pb.h" +#include "packager/mpd/base/mpd_notifier.h" namespace edash_packager { namespace media { diff --git a/packager/media/event/mpd_notify_muxer_listener.h b/packager/media/event/mpd_notify_muxer_listener.h index 3a4ea0d4fc..68f7ec4e05 100644 --- a/packager/media/event/mpd_notify_muxer_listener.h +++ b/packager/media/event/mpd_notify_muxer_listener.h @@ -11,10 +11,10 @@ #include -#include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/muxer_options.h" -#include "media/event/muxer_listener.h" +#include "packager/base/compiler_specific.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/event/muxer_listener.h" namespace edash_packager { diff --git a/packager/media/event/muxer_listener_internal.cc b/packager/media/event/muxer_listener_internal.cc index b2475b847a..927eb901ea 100644 --- a/packager/media/event/muxer_listener_internal.cc +++ b/packager/media/event/muxer_listener_internal.cc @@ -4,15 +4,15 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/event/muxer_listener_internal.h" +#include "packager/media/event/muxer_listener_internal.h" #include -#include "base/logging.h" -#include "media/base/audio_stream_info.h" -#include "media/base/muxer_options.h" -#include "media/base/video_stream_info.h" -#include "mpd/base/media_info.pb.h" +#include "packager/base/logging.h" +#include "packager/media/base/audio_stream_info.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/mpd/base/media_info.pb.h" namespace edash_packager { namespace media { diff --git a/packager/media/event/muxer_listener_internal.h b/packager/media/event/muxer_listener_internal.h index ef3f83845c..9fa5e9cc3f 100644 --- a/packager/media/event/muxer_listener_internal.h +++ b/packager/media/event/muxer_listener_internal.h @@ -12,7 +12,7 @@ #include #include -#include "media/event/muxer_listener.h" +#include "packager/media/event/muxer_listener.h" namespace edash_packager { diff --git a/packager/media/event/vod_media_info_dump_muxer_listener.cc b/packager/media/event/vod_media_info_dump_muxer_listener.cc index 79007868da..673eff10ec 100644 --- a/packager/media/event/vod_media_info_dump_muxer_listener.cc +++ b/packager/media/event/vod_media_info_dump_muxer_listener.cc @@ -4,16 +4,16 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/event/vod_media_info_dump_muxer_listener.h" +#include "packager/media/event/vod_media_info_dump_muxer_listener.h" #include -#include "base/logging.h" -#include "media/base/muxer_options.h" -#include "media/base/stream_info.h" -#include "media/event/muxer_listener_internal.h" -#include "media/file/file.h" -#include "mpd/base/media_info.pb.h" +#include "packager/base/logging.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/base/stream_info.h" +#include "packager/media/event/muxer_listener_internal.h" +#include "packager/media/file/file.h" +#include "packager/mpd/base/media_info.pb.h" namespace edash_packager { namespace media { diff --git a/packager/media/event/vod_media_info_dump_muxer_listener.h b/packager/media/event/vod_media_info_dump_muxer_listener.h index 2ce7a83a5e..09d67eea54 100644 --- a/packager/media/event/vod_media_info_dump_muxer_listener.h +++ b/packager/media/event/vod_media_info_dump_muxer_listener.h @@ -14,10 +14,10 @@ #include #include -#include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/muxer_options.h" -#include "media/event/muxer_listener.h" +#include "packager/base/compiler_specific.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/event/muxer_listener.h" namespace edash_packager { diff --git a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc index 1c84039acd..10ab513556 100644 --- a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc +++ b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc @@ -9,14 +9,14 @@ #include -#include "base/file_util.h" -#include "base/files/file_path.h" -#include "base/stl_util.h" -#include "media/event/vod_media_info_dump_muxer_listener.h" -#include "media/file/file.h" -#include "media/base/muxer_options.h" -#include "media/base/video_stream_info.h" -#include "mpd/base/media_info.pb.h" +#include "packager/base/file_util.h" +#include "packager/base/files/file_path.h" +#include "packager/base/stl_util.h" +#include "packager/media/event/vod_media_info_dump_muxer_listener.h" +#include "packager/media/file/file.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/mpd/base/media_info.pb.h" namespace { const bool kEnableEncryption = true; diff --git a/packager/media/file/file.cc b/packager/media/file/file.cc index 39b3f88688..045a74f50f 100644 --- a/packager/media/file/file.cc +++ b/packager/media/file/file.cc @@ -4,13 +4,13 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/file/file.h" +#include "packager/media/file/file.h" -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "media/file/local_file.h" -#include "media/file/udp_file.h" -#include "base/strings/string_util.h" +#include "packager/base/logging.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/file/local_file.h" +#include "packager/media/file/udp_file.h" +#include "packager/base/strings/string_util.h" namespace edash_packager { namespace media { diff --git a/packager/media/file/file.h b/packager/media/file/file.h index 0197278d35..9b1dbe3485 100644 --- a/packager/media/file/file.h +++ b/packager/media/file/file.h @@ -11,7 +11,7 @@ #include -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/media/file/file_closer.h b/packager/media/file/file_closer.h index 50aa611e2a..e0d1305a8c 100644 --- a/packager/media/file/file_closer.h +++ b/packager/media/file/file_closer.h @@ -7,8 +7,8 @@ #ifndef MEDIA_FILE_FILE_CLOSER_H_ #define MEDIA_FILE_FILE_CLOSER_H_ -#include "base/logging.h" -#include "media/file/file.h" +#include "packager/base/logging.h" +#include "packager/media/file/file.h" namespace edash_packager { namespace media { diff --git a/packager/media/file/file_unittest.cc b/packager/media/file/file_unittest.cc index 8b501c2b8a..0263e3e1ac 100644 --- a/packager/media/file/file_unittest.cc +++ b/packager/media/file/file_unittest.cc @@ -6,8 +6,8 @@ #include -#include "base/file_util.h" -#include "media/file/file.h" +#include "packager/base/file_util.h" +#include "packager/media/file/file.h" namespace { const int kDataSize = 1024; diff --git a/packager/media/file/local_file.cc b/packager/media/file/local_file.cc index 950192a5ac..de5cd478c6 100644 --- a/packager/media/file/local_file.cc +++ b/packager/media/file/local_file.cc @@ -4,10 +4,10 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/file/local_file.h" +#include "packager/media/file/local_file.h" -#include "base/file_util.h" -#include "base/logging.h" +#include "packager/base/file_util.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/file/local_file.h b/packager/media/file/local_file.h index 481d7147ac..c28a9d7ae1 100644 --- a/packager/media/file/local_file.h +++ b/packager/media/file/local_file.h @@ -11,8 +11,8 @@ #include -#include "base/compiler_specific.h" -#include "media/file/file.h" +#include "packager/base/compiler_specific.h" +#include "packager/media/file/file.h" namespace edash_packager { namespace media { diff --git a/packager/media/file/udp_file.cc b/packager/media/file/udp_file.cc index 33291cd006..4477a1e33a 100644 --- a/packager/media/file/udp_file.cc +++ b/packager/media/file/udp_file.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 "media/file/udp_file.h" +#include "packager/media/file/udp_file.h" #include #include @@ -15,8 +15,8 @@ #include -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" // TODO(tinskip): Adapt to work with winsock. diff --git a/packager/media/file/udp_file.h b/packager/media/file/udp_file.h index da03376e9a..3e9f6bf984 100644 --- a/packager/media/file/udp_file.h +++ b/packager/media/file/udp_file.h @@ -11,8 +11,8 @@ #include -#include "base/compiler_specific.h" -#include "media/file/file.h" +#include "packager/base/compiler_specific.h" +#include "packager/media/file/file.h" namespace edash_packager { namespace media { diff --git a/packager/media/filters/h264_bit_reader.cc b/packager/media/filters/h264_bit_reader.cc index 93e8e6821f..2e71f5b715 100644 --- a/packager/media/filters/h264_bit_reader.cc +++ b/packager/media/filters/h264_bit_reader.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/logging.h" -#include "media/filters/h264_bit_reader.h" +#include "packager/base/logging.h" +#include "packager/media/filters/h264_bit_reader.h" namespace edash_packager { namespace media { diff --git a/packager/media/filters/h264_bit_reader.h b/packager/media/filters/h264_bit_reader.h index 7695a53c9a..4c3d55a49e 100644 --- a/packager/media/filters/h264_bit_reader.h +++ b/packager/media/filters/h264_bit_reader.h @@ -10,7 +10,7 @@ #include #include -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/media/filters/h264_bit_reader_unittest.cc b/packager/media/filters/h264_bit_reader_unittest.cc index 9e9383ff0c..e1743497ad 100644 --- a/packager/media/filters/h264_bit_reader_unittest.cc +++ b/packager/media/filters/h264_bit_reader_unittest.cc @@ -4,7 +4,7 @@ #include -#include "media/filters/h264_bit_reader.h" +#include "packager/media/filters/h264_bit_reader.h" namespace edash_packager { namespace media { diff --git a/packager/media/filters/h264_byte_to_unit_stream_converter.cc b/packager/media/filters/h264_byte_to_unit_stream_converter.cc index adb68192cb..ceb24210a7 100644 --- a/packager/media/filters/h264_byte_to_unit_stream_converter.cc +++ b/packager/media/filters/h264_byte_to_unit_stream_converter.cc @@ -4,11 +4,11 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/filters/h264_byte_to_unit_stream_converter.h" +#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" -#include "base/logging.h" -#include "media/base/buffer_writer.h" -#include "media/filters/h264_parser.h" +#include "packager/base/logging.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/filters/h264_parser.h" namespace edash_packager { namespace media { diff --git a/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc b/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc index e982078182..2a20e70a57 100644 --- a/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc +++ b/packager/media/filters/h264_byte_to_unit_stream_converter_unittest.cc @@ -7,9 +7,9 @@ #include #include -#include "base/strings/string_number_conversions.h" -#include "media/filters/h264_byte_to_unit_stream_converter.h" -#include "media/test/test_data_util.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" +#include "packager/media/test/test_data_util.h" namespace { const char kExpectedConfigRecord[] = diff --git a/packager/media/filters/h264_parser.cc b/packager/media/filters/h264_parser.cc index c2b8cefffb..af11b6fae2 100644 --- a/packager/media/filters/h264_parser.cc +++ b/packager/media/filters/h264_parser.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "base/stl_util.h" +#include "packager/base/logging.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/stl_util.h" -#include "media/filters/h264_parser.h" +#include "packager/media/filters/h264_parser.h" namespace edash_packager { namespace media { diff --git a/packager/media/filters/h264_parser.h b/packager/media/filters/h264_parser.h index c9051f37fd..7283f95fcf 100644 --- a/packager/media/filters/h264_parser.h +++ b/packager/media/filters/h264_parser.h @@ -12,7 +12,7 @@ #include -#include "media/filters/h264_bit_reader.h" +#include "packager/media/filters/h264_bit_reader.h" namespace edash_packager { namespace media { diff --git a/packager/media/filters/h264_parser_unittest.cc b/packager/media/filters/h264_parser_unittest.cc index 0a78234c8e..98871bb0e1 100644 --- a/packager/media/filters/h264_parser_unittest.cc +++ b/packager/media/filters/h264_parser_unittest.cc @@ -4,13 +4,13 @@ #include -#include "base/command_line.h" -#include "base/files/memory_mapped_file.h" -#include "base/logging.h" -#include "base/path_service.h" -#include "base/strings/string_number_conversions.h" -#include "media/test/test_data_util.h" -#include "media/filters/h264_parser.h" +#include "packager/base/command_line.h" +#include "packager/base/files/memory_mapped_file.h" +#include "packager/base/logging.h" +#include "packager/base/path_service.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/test/test_data_util.h" +#include "packager/media/filters/h264_parser.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/adts_header.cc b/packager/media/formats/mp2t/adts_header.cc index d4b1156faf..887893beab 100644 --- a/packager/media/formats/mp2t/adts_header.cc +++ b/packager/media/formats/mp2t/adts_header.cc @@ -4,11 +4,11 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp2t/adts_header.h" +#include "packager/media/formats/mp2t/adts_header.h" -#include "media/base/bit_reader.h" -#include "media/formats/mp2t/mp2t_common.h" -#include "media/formats/mpeg/adts_constants.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/formats/mp2t/mp2t_common.h" +#include "packager/media/formats/mpeg/adts_constants.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/adts_header.h b/packager/media/formats/mp2t/adts_header.h index cccfb15a34..1b248c9c44 100644 --- a/packager/media/formats/mp2t/adts_header.h +++ b/packager/media/formats/mp2t/adts_header.h @@ -11,7 +11,7 @@ #include -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/adts_header_unittest.cc b/packager/media/formats/mp2t/adts_header_unittest.cc index 4cb12ba8bd..4fb7c7bf31 100644 --- a/packager/media/formats/mp2t/adts_header_unittest.cc +++ b/packager/media/formats/mp2t/adts_header_unittest.cc @@ -4,9 +4,9 @@ #include -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "media/formats/mp2t/adts_header.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/formats/mp2t/adts_header.h" namespace { diff --git a/packager/media/formats/mp2t/es_parser.h b/packager/media/formats/mp2t/es_parser.h index c335938358..c97eafdde9 100644 --- a/packager/media/formats/mp2t/es_parser.h +++ b/packager/media/formats/mp2t/es_parser.h @@ -7,8 +7,8 @@ #include -#include "base/callback.h" -#include "base/memory/ref_counted.h" +#include "packager/base/callback.h" +#include "packager/base/memory/ref_counted.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/es_parser_adts.cc b/packager/media/formats/mp2t/es_parser_adts.cc index fa78ca232e..4e91959fe8 100644 --- a/packager/media/formats/mp2t/es_parser_adts.cc +++ b/packager/media/formats/mp2t/es_parser_adts.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp2t/es_parser_adts.h" +#include "packager/media/formats/mp2t/es_parser_adts.h" #include #include -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "media/base/audio_timestamp_helper.h" -#include "media/base/bit_reader.h" -#include "media/base/media_sample.h" -#include "media/base/timestamp.h" -#include "media/formats/mp2t/adts_header.h" -#include "media/formats/mp2t/mp2t_common.h" -#include "media/formats/mpeg/adts_constants.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/audio_timestamp_helper.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/timestamp.h" +#include "packager/media/formats/mp2t/adts_header.h" +#include "packager/media/formats/mp2t/mp2t_common.h" +#include "packager/media/formats/mpeg/adts_constants.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/es_parser_adts.h b/packager/media/formats/mp2t/es_parser_adts.h index d1ddd012e3..17854f5400 100644 --- a/packager/media/formats/mp2t/es_parser_adts.h +++ b/packager/media/formats/mp2t/es_parser_adts.h @@ -8,12 +8,12 @@ #include #include -#include "base/callback.h" -#include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/audio_stream_info.h" -#include "media/base/byte_queue.h" -#include "media/formats/mp2t/es_parser.h" +#include "packager/base/callback.h" +#include "packager/base/compiler_specific.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/audio_stream_info.h" +#include "packager/media/base/byte_queue.h" +#include "packager/media/formats/mp2t/es_parser.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/es_parser_h264.cc b/packager/media/formats/mp2t/es_parser_h264.cc index f9fcd7a754..3351e6dc04 100644 --- a/packager/media/formats/mp2t/es_parser_h264.cc +++ b/packager/media/formats/mp2t/es_parser_h264.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp2t/es_parser_h264.h" +#include "packager/media/formats/mp2t/es_parser_h264.h" #include -#include "base/logging.h" -#include "base/numerics/safe_conversions.h" -#include "media/base/media_sample.h" -#include "media/base/offset_byte_queue.h" -#include "media/base/timestamp.h" -#include "media/base/video_stream_info.h" -#include "media/filters/h264_byte_to_unit_stream_converter.h" -#include "media/filters/h264_parser.h" -#include "media/formats/mp2t/mp2t_common.h" +#include "packager/base/logging.h" +#include "packager/base/numerics/safe_conversions.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/offset_byte_queue.h" +#include "packager/media/base/timestamp.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" +#include "packager/media/filters/h264_parser.h" +#include "packager/media/formats/mp2t/mp2t_common.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/es_parser_h264.h b/packager/media/formats/mp2t/es_parser_h264.h index 9eff45b1cd..4aa03b8188 100644 --- a/packager/media/formats/mp2t/es_parser_h264.h +++ b/packager/media/formats/mp2t/es_parser_h264.h @@ -10,10 +10,10 @@ #include #include -#include "base/callback.h" -#include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" -#include "media/formats/mp2t/es_parser.h" +#include "packager/base/callback.h" +#include "packager/base/compiler_specific.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/formats/mp2t/es_parser.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/es_parser_h264_unittest.cc b/packager/media/formats/mp2t/es_parser_h264_unittest.cc index 3747dcd569..66c9dad6e6 100644 --- a/packager/media/formats/mp2t/es_parser_h264_unittest.cc +++ b/packager/media/formats/mp2t/es_parser_h264_unittest.cc @@ -7,16 +7,16 @@ #include #include -#include "base/bind.h" -#include "base/command_line.h" -#include "base/files/memory_mapped_file.h" -#include "base/logging.h" -#include "base/path_service.h" -#include "media/base/media_sample.h" -#include "media/base/timestamp.h" -#include "media/filters/h264_parser.h" -#include "media/formats/mp2t/es_parser_h264.h" -#include "media/test/test_data_util.h" +#include "packager/base/bind.h" +#include "packager/base/command_line.h" +#include "packager/base/files/memory_mapped_file.h" +#include "packager/base/logging.h" +#include "packager/base/path_service.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/timestamp.h" +#include "packager/media/filters/h264_parser.h" +#include "packager/media/formats/mp2t/es_parser_h264.h" +#include "packager/media/test/test_data_util.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/mp2t_media_parser.cc b/packager/media/formats/mp2t/mp2t_media_parser.cc index 98c1e7dfe2..0d7f7521cb 100644 --- a/packager/media/formats/mp2t/mp2t_media_parser.cc +++ b/packager/media/formats/mp2t/mp2t_media_parser.cc @@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp2t/mp2t_media_parser.h" +#include "packager/media/formats/mp2t/mp2t_media_parser.h" -#include "base/bind.h" -#include "base/memory/scoped_ptr.h" -#include "base/stl_util.h" -#include "media/base/media_sample.h" -#include "media/base/stream_info.h" -#include "media/formats/mp2t/es_parser.h" -#include "media/formats/mp2t/es_parser_adts.h" -#include "media/formats/mp2t/es_parser_h264.h" -#include "media/formats/mp2t/mp2t_common.h" -#include "media/formats/mp2t/ts_packet.h" -#include "media/formats/mp2t/ts_section.h" -#include "media/formats/mp2t/ts_section_pat.h" -#include "media/formats/mp2t/ts_section_pes.h" -#include "media/formats/mp2t/ts_section_pmt.h" +#include "packager/base/bind.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/stl_util.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/stream_info.h" +#include "packager/media/formats/mp2t/es_parser.h" +#include "packager/media/formats/mp2t/es_parser_adts.h" +#include "packager/media/formats/mp2t/es_parser_h264.h" +#include "packager/media/formats/mp2t/mp2t_common.h" +#include "packager/media/formats/mp2t/ts_packet.h" +#include "packager/media/formats/mp2t/ts_section.h" +#include "packager/media/formats/mp2t/ts_section_pat.h" +#include "packager/media/formats/mp2t/ts_section_pes.h" +#include "packager/media/formats/mp2t/ts_section_pmt.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/mp2t_media_parser.h b/packager/media/formats/mp2t/mp2t_media_parser.h index 507959d941..92cfc05223 100644 --- a/packager/media/formats/mp2t/mp2t_media_parser.h +++ b/packager/media/formats/mp2t/mp2t_media_parser.h @@ -8,11 +8,11 @@ #include #include -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/byte_queue.h" -#include "media/base/media_parser.h" -#include "media/base/stream_info.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/byte_queue.h" +#include "packager/media/base/media_parser.h" +#include "packager/media/base/stream_info.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc index 2e64241dc8..90b55769ef 100644 --- a/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc +++ b/packager/media/formats/mp2t/mp2t_media_parser_unittest.cc @@ -7,17 +7,17 @@ #include #include -#include "base/bind.h" -#include "base/bind_helpers.h" -#include "base/logging.h" -#include "base/memory/ref_counted.h" -#include "media/base/media_sample.h" -#include "media/base/stream_info.h" -#include "media/base/timestamp.h" -#include "media/base/video_stream_info.h" -#include "media/formats/mp2t/mp2t_common.h" -#include "media/formats/mp2t/mp2t_media_parser.h" -#include "media/test/test_data_util.h" +#include "packager/base/bind.h" +#include "packager/base/bind_helpers.h" +#include "packager/base/logging.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/stream_info.h" +#include "packager/media/base/timestamp.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/media/formats/mp2t/mp2t_common.h" +#include "packager/media/formats/mp2t/mp2t_media_parser.h" +#include "packager/media/test/test_data_util.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/ts_packet.cc b/packager/media/formats/mp2t/ts_packet.cc index cf9daff985..c4319408eb 100644 --- a/packager/media/formats/mp2t/ts_packet.cc +++ b/packager/media/formats/mp2t/ts_packet.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp2t/ts_packet.h" +#include "packager/media/formats/mp2t/ts_packet.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/bit_reader.h" -#include "media/formats/mp2t/mp2t_common.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/formats/mp2t/mp2t_common.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/ts_packet.h b/packager/media/formats/mp2t/ts_packet.h index c3fbf7f55a..baf345adec 100644 --- a/packager/media/formats/mp2t/ts_packet.h +++ b/packager/media/formats/mp2t/ts_packet.h @@ -7,7 +7,7 @@ #include -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/ts_section_pat.cc b/packager/media/formats/mp2t/ts_section_pat.cc index 20037c10c8..29e29e19c4 100644 --- a/packager/media/formats/mp2t/ts_section_pat.cc +++ b/packager/media/formats/mp2t/ts_section_pat.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp2t/ts_section_pat.h" +#include "packager/media/formats/mp2t/ts_section_pat.h" #include -#include "base/logging.h" -#include "media/base/bit_reader.h" -#include "media/formats/mp2t/mp2t_common.h" +#include "packager/base/logging.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/formats/mp2t/mp2t_common.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/ts_section_pat.h b/packager/media/formats/mp2t/ts_section_pat.h index 6cebb25bd1..2e6c4da966 100644 --- a/packager/media/formats/mp2t/ts_section_pat.h +++ b/packager/media/formats/mp2t/ts_section_pat.h @@ -5,9 +5,9 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_ -#include "base/callback.h" -#include "base/compiler_specific.h" -#include "media/formats/mp2t/ts_section_psi.h" +#include "packager/base/callback.h" +#include "packager/base/compiler_specific.h" +#include "packager/media/formats/mp2t/ts_section_psi.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/ts_section_pes.cc b/packager/media/formats/mp2t/ts_section_pes.cc index ca8b2ee642..92c72e2c1e 100644 --- a/packager/media/formats/mp2t/ts_section_pes.cc +++ b/packager/media/formats/mp2t/ts_section_pes.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp2t/ts_section_pes.h" +#include "packager/media/formats/mp2t/ts_section_pes.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "media/base/bit_reader.h" -#include "media/base/timestamp.h" -#include "media/formats/mp2t/es_parser.h" -#include "media/formats/mp2t/mp2t_common.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/base/timestamp.h" +#include "packager/media/formats/mp2t/es_parser.h" +#include "packager/media/formats/mp2t/mp2t_common.h" static const int kPesStartCode = 0x000001; diff --git a/packager/media/formats/mp2t/ts_section_pes.h b/packager/media/formats/mp2t/ts_section_pes.h index 0ea3e38fa8..1d2d59b391 100644 --- a/packager/media/formats/mp2t/ts_section_pes.h +++ b/packager/media/formats/mp2t/ts_section_pes.h @@ -7,10 +7,10 @@ #include -#include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/byte_queue.h" -#include "media/formats/mp2t/ts_section.h" +#include "packager/base/compiler_specific.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/byte_queue.h" +#include "packager/media/formats/mp2t/ts_section.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/ts_section_pmt.cc b/packager/media/formats/mp2t/ts_section_pmt.cc index 26176ac037..b32a303e96 100644 --- a/packager/media/formats/mp2t/ts_section_pmt.cc +++ b/packager/media/formats/mp2t/ts_section_pmt.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp2t/ts_section_pmt.h" +#include "packager/media/formats/mp2t/ts_section_pmt.h" #include -#include "base/logging.h" -#include "media/base/bit_reader.h" -#include "media/formats/mp2t/mp2t_common.h" +#include "packager/base/logging.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/formats/mp2t/mp2t_common.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/ts_section_pmt.h b/packager/media/formats/mp2t/ts_section_pmt.h index 018c4b22b7..74a29c7b5e 100644 --- a/packager/media/formats/mp2t/ts_section_pmt.h +++ b/packager/media/formats/mp2t/ts_section_pmt.h @@ -5,9 +5,9 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_ -#include "base/callback.h" -#include "base/compiler_specific.h" -#include "media/formats/mp2t/ts_section_psi.h" +#include "packager/base/callback.h" +#include "packager/base/compiler_specific.h" +#include "packager/media/formats/mp2t/ts_section_psi.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp2t/ts_section_psi.cc b/packager/media/formats/mp2t/ts_section_psi.cc index 9cd6332722..cfaeb1468e 100644 --- a/packager/media/formats/mp2t/ts_section_psi.cc +++ b/packager/media/formats/mp2t/ts_section_psi.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp2t/ts_section_psi.h" +#include "packager/media/formats/mp2t/ts_section_psi.h" #include -#include "base/logging.h" -#include "media/base/bit_reader.h" -#include "media/formats/mp2t/mp2t_common.h" +#include "packager/base/logging.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/formats/mp2t/mp2t_common.h" static bool IsCrcValid(const uint8_t* buf, int size) { uint32_t crc = 0xffffffffu; diff --git a/packager/media/formats/mp2t/ts_section_psi.h b/packager/media/formats/mp2t/ts_section_psi.h index 44c68fc6d2..9ff585cb93 100644 --- a/packager/media/formats/mp2t/ts_section_psi.h +++ b/packager/media/formats/mp2t/ts_section_psi.h @@ -5,9 +5,9 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_PSI_H_ -#include "base/compiler_specific.h" -#include "media/base/byte_queue.h" -#include "media/formats/mp2t/ts_section.h" +#include "packager/base/compiler_specific.h" +#include "packager/media/base/byte_queue.h" +#include "packager/media/formats/mp2t/ts_section.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/aac_audio_specific_config.cc b/packager/media/formats/mp4/aac_audio_specific_config.cc index 9ec56d1b6d..489339011f 100644 --- a/packager/media/formats/mp4/aac_audio_specific_config.cc +++ b/packager/media/formats/mp4/aac_audio_specific_config.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp4/aac_audio_specific_config.h" +#include "packager/media/formats/mp4/aac_audio_specific_config.h" #include -#include "base/logging.h" -#include "media/base/bit_reader.h" -#include "media/formats/mp4/rcheck.h" +#include "packager/base/logging.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/formats/mp4/rcheck.h" namespace { diff --git a/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc b/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc index 5512c9896b..c0c359e387 100644 --- a/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc +++ b/packager/media/formats/mp4/aac_audio_specific_config_unittest.cc @@ -4,7 +4,7 @@ #include -#include "media/formats/mp4/aac_audio_specific_config.h" +#include "packager/media/formats/mp4/aac_audio_specific_config.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box.cc b/packager/media/formats/mp4/box.cc index 88186c2046..025fa63cd3 100644 --- a/packager/media/formats/mp4/box.cc +++ b/packager/media/formats/mp4/box.cc @@ -4,10 +4,10 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/box.h" +#include "packager/media/formats/mp4/box.h" -#include "base/logging.h" -#include "media/formats/mp4/box_buffer.h" +#include "packager/base/logging.h" +#include "packager/media/formats/mp4/box_buffer.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box.h b/packager/media/formats/mp4/box.h index 050aa08053..02f060c4fc 100644 --- a/packager/media/formats/mp4/box.h +++ b/packager/media/formats/mp4/box.h @@ -9,8 +9,8 @@ #include -#include "base/compiler_specific.h" -#include "media/formats/mp4/fourccs.h" +#include "packager/base/compiler_specific.h" +#include "packager/media/formats/mp4/fourccs.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box_buffer.h b/packager/media/formats/mp4/box_buffer.h index 358ecbb077..8c9c66cfac 100644 --- a/packager/media/formats/mp4/box_buffer.h +++ b/packager/media/formats/mp4/box_buffer.h @@ -7,10 +7,10 @@ #ifndef MEDIA_FORMATS_MP4_BOX_BUFFER_H_ #define MEDIA_FORMATS_MP4_BOX_BUFFER_H_ -#include "base/compiler_specific.h" -#include "media/base/buffer_writer.h" -#include "media/formats/mp4/box.h" -#include "media/formats/mp4/box_reader.h" +#include "packager/base/compiler_specific.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/formats/mp4/box.h" +#include "packager/media/formats/mp4/box_reader.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box_definitions.cc b/packager/media/formats/mp4/box_definitions.cc index f31806f223..cfb6a51275 100644 --- a/packager/media/formats/mp4/box_definitions.cc +++ b/packager/media/formats/mp4/box_definitions.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/box_definitions.h" #include -#include "base/logging.h" -#include "media/base/bit_reader.h" -#include "media/formats/mp4/box_buffer.h" -#include "media/formats/mp4/rcheck.h" +#include "packager/base/logging.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/formats/mp4/box_buffer.h" +#include "packager/media/formats/mp4/rcheck.h" namespace { const uint32_t kFourCCSize = 4; diff --git a/packager/media/formats/mp4/box_definitions.h b/packager/media/formats/mp4/box_definitions.h index e4cddeb64a..ee03d9f96e 100644 --- a/packager/media/formats/mp4/box_definitions.h +++ b/packager/media/formats/mp4/box_definitions.h @@ -8,10 +8,10 @@ #include #include -#include "media/formats/mp4/aac_audio_specific_config.h" -#include "media/formats/mp4/box.h" -#include "media/formats/mp4/es_descriptor.h" -#include "media/formats/mp4/fourccs.h" +#include "packager/media/formats/mp4/aac_audio_specific_config.h" +#include "packager/media/formats/mp4/box.h" +#include "packager/media/formats/mp4/es_descriptor.h" +#include "packager/media/formats/mp4/fourccs.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box_definitions_comparison.h b/packager/media/formats/mp4/box_definitions_comparison.h index c4df945e08..f196ce1ccf 100644 --- a/packager/media/formats/mp4/box_definitions_comparison.h +++ b/packager/media/formats/mp4/box_definitions_comparison.h @@ -9,7 +9,7 @@ #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_ #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_COMPARISON_H_ -#include "media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box_definitions_unittest.cc b/packager/media/formats/mp4/box_definitions_unittest.cc index 6c1f791271..955a5f24ee 100644 --- a/packager/media/formats/mp4/box_definitions_unittest.cc +++ b/packager/media/formats/mp4/box_definitions_unittest.cc @@ -8,11 +8,11 @@ #include -#include "base/memory/scoped_ptr.h" -#include "media/base/buffer_writer.h" -#include "media/formats/mp4/box_definitions.h" -#include "media/formats/mp4/box_definitions_comparison.h" -#include "media/formats/mp4/box_reader.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/box_definitions_comparison.h" +#include "packager/media/formats/mp4/box_reader.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box_reader.cc b/packager/media/formats/mp4/box_reader.cc index 9fc386f341..94c56ebe7c 100644 --- a/packager/media/formats/mp4/box_reader.cc +++ b/packager/media/formats/mp4/box_reader.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp4/box_reader.h" +#include "packager/media/formats/mp4/box_reader.h" #include #include -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "base/strings/stringprintf.h" -#include "media/formats/mp4/box.h" +#include "packager/base/logging.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/media/formats/mp4/box.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box_reader.h b/packager/media/formats/mp4/box_reader.h index 43673eb8b2..7aacf79833 100644 --- a/packager/media/formats/mp4/box_reader.h +++ b/packager/media/formats/mp4/box_reader.h @@ -8,11 +8,11 @@ #include #include -#include "base/compiler_specific.h" -#include "base/logging.h" -#include "media/base/buffer_reader.h" -#include "media/formats/mp4/fourccs.h" -#include "media/formats/mp4/rcheck.h" +#include "packager/base/compiler_specific.h" +#include "packager/base/logging.h" +#include "packager/media/base/buffer_reader.h" +#include "packager/media/formats/mp4/fourccs.h" +#include "packager/media/formats/mp4/rcheck.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/box_reader_unittest.cc b/packager/media/formats/mp4/box_reader_unittest.cc index 57d5c5b87e..9e901a1e21 100644 --- a/packager/media/formats/mp4/box_reader_unittest.cc +++ b/packager/media/formats/mp4/box_reader_unittest.cc @@ -6,10 +6,10 @@ #include #include -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "media/formats/mp4/box_buffer.h" -#include "media/formats/mp4/rcheck.h" +#include "packager/base/logging.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/formats/mp4/box_buffer.h" +#include "packager/media/formats/mp4/rcheck.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/cenc.cc b/packager/media/formats/mp4/cenc.cc index bac477955c..04117de0eb 100644 --- a/packager/media/formats/mp4/cenc.cc +++ b/packager/media/formats/mp4/cenc.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp4/cenc.h" +#include "packager/media/formats/mp4/cenc.h" #include -#include "media/base/buffer_reader.h" -#include "media/base/buffer_writer.h" -#include "media/formats/mp4/rcheck.h" +#include "packager/media/base/buffer_reader.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/formats/mp4/rcheck.h" namespace { // According to ISO/IEC FDIS 23001-7: CENC spec, IV should be either diff --git a/packager/media/formats/mp4/cenc.h b/packager/media/formats/mp4/cenc.h index 84690f5da5..5061c360e7 100644 --- a/packager/media/formats/mp4/cenc.h +++ b/packager/media/formats/mp4/cenc.h @@ -9,7 +9,7 @@ #include -#include "media/base/decrypt_config.h" +#include "packager/media/base/decrypt_config.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/chunk_info_iterator.cc b/packager/media/formats/mp4/chunk_info_iterator.cc index 9d90148fc3..ab175f8da1 100644 --- a/packager/media/formats/mp4/chunk_info_iterator.cc +++ b/packager/media/formats/mp4/chunk_info_iterator.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/chunk_info_iterator.h" +#include "packager/media/formats/mp4/chunk_info_iterator.h" #include #include -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/chunk_info_iterator.h b/packager/media/formats/mp4/chunk_info_iterator.h index e1c4312a0a..6d0f33473a 100644 --- a/packager/media/formats/mp4/chunk_info_iterator.h +++ b/packager/media/formats/mp4/chunk_info_iterator.h @@ -11,8 +11,8 @@ #include -#include "base/macros.h" -#include "media/formats/mp4/box_definitions.h" +#include "packager/base/macros.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/chunk_info_iterator_unittest.cc b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc index dfb071a966..387a532a41 100644 --- a/packager/media/formats/mp4/chunk_info_iterator_unittest.cc +++ b/packager/media/formats/mp4/chunk_info_iterator_unittest.cc @@ -6,9 +6,9 @@ #include -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "media/formats/mp4/chunk_info_iterator.h" +#include "packager/base/logging.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/formats/mp4/chunk_info_iterator.h" namespace { struct ChunkProperty { diff --git a/packager/media/formats/mp4/composition_offset_iterator.cc b/packager/media/formats/mp4/composition_offset_iterator.cc index dbe12c7236..ca7f69a66b 100644 --- a/packager/media/formats/mp4/composition_offset_iterator.cc +++ b/packager/media/formats/mp4/composition_offset_iterator.cc @@ -4,9 +4,9 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/composition_offset_iterator.h" +#include "packager/media/formats/mp4/composition_offset_iterator.h" -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/composition_offset_iterator.h b/packager/media/formats/mp4/composition_offset_iterator.h index 815faf7951..5a35c8489d 100644 --- a/packager/media/formats/mp4/composition_offset_iterator.h +++ b/packager/media/formats/mp4/composition_offset_iterator.h @@ -11,8 +11,8 @@ #include -#include "base/macros.h" -#include "media/formats/mp4/box_definitions.h" +#include "packager/base/macros.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/composition_offset_iterator_unittest.cc b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc index 127584e077..bcec61ad61 100644 --- a/packager/media/formats/mp4/composition_offset_iterator_unittest.cc +++ b/packager/media/formats/mp4/composition_offset_iterator_unittest.cc @@ -6,8 +6,8 @@ #include -#include "base/memory/scoped_ptr.h" -#include "media/formats/mp4/composition_offset_iterator.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/formats/mp4/composition_offset_iterator.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/decoding_time_iterator.cc b/packager/media/formats/mp4/decoding_time_iterator.cc index e31d4731dc..214aad883b 100644 --- a/packager/media/formats/mp4/decoding_time_iterator.cc +++ b/packager/media/formats/mp4/decoding_time_iterator.cc @@ -4,11 +4,11 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/decoding_time_iterator.h" +#include "packager/media/formats/mp4/decoding_time_iterator.h" #include -#include "base/logging.h" +#include "packager/base/logging.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/decoding_time_iterator.h b/packager/media/formats/mp4/decoding_time_iterator.h index b03c5f962a..f23c9f3e8e 100644 --- a/packager/media/formats/mp4/decoding_time_iterator.h +++ b/packager/media/formats/mp4/decoding_time_iterator.h @@ -11,8 +11,8 @@ #include -#include "base/macros.h" -#include "media/formats/mp4/box_definitions.h" +#include "packager/base/macros.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/decoding_time_iterator_unittest.cc b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc index d611e7a8c3..c85c5e1e15 100644 --- a/packager/media/formats/mp4/decoding_time_iterator_unittest.cc +++ b/packager/media/formats/mp4/decoding_time_iterator_unittest.cc @@ -6,8 +6,8 @@ #include -#include "base/memory/scoped_ptr.h" -#include "media/formats/mp4/decoding_time_iterator.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/formats/mp4/decoding_time_iterator.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/encrypting_fragmenter.cc b/packager/media/formats/mp4/encrypting_fragmenter.cc index d8f280b342..5ee7484fbd 100644 --- a/packager/media/formats/mp4/encrypting_fragmenter.cc +++ b/packager/media/formats/mp4/encrypting_fragmenter.cc @@ -4,14 +4,14 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/encrypting_fragmenter.h" +#include "packager/media/formats/mp4/encrypting_fragmenter.h" -#include "media/base/aes_encryptor.h" -#include "media/base/buffer_reader.h" -#include "media/base/key_source.h" -#include "media/base/media_sample.h" -#include "media/formats/mp4/box_definitions.h" -#include "media/formats/mp4/cenc.h" +#include "packager/media/base/aes_encryptor.h" +#include "packager/media/base/buffer_reader.h" +#include "packager/media/base/key_source.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/cenc.h" namespace { // Generate 64bit IV by default. diff --git a/packager/media/formats/mp4/encrypting_fragmenter.h b/packager/media/formats/mp4/encrypting_fragmenter.h index 24335cd20d..9d192bd12d 100644 --- a/packager/media/formats/mp4/encrypting_fragmenter.h +++ b/packager/media/formats/mp4/encrypting_fragmenter.h @@ -7,7 +7,7 @@ #ifndef MEDIA_FORMATS_MP4_ENCRYPTING_FRAGMENTER_H_ #define MEDIA_FORMATS_MP4_ENCRYPTING_FRAGMENTER_H_ -#include "media/formats/mp4/fragmenter.h" +#include "packager/media/formats/mp4/fragmenter.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/es_descriptor.cc b/packager/media/formats/mp4/es_descriptor.cc index 99eab5c908..10cae67c0b 100644 --- a/packager/media/formats/mp4/es_descriptor.cc +++ b/packager/media/formats/mp4/es_descriptor.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp4/es_descriptor.h" +#include "packager/media/formats/mp4/es_descriptor.h" -#include "media/base/bit_reader.h" -#include "media/base/buffer_writer.h" -#include "media/formats/mp4/rcheck.h" +#include "packager/media/base/bit_reader.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/formats/mp4/rcheck.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/es_descriptor_unittest.cc b/packager/media/formats/mp4/es_descriptor_unittest.cc index 5d31d58d54..597baf76de 100644 --- a/packager/media/formats/mp4/es_descriptor_unittest.cc +++ b/packager/media/formats/mp4/es_descriptor_unittest.cc @@ -4,7 +4,7 @@ #include -#include "media/formats/mp4/es_descriptor.h" +#include "packager/media/formats/mp4/es_descriptor.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/fragmenter.cc b/packager/media/formats/mp4/fragmenter.cc index 2edb878dfd..531660106f 100644 --- a/packager/media/formats/mp4/fragmenter.cc +++ b/packager/media/formats/mp4/fragmenter.cc @@ -4,13 +4,13 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/fragmenter.h" +#include "packager/media/formats/mp4/fragmenter.h" #include -#include "media/base/buffer_writer.h" -#include "media/base/media_sample.h" -#include "media/formats/mp4/box_definitions.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/fragmenter.h b/packager/media/formats/mp4/fragmenter.h index 8987521148..9fe1ace1b5 100644 --- a/packager/media/formats/mp4/fragmenter.h +++ b/packager/media/formats/mp4/fragmenter.h @@ -9,9 +9,9 @@ #include -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/status.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/key_rotation_fragmenter.cc b/packager/media/formats/mp4/key_rotation_fragmenter.cc index 80e61380e2..4b91264c8a 100644 --- a/packager/media/formats/mp4/key_rotation_fragmenter.cc +++ b/packager/media/formats/mp4/key_rotation_fragmenter.cc @@ -4,10 +4,10 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/key_rotation_fragmenter.h" +#include "packager/media/formats/mp4/key_rotation_fragmenter.h" -#include "media/base/aes_encryptor.h" -#include "media/formats/mp4/box_definitions.h" +#include "packager/media/base/aes_encryptor.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/key_rotation_fragmenter.h b/packager/media/formats/mp4/key_rotation_fragmenter.h index 3fe4cf5df0..c82d5b6218 100644 --- a/packager/media/formats/mp4/key_rotation_fragmenter.h +++ b/packager/media/formats/mp4/key_rotation_fragmenter.h @@ -7,8 +7,8 @@ #ifndef MEDIA_FORMATS_MP4_KEY_ROTATION_FRAGMENTER_H_ #define MEDIA_FORMATS_MP4_KEY_ROTATION_FRAGMENTER_H_ -#include "media/base/key_source.h" -#include "media/formats/mp4/encrypting_fragmenter.h" +#include "packager/media/base/key_source.h" +#include "packager/media/formats/mp4/encrypting_fragmenter.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/mp4_media_parser.cc b/packager/media/formats/mp4/mp4_media_parser.cc index 8e314db52b..395a3eac44 100644 --- a/packager/media/formats/mp4/mp4_media_parser.cc +++ b/packager/media/formats/mp4/mp4_media_parser.cc @@ -2,26 +2,26 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp4/mp4_media_parser.h" +#include "packager/media/formats/mp4/mp4_media_parser.h" #include -#include "base/callback.h" -#include "base/callback_helpers.h" -#include "base/logging.h" -#include "base/memory/ref_counted.h" -#include "base/strings/string_number_conversions.h" -#include "media/base/aes_encryptor.h" -#include "media/base/audio_stream_info.h" -#include "media/base/decrypt_config.h" -#include "media/base/key_source.h" -#include "media/base/media_sample.h" -#include "media/base/video_stream_info.h" -#include "media/formats/mp4/box_definitions.h" -#include "media/formats/mp4/box_reader.h" -#include "media/formats/mp4/es_descriptor.h" -#include "media/formats/mp4/rcheck.h" -#include "media/formats/mp4/track_run_iterator.h" +#include "packager/base/callback.h" +#include "packager/base/callback_helpers.h" +#include "packager/base/logging.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/aes_encryptor.h" +#include "packager/media/base/audio_stream_info.h" +#include "packager/media/base/decrypt_config.h" +#include "packager/media/base/key_source.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/box_reader.h" +#include "packager/media/formats/mp4/es_descriptor.h" +#include "packager/media/formats/mp4/rcheck.h" +#include "packager/media/formats/mp4/track_run_iterator.h" namespace { diff --git a/packager/media/formats/mp4/mp4_media_parser.h b/packager/media/formats/mp4/mp4_media_parser.h index 0928a57008..748aa53b93 100644 --- a/packager/media/formats/mp4/mp4_media_parser.h +++ b/packager/media/formats/mp4/mp4_media_parser.h @@ -12,13 +12,13 @@ #include #include -#include "base/callback_forward.h" -#include "base/compiler_specific.h" -#include "base/memory/scoped_ptr.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/media_parser.h" -#include "media/base/offset_byte_queue.h" +#include "packager/base/callback_forward.h" +#include "packager/base/compiler_specific.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/media_parser.h" +#include "packager/media/base/offset_byte_queue.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/mp4_media_parser_unittest.cc b/packager/media/formats/mp4/mp4_media_parser_unittest.cc index 9aff6fb930..c2b8954135 100644 --- a/packager/media/formats/mp4/mp4_media_parser_unittest.cc +++ b/packager/media/formats/mp4/mp4_media_parser_unittest.cc @@ -6,11 +6,11 @@ #include -#include "base/bind.h" -#include "base/logging.h" -#include "media/base/media_sample.h" -#include "media/formats/mp4/mp4_media_parser.h" -#include "media/test/test_data_util.h" +#include "packager/base/bind.h" +#include "packager/base/logging.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/formats/mp4/mp4_media_parser.h" +#include "packager/media/test/test_data_util.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc index 3428443e37..c711738449 100644 --- a/packager/media/formats/mp4/mp4_muxer.cc +++ b/packager/media/formats/mp4/mp4_muxer.cc @@ -4,23 +4,23 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/mp4_muxer.h" +#include "packager/media/formats/mp4/mp4_muxer.h" -#include "base/time/clock.h" -#include "base/time/time.h" -#include "media/base/aes_encryptor.h" -#include "media/base/audio_stream_info.h" -#include "media/base/key_source.h" -#include "media/base/media_sample.h" -#include "media/base/media_stream.h" -#include "media/base/video_stream_info.h" -#include "media/event/muxer_listener.h" -#include "media/file/file.h" -#include "media/formats/mp4/box_definitions.h" -#include "media/formats/mp4/es_descriptor.h" -#include "media/formats/mp4/fourccs.h" -#include "media/formats/mp4/multi_segment_segmenter.h" -#include "media/formats/mp4/single_segment_segmenter.h" +#include "packager/base/time/clock.h" +#include "packager/base/time/time.h" +#include "packager/media/base/aes_encryptor.h" +#include "packager/media/base/audio_stream_info.h" +#include "packager/media/base/key_source.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/media_stream.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/media/event/muxer_listener.h" +#include "packager/media/file/file.h" +#include "packager/media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/es_descriptor.h" +#include "packager/media/formats/mp4/fourccs.h" +#include "packager/media/formats/mp4/multi_segment_segmenter.h" +#include "packager/media/formats/mp4/single_segment_segmenter.h" namespace { // Sets the range start and end value from offset and size. diff --git a/packager/media/formats/mp4/mp4_muxer.h b/packager/media/formats/mp4/mp4_muxer.h index e72e92f353..a5bc81271f 100644 --- a/packager/media/formats/mp4/mp4_muxer.h +++ b/packager/media/formats/mp4/mp4_muxer.h @@ -9,8 +9,8 @@ #include -#include "media/base/muxer.h" -#include "media/formats/mp4/fourccs.h" +#include "packager/media/base/muxer.h" +#include "packager/media/formats/mp4/fourccs.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/multi_segment_segmenter.cc b/packager/media/formats/mp4/multi_segment_segmenter.cc index 424c348fe2..1c2b2a2d45 100644 --- a/packager/media/formats/mp4/multi_segment_segmenter.cc +++ b/packager/media/formats/mp4/multi_segment_segmenter.cc @@ -4,17 +4,17 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/multi_segment_segmenter.h" +#include "packager/media/formats/mp4/multi_segment_segmenter.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_util.h" -#include "media/base/buffer_writer.h" -#include "media/base/media_stream.h" -#include "media/base/muxer_options.h" -#include "media/base/muxer_util.h" -#include "media/event/muxer_listener.h" -#include "media/file/file.h" -#include "media/formats/mp4/box_definitions.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/string_util.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/base/media_stream.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/base/muxer_util.h" +#include "packager/media/event/muxer_listener.h" +#include "packager/media/file/file.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/multi_segment_segmenter.h b/packager/media/formats/mp4/multi_segment_segmenter.h index 8734527cd5..2189c7b771 100644 --- a/packager/media/formats/mp4/multi_segment_segmenter.h +++ b/packager/media/formats/mp4/multi_segment_segmenter.h @@ -7,7 +7,7 @@ #ifndef MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_ #define MEDIA_FORMATS_MP4_MULTI_SEGMENT_SEGMENTER_H_ -#include "media/formats/mp4/segmenter.h" +#include "packager/media/formats/mp4/segmenter.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/rcheck.h b/packager/media/formats/mp4/rcheck.h index e27e638eb0..f5c2f28f66 100644 --- a/packager/media/formats/mp4/rcheck.h +++ b/packager/media/formats/mp4/rcheck.h @@ -5,7 +5,7 @@ #ifndef MEDIA_FORMATS_MP4_RCHECK_H_ #define MEDIA_FORMATS_MP4_RCHECK_H_ -#include "base/logging.h" +#include "packager/base/logging.h" #define RCHECK(x) \ do { \ diff --git a/packager/media/formats/mp4/segmenter.cc b/packager/media/formats/mp4/segmenter.cc index 7f1f975cce..d27042af8f 100644 --- a/packager/media/formats/mp4/segmenter.cc +++ b/packager/media/formats/mp4/segmenter.cc @@ -4,19 +4,19 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/segmenter.h" +#include "packager/media/formats/mp4/segmenter.h" #include -#include "base/stl_util.h" -#include "media/base/buffer_writer.h" -#include "media/base/key_source.h" -#include "media/base/media_sample.h" -#include "media/base/media_stream.h" -#include "media/base/muxer_options.h" -#include "media/base/video_stream_info.h" -#include "media/formats/mp4/box_definitions.h" -#include "media/formats/mp4/key_rotation_fragmenter.h" +#include "packager/base/stl_util.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/base/key_source.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/media_stream.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/key_rotation_fragmenter.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/segmenter.h b/packager/media/formats/mp4/segmenter.h index 78be6b5c8d..ea573df5ac 100644 --- a/packager/media/formats/mp4/segmenter.h +++ b/packager/media/formats/mp4/segmenter.h @@ -10,9 +10,9 @@ #include #include -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "media/base/status.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/status.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/single_segment_segmenter.cc b/packager/media/formats/mp4/single_segment_segmenter.cc index d15d3a9044..6171d2a120 100644 --- a/packager/media/formats/mp4/single_segment_segmenter.cc +++ b/packager/media/formats/mp4/single_segment_segmenter.cc @@ -4,14 +4,14 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "media/formats/mp4/single_segment_segmenter.h" +#include "packager/media/formats/mp4/single_segment_segmenter.h" -#include "base/file_util.h" -#include "media/base/buffer_writer.h" -#include "media/base/media_stream.h" -#include "media/base/muxer_options.h" -#include "media/file/file.h" -#include "media/formats/mp4/box_definitions.h" +#include "packager/base/file_util.h" +#include "packager/media/base/buffer_writer.h" +#include "packager/media/base/media_stream.h" +#include "packager/media/base/muxer_options.h" +#include "packager/media/file/file.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/single_segment_segmenter.h b/packager/media/formats/mp4/single_segment_segmenter.h index 9bbc4c890a..0d5b0abe47 100644 --- a/packager/media/formats/mp4/single_segment_segmenter.h +++ b/packager/media/formats/mp4/single_segment_segmenter.h @@ -7,8 +7,8 @@ #ifndef MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_ #define MEDIA_FORMATS_MP4_SINGLE_SEGMENT_SEGMENTER_H_ -#include "media/file/file_closer.h" -#include "media/formats/mp4/segmenter.h" +#include "packager/media/file/file_closer.h" +#include "packager/media/formats/mp4/segmenter.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/sync_sample_iterator.cc b/packager/media/formats/mp4/sync_sample_iterator.cc index 17f92c3ce1..120de0a1b5 100644 --- a/packager/media/formats/mp4/sync_sample_iterator.cc +++ b/packager/media/formats/mp4/sync_sample_iterator.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 "media/formats/mp4/sync_sample_iterator.h" +#include "packager/media/formats/mp4/sync_sample_iterator.h" #include diff --git a/packager/media/formats/mp4/sync_sample_iterator.h b/packager/media/formats/mp4/sync_sample_iterator.h index 2ff039238a..c23ab0ba55 100644 --- a/packager/media/formats/mp4/sync_sample_iterator.h +++ b/packager/media/formats/mp4/sync_sample_iterator.h @@ -11,8 +11,8 @@ #include -#include "base/macros.h" -#include "media/formats/mp4/box_definitions.h" +#include "packager/base/macros.h" +#include "packager/media/formats/mp4/box_definitions.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/sync_sample_iterator_unittest.cc b/packager/media/formats/mp4/sync_sample_iterator_unittest.cc index e78127ce38..673610264f 100644 --- a/packager/media/formats/mp4/sync_sample_iterator_unittest.cc +++ b/packager/media/formats/mp4/sync_sample_iterator_unittest.cc @@ -6,7 +6,7 @@ #include -#include "media/formats/mp4/sync_sample_iterator.h" +#include "packager/media/formats/mp4/sync_sample_iterator.h" namespace { const uint32_t kNumSamples = 100; diff --git a/packager/media/formats/mp4/track_run_iterator.cc b/packager/media/formats/mp4/track_run_iterator.cc index d3986b36c7..30fd875394 100644 --- a/packager/media/formats/mp4/track_run_iterator.cc +++ b/packager/media/formats/mp4/track_run_iterator.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mp4/track_run_iterator.h" +#include "packager/media/formats/mp4/track_run_iterator.h" #include #include -#include "media/base/buffer_reader.h" -#include "media/formats/mp4/chunk_info_iterator.h" -#include "media/formats/mp4/composition_offset_iterator.h" -#include "media/formats/mp4/decoding_time_iterator.h" -#include "media/formats/mp4/rcheck.h" -#include "media/formats/mp4/sync_sample_iterator.h" +#include "packager/media/base/buffer_reader.h" +#include "packager/media/formats/mp4/chunk_info_iterator.h" +#include "packager/media/formats/mp4/composition_offset_iterator.h" +#include "packager/media/formats/mp4/decoding_time_iterator.h" +#include "packager/media/formats/mp4/rcheck.h" +#include "packager/media/formats/mp4/sync_sample_iterator.h" namespace { const int64_t kInvalidOffset = std::numeric_limits::max(); diff --git a/packager/media/formats/mp4/track_run_iterator.h b/packager/media/formats/mp4/track_run_iterator.h index 68f8081105..64383a5fbf 100644 --- a/packager/media/formats/mp4/track_run_iterator.h +++ b/packager/media/formats/mp4/track_run_iterator.h @@ -7,9 +7,9 @@ #include -#include "base/memory/scoped_ptr.h" -#include "media/formats/mp4/box_definitions.h" -#include "media/formats/mp4/cenc.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/cenc.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/mp4/track_run_iterator_unittest.cc b/packager/media/formats/mp4/track_run_iterator_unittest.cc index 354e9b7e61..68d9468c1b 100644 --- a/packager/media/formats/mp4/track_run_iterator_unittest.cc +++ b/packager/media/formats/mp4/track_run_iterator_unittest.cc @@ -5,11 +5,11 @@ #include #include -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "media/formats/mp4/box_definitions.h" -#include "media/formats/mp4/rcheck.h" -#include "media/formats/mp4/track_run_iterator.h" +#include "packager/base/logging.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/formats/mp4/box_definitions.h" +#include "packager/media/formats/mp4/rcheck.h" +#include "packager/media/formats/mp4/track_run_iterator.h" // The sum of the elements in a vector initialized with SumAscending, // less the value of the last element. diff --git a/packager/media/formats/mpeg/adts_constants.cc b/packager/media/formats/mpeg/adts_constants.cc index 9fce78f4ae..d1b816b07f 100644 --- a/packager/media/formats/mpeg/adts_constants.cc +++ b/packager/media/formats/mpeg/adts_constants.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/mpeg/adts_constants.h" +#include "packager/media/formats/mpeg/adts_constants.h" -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/wvm/wvm_media_parser.cc b/packager/media/formats/wvm/wvm_media_parser.cc index 04d495843d..1ec80d42f3 100644 --- a/packager/media/formats/wvm/wvm_media_parser.cc +++ b/packager/media/formats/wvm/wvm_media_parser.cc @@ -2,16 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/formats/wvm/wvm_media_parser.h" +#include "packager/media/formats/wvm/wvm_media_parser.h" #include #include #include -#include "base/strings/string_number_conversions.h" -#include "media/base/status.h" -#include "media/base/widevine_key_source.h" -#include "media/formats/mp2t/adts_header.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/media/base/audio_stream_info.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/status.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/media/base/widevine_key_source.h" +#include "packager/media/formats/mp2t/adts_header.h" #define HAS_HEADER_EXTENSION(x) ((x != 0xBC) && (x != 0xBE) && (x != 0xBF) \ && (x != 0xF0) && (x != 0xF2) && (x != 0xF8) \ @@ -44,7 +47,7 @@ namespace { const int kAdtsHeaderMinSize = 7; const uint8_t kAacSampleSizeBits = 16; // Applies to all video streams. - const uint8 kNaluLengthSize = 4; // unit is bytes. + 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; @@ -482,8 +485,9 @@ bool WvmMediaParser::Parse(const uint8_t* buf, int size) { bool WvmMediaParser::EmitLastSample(uint32_t stream_id, scoped_refptr& new_sample) { - std::string key = base::UintToString(current_program_id_).append(":") - .append(base::UintToString(stream_id)); + std::string key = base::UintToString(current_program_id_) + .append(":") + .append(base::UintToString(stream_id)); std::map::iterator it = program_demux_stream_map_.find(key); if (it != program_demux_stream_map_.end()) { @@ -709,10 +713,9 @@ bool WvmMediaParser::ParseIndexEntry() { stream_id_count_, time_scale, track_duration, video_codec, video_codec_string, std::string(), video_width, video_height, nalu_length_size, NULL, 0, true)); - program_demux_stream_map_[base::UintToString(index_program_id_) - + ":" - + base::UintToString(video_pes_stream_id)] - = stream_id_count_++; + program_demux_stream_map_[base::UintToString(index_program_id_) + ":" + + base::UintToString(video_pes_stream_id)] = + stream_id_count_++; } if (has_audio) { AudioCodec audio_codec = kCodecAAC; @@ -720,10 +723,9 @@ bool WvmMediaParser::ParseIndexEntry() { stream_id_count_, time_scale, track_duration, audio_codec, audio_codec_string, std::string(), kAacSampleSizeBits, num_channels, sampling_frequency, NULL, 0, true)); - program_demux_stream_map_[base::UintToString(index_program_id_) - + ":" - + base::UintToString(audio_pes_stream_id)] - = stream_id_count_++; + program_demux_stream_map_[base::UintToString(index_program_id_) + ":" + + base::UintToString(audio_pes_stream_id)] = + stream_id_count_++; } } return true; @@ -783,9 +785,8 @@ bool WvmMediaParser::Output() { } else if ((prev_pes_stream_id_ & kPesStreamIdAudioMask) == kPesStreamIdAudio) { // Set data on the audio stream from AdtsHeader. - int frame_size = - media::mp2t::AdtsHeader::GetAdtsFrameSize(&sample_data_[0], - kAdtsHeaderMinSize); + int frame_size = media::mp2t::AdtsHeader::GetAdtsFrameSize( + &sample_data_[0], kAdtsHeaderMinSize); media::mp2t::AdtsHeader adts_header; const uint8_t* frame_ptr = &sample_data_[0]; std::vector extra_data; @@ -913,7 +914,7 @@ void WvmMediaParser::EmitSample(uint32_t parsed_audio_or_video_stream_id, } bool WvmMediaParser::GetAssetKey(const uint32_t asset_id, - EncryptionKey* encryption_key) { + EncryptionKey* encryption_key) { Status status = decryption_key_source_->FetchKeys(asset_id); if (!status.ok()) { LOG(ERROR) << "Fetch Key(s) failed for AssetID = " << asset_id diff --git a/packager/media/formats/wvm/wvm_media_parser.h b/packager/media/formats/wvm/wvm_media_parser.h index e6b24ba13d..29bf7c941a 100644 --- a/packager/media/formats/wvm/wvm_media_parser.h +++ b/packager/media/formats/wvm/wvm_media_parser.h @@ -13,14 +13,11 @@ #include #include -#include "base/memory/scoped_ptr.h" -#include "media/base/aes_encryptor.h" -#include "media/base/audio_stream_info.h" -#include "media/base/media_parser.h" -#include "media/base/media_sample.h" -#include "media/base/network_util.h" -#include "media/base/video_stream_info.h" -#include "media/filters/h264_byte_to_unit_stream_converter.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/media/base/aes_encryptor.h" +#include "packager/media/base/media_parser.h" +#include "packager/media/base/network_util.h" +#include "packager/media/filters/h264_byte_to_unit_stream_converter.h" namespace edash_packager { namespace media { diff --git a/packager/media/formats/wvm/wvm_media_parser_unittest.cc b/packager/media/formats/wvm/wvm_media_parser_unittest.cc index 8d9fc2be3a..a7f466b723 100644 --- a/packager/media/formats/wvm/wvm_media_parser_unittest.cc +++ b/packager/media/formats/wvm/wvm_media_parser_unittest.cc @@ -7,18 +7,18 @@ #include #include -#include "base/bind.h" -#include "base/bind_helpers.h" -#include "base/logging.h" -#include "base/memory/ref_counted.h" -#include "media/base/media_sample.h" -#include "media/base/request_signer.h" -#include "media/base/stream_info.h" -#include "media/base/timestamp.h" -#include "media/base/video_stream_info.h" -#include "media/base/widevine_key_source.h" -#include "media/formats/wvm/wvm_media_parser.h" -#include "media/test/test_data_util.h" +#include "packager/base/bind.h" +#include "packager/base/bind_helpers.h" +#include "packager/base/logging.h" +#include "packager/base/memory/ref_counted.h" +#include "packager/media/base/media_sample.h" +#include "packager/media/base/request_signer.h" +#include "packager/media/base/stream_info.h" +#include "packager/media/base/timestamp.h" +#include "packager/media/base/video_stream_info.h" +#include "packager/media/base/widevine_key_source.h" +#include "packager/media/formats/wvm/wvm_media_parser.h" +#include "packager/media/test/test_data_util.h" namespace { const char kWvmFile[] = "hb2_4stream_encrypted.wvm"; diff --git a/packager/media/test/packager_test.cc b/packager/media/test/packager_test.cc index be8e6df302..198436c4a2 100644 --- a/packager/media/test/packager_test.cc +++ b/packager/media/test/packager_test.cc @@ -6,18 +6,18 @@ #include -#include "base/file_util.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" -#include "base/time/clock.h" -#include "media/base/demuxer.h" -#include "media/base/key_source.h" -#include "media/base/media_stream.h" -#include "media/base/muxer.h" -#include "media/base/status_test_util.h" -#include "media/base/stream_info.h" -#include "media/formats/mp4/mp4_muxer.h" -#include "media/test/test_data_util.h" +#include "packager/base/file_util.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/base/time/clock.h" +#include "packager/media/base/demuxer.h" +#include "packager/media/base/key_source.h" +#include "packager/media/base/media_stream.h" +#include "packager/media/base/muxer.h" +#include "packager/media/base/status_test_util.h" +#include "packager/media/base/stream_info.h" +#include "packager/media/formats/mp4/mp4_muxer.h" +#include "packager/media/test/test_data_util.h" using ::testing::ValuesIn; diff --git a/packager/media/test/run_tests_with_atexit_manager.cc b/packager/media/test/run_tests_with_atexit_manager.cc index 4917828394..a39f5835fd 100644 --- a/packager/media/test/run_tests_with_atexit_manager.cc +++ b/packager/media/test/run_tests_with_atexit_manager.cc @@ -6,9 +6,9 @@ #include -#include "base/at_exit.h" -#include "base/command_line.h" -#include "base/logging.h" +#include "packager/base/at_exit.h" +#include "packager/base/command_line.h" +#include "packager/base/logging.h" int main(int argc, char **argv) { ::testing::InitGoogleTest(&argc, argv); diff --git a/packager/media/test/test_data_util.cc b/packager/media/test/test_data_util.cc index eaa1b0a4e1..9fe4e4ebbd 100644 --- a/packager/media/test/test_data_util.cc +++ b/packager/media/test/test_data_util.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/test/test_data_util.h" +#include "packager/media/test/test_data_util.h" -#include "base/file_util.h" -#include "base/logging.h" -#include "base/path_service.h" +#include "packager/base/file_util.h" +#include "packager/base/logging.h" +#include "packager/base/path_service.h" namespace edash_packager { namespace media { diff --git a/packager/media/test/test_data_util.h b/packager/media/test/test_data_util.h index 94784882ed..cce28d1cce 100644 --- a/packager/media/test/test_data_util.h +++ b/packager/media/test/test_data_util.h @@ -9,7 +9,7 @@ #include -#include "base/files/file_path.h" +#include "packager/base/files/file_path.h" namespace edash_packager { namespace media { diff --git a/packager/mpd/base/bandwidth_estimator.cc b/packager/mpd/base/bandwidth_estimator.cc index 14c9b397e3..1f8d6fd37d 100644 --- a/packager/mpd/base/bandwidth_estimator.cc +++ b/packager/mpd/base/bandwidth_estimator.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "mpd/base/bandwidth_estimator.h" +#include "packager/mpd/base/bandwidth_estimator.h" #include #include -#include "base/logging.h" +#include "packager/base/logging.h" const int BandwidthEstimator::kUseAllBlocks = 0; diff --git a/packager/mpd/base/bandwidth_estimator_test.cc b/packager/mpd/base/bandwidth_estimator_test.cc index aa1daae125..79c93dbcd6 100644 --- a/packager/mpd/base/bandwidth_estimator_test.cc +++ b/packager/mpd/base/bandwidth_estimator_test.cc @@ -8,8 +8,8 @@ #include -#include "base/macros.h" -#include "mpd/base/bandwidth_estimator.h" +#include "packager/base/macros.h" +#include "packager/mpd/base/bandwidth_estimator.h" namespace edash_packager { diff --git a/packager/mpd/base/content_protection_element.cc b/packager/mpd/base/content_protection_element.cc index 677f6d48d4..57e100037e 100644 --- a/packager/mpd/base/content_protection_element.cc +++ b/packager/mpd/base/content_protection_element.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 "mpd/base/content_protection_element.h" +#include "packager/mpd/base/content_protection_element.h" namespace edash_packager { ContentProtectionElement::ContentProtectionElement() {} diff --git a/packager/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc index d191cc23e1..a78b5f9c08 100644 --- a/packager/mpd/base/mpd_builder.cc +++ b/packager/mpd/base/mpd_builder.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 "mpd/base/mpd_builder.h" +#include "packager/mpd/base/mpd_builder.h" #include #include @@ -13,15 +13,15 @@ #include #include -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/stringprintf.h" -#include "base/time/time.h" -#include "media/file/file.h" -#include "mpd/base/content_protection_element.h" -#include "mpd/base/mpd_utils.h" -#include "mpd/base/xml/xml_node.h" +#include "packager/base/logging.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/base/time/time.h" +#include "packager/media/file/file.h" +#include "packager/mpd/base/content_protection_element.h" +#include "packager/mpd/base/mpd_utils.h" +#include "packager/mpd/base/xml/xml_node.h" namespace edash_packager { diff --git a/packager/mpd/base/mpd_builder.h b/packager/mpd/base/mpd_builder.h index 95547b3211..6df66d89b4 100644 --- a/packager/mpd/base/mpd_builder.h +++ b/packager/mpd/base/mpd_builder.h @@ -15,16 +15,16 @@ #include #include -#include "base/atomic_sequence_num.h" -#include "base/gtest_prod_util.h" -#include "base/stl_util.h" -#include "base/synchronization/lock.h" -#include "mpd/base/bandwidth_estimator.h" -#include "mpd/base/content_protection_element.h" -#include "mpd/base/media_info.pb.h" -#include "mpd/base/mpd_utils.h" -#include "mpd/base/segment_info.h" -#include "mpd/base/xml/scoped_xml_ptr.h" +#include "packager/base/atomic_sequence_num.h" +#include "packager/base/gtest_prod_util.h" +#include "packager/base/stl_util.h" +#include "packager/base/synchronization/lock.h" +#include "packager/mpd/base/bandwidth_estimator.h" +#include "packager/mpd/base/content_protection_element.h" +#include "packager/mpd/base/media_info.pb.h" +#include "packager/mpd/base/mpd_utils.h" +#include "packager/mpd/base/segment_info.h" +#include "packager/mpd/base/xml/scoped_xml_ptr.h" // TODO(rkuroiwa): For classes with |id_|, consider removing the field and let // the MPD (XML) generation functions take care of assigning an ID to each diff --git a/packager/mpd/base/mpd_builder_unittest.cc b/packager/mpd/base/mpd_builder_unittest.cc index 42bb3df3bf..ea4715cadb 100644 --- a/packager/mpd/base/mpd_builder_unittest.cc +++ b/packager/mpd/base/mpd_builder_unittest.cc @@ -8,16 +8,16 @@ #include #include -#include "base/file_util.h" -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_util.h" -#include "base/strings/stringprintf.h" -#include "media/file/file.h" -#include "mpd/base/mpd_builder.h" -#include "mpd/base/mpd_utils.h" -#include "mpd/test/mpd_builder_test_helper.h" -#include "mpd/test/xml_compare.h" +#include "packager/base/file_util.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/base/strings/string_util.h" +#include "packager/base/strings/stringprintf.h" +#include "packager/media/file/file.h" +#include "packager/mpd/base/mpd_builder.h" +#include "packager/mpd/base/mpd_utils.h" +#include "packager/mpd/test/mpd_builder_test_helper.h" +#include "packager/mpd/test/xml_compare.h" namespace edash_packager { diff --git a/packager/mpd/base/mpd_utils.cc b/packager/mpd/base/mpd_utils.cc index abcde81de8..ab2b3a71ca 100644 --- a/packager/mpd/base/mpd_utils.cc +++ b/packager/mpd/base/mpd_utils.cc @@ -4,15 +4,15 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "mpd/base/mpd_utils.h" +#include "packager/mpd/base/mpd_utils.h" #include -#include "base/logging.h" -#include "base/strings/string_number_conversions.h" -#include "mpd/base/content_protection_element.h" -#include "mpd/base/media_info.pb.h" -#include "mpd/base/xml/scoped_xml_ptr.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/mpd/base/content_protection_element.h" +#include "packager/mpd/base/media_info.pb.h" +#include "packager/mpd/base/xml/scoped_xml_ptr.h" namespace { diff --git a/packager/mpd/base/simple_mpd_notifier.cc b/packager/mpd/base/simple_mpd_notifier.cc index bfe21e2687..10ca3969ae 100644 --- a/packager/mpd/base/simple_mpd_notifier.cc +++ b/packager/mpd/base/simple_mpd_notifier.cc @@ -4,12 +4,12 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "mpd/base/simple_mpd_notifier.h" +#include "packager/mpd/base/simple_mpd_notifier.h" -#include "base/logging.h" -#include "media/file/file.h" -#include "mpd/base/mpd_builder.h" -#include "mpd/base/mpd_utils.h" +#include "packager/base/logging.h" +#include "packager/media/file/file.h" +#include "packager/mpd/base/mpd_builder.h" +#include "packager/mpd/base/mpd_utils.h" using edash_packager::media::File; diff --git a/packager/mpd/base/simple_mpd_notifier.h b/packager/mpd/base/simple_mpd_notifier.h index 6818e60095..3143ab8b04 100644 --- a/packager/mpd/base/simple_mpd_notifier.h +++ b/packager/mpd/base/simple_mpd_notifier.h @@ -11,9 +11,9 @@ #include #include -#include "base/memory/scoped_ptr.h" -#include "base/synchronization/lock.h" -#include "mpd/base/mpd_notifier.h" +#include "packager/base/memory/scoped_ptr.h" +#include "packager/base/synchronization/lock.h" +#include "packager/mpd/base/mpd_notifier.h" namespace edash_packager { diff --git a/packager/mpd/base/simple_vod_mpd_notifier.cc b/packager/mpd/base/simple_vod_mpd_notifier.cc index a1fcbd78ba..19660ec6ee 100644 --- a/packager/mpd/base/simple_vod_mpd_notifier.cc +++ b/packager/mpd/base/simple_vod_mpd_notifier.cc @@ -4,11 +4,11 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "mpd/base/simple_vod_mpd_notifier.h" +#include "packager/mpd/base/simple_vod_mpd_notifier.h" -#include "base/stl_util.h" -#include "mpd/base/content_protection_element.h" -#include "mpd/base/media_info.pb.h" +#include "packager/base/stl_util.h" +#include "packager/mpd/base/content_protection_element.h" +#include "packager/mpd/base/media_info.pb.h" namespace edash_packager { diff --git a/packager/mpd/base/simple_vod_mpd_notifier.h b/packager/mpd/base/simple_vod_mpd_notifier.h index 71d45faa6e..58f93de56e 100644 --- a/packager/mpd/base/simple_vod_mpd_notifier.h +++ b/packager/mpd/base/simple_vod_mpd_notifier.h @@ -10,9 +10,9 @@ #ifndef MPD_BASE_SIMPLE_MPD_NOTIFIER_H_ #define MPD_BASE_SIMPLE_MPD_NOTIFIER_H_ -#include "mpd/base/mpd_notifier.h" +#include "packager/mpd/base/mpd_notifier.h" -#include "mpd/base/mpd_builder.h" +#include "packager/mpd/base/mpd_builder.h" namespace edash_packager { diff --git a/packager/mpd/base/xml/scoped_xml_ptr.h b/packager/mpd/base/xml/scoped_xml_ptr.h index d47572b496..931373ba32 100644 --- a/packager/mpd/base/xml/scoped_xml_ptr.h +++ b/packager/mpd/base/xml/scoped_xml_ptr.h @@ -13,7 +13,7 @@ #include #include -#include "base/memory/scoped_ptr.h" +#include "packager/base/memory/scoped_ptr.h" namespace edash_packager { namespace xml { diff --git a/packager/mpd/base/xml/xml_node.cc b/packager/mpd/base/xml/xml_node.cc index 342418a4be..e5e3b5241a 100644 --- a/packager/mpd/base/xml/xml_node.cc +++ b/packager/mpd/base/xml/xml_node.cc @@ -4,16 +4,16 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "mpd/base/xml/xml_node.h" +#include "packager/mpd/base/xml/xml_node.h" #include #include -#include "base/logging.h" -#include "base/stl_util.h" -#include "base/strings/string_number_conversions.h" -#include "mpd/base/media_info.pb.h" -#include "mpd/base/segment_info.h" +#include "packager/base/logging.h" +#include "packager/base/stl_util.h" +#include "packager/base/strings/string_number_conversions.h" +#include "packager/mpd/base/media_info.pb.h" +#include "packager/mpd/base/segment_info.h" using edash_packager::xml::XmlNode; diff --git a/packager/mpd/base/xml/xml_node.h b/packager/mpd/base/xml/xml_node.h index 4db9f96285..ad4bb16858 100644 --- a/packager/mpd/base/xml/xml_node.h +++ b/packager/mpd/base/xml/xml_node.h @@ -15,9 +15,9 @@ #include -#include "mpd/base/content_protection_element.h" -#include "mpd/base/media_info.pb.h" -#include "mpd/base/xml/scoped_xml_ptr.h" +#include "packager/mpd/base/content_protection_element.h" +#include "packager/mpd/base/media_info.pb.h" +#include "packager/mpd/base/xml/scoped_xml_ptr.h" namespace edash_packager { diff --git a/packager/mpd/base/xml/xml_node_unittest.cc b/packager/mpd/base/xml/xml_node_unittest.cc index 2c0af11933..d44a386177 100644 --- a/packager/mpd/base/xml/xml_node_unittest.cc +++ b/packager/mpd/base/xml/xml_node_unittest.cc @@ -9,11 +9,11 @@ #include -#include "base/logging.h" -#include "base/strings/string_util.h" -#include "mpd/base/mpd_builder.h" -#include "mpd/base/xml/xml_node.h" -#include "mpd/test/xml_compare.h" +#include "packager/base/logging.h" +#include "packager/base/strings/string_util.h" +#include "packager/mpd/base/mpd_builder.h" +#include "packager/mpd/base/xml/xml_node.h" +#include "packager/mpd/test/xml_compare.h" namespace edash_packager { namespace xml { diff --git a/packager/mpd/mpd.gyp b/packager/mpd/mpd.gyp index b2e43a72df..2ac813712b 100644 --- a/packager/mpd/mpd.gyp +++ b/packager/mpd/mpd.gyp @@ -20,7 +20,7 @@ ], 'variables': { 'proto_in_dir': 'base', - 'proto_out_dir': 'mpd/base', + 'proto_out_dir': 'packager/mpd/base', }, 'includes': ['../build/protoc.gypi'], 'dependencies': [ diff --git a/packager/mpd/test/mpd_builder_test_helper.cc b/packager/mpd/test/mpd_builder_test_helper.cc index 80b7bf3f4b..39b65c3597 100644 --- a/packager/mpd/test/mpd_builder_test_helper.cc +++ b/packager/mpd/test/mpd_builder_test_helper.cc @@ -4,17 +4,17 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "mpd/test/mpd_builder_test_helper.h" +#include "packager/mpd/test/mpd_builder_test_helper.h" #include #include -#include "base/file_util.h" -#include "base/path_service.h" -#include "mpd/base/media_info.pb.h" -#include "mpd/base/mpd_builder.h" -#include "mpd/base/xml/scoped_xml_ptr.h" -#include "mpd/test/xml_compare.h" +#include "packager/base/file_util.h" +#include "packager/base/path_service.h" +#include "packager/mpd/base/media_info.pb.h" +#include "packager/mpd/base/mpd_builder.h" +#include "packager/mpd/base/xml/scoped_xml_ptr.h" +#include "packager/mpd/test/xml_compare.h" namespace edash_packager { diff --git a/packager/mpd/test/xml_compare.cc b/packager/mpd/test/xml_compare.cc index b42fdce4dd..f916f95250 100644 --- a/packager/mpd/test/xml_compare.cc +++ b/packager/mpd/test/xml_compare.cc @@ -1,4 +1,4 @@ -#include "mpd/test/xml_compare.h" +#include "packager/mpd/test/xml_compare.h" #include @@ -7,8 +7,8 @@ #include #include -#include "base/logging.h" -#include "mpd/base/xml/scoped_xml_ptr.h" +#include "packager/base/logging.h" +#include "packager/mpd/base/xml/scoped_xml_ptr.h" namespace edash_packager { diff --git a/packager/mpd/util/mpd_writer.cc b/packager/mpd/util/mpd_writer.cc index 12773762ec..4172f0bf2a 100644 --- a/packager/mpd/util/mpd_writer.cc +++ b/packager/mpd/util/mpd_writer.cc @@ -4,13 +4,13 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd -#include "mpd/util/mpd_writer.h" +#include "packager/mpd/util/mpd_writer.h" #include #include -#include "media/file/file.h" -#include "mpd/base/mpd_builder.h" +#include "packager/media/file/file.h" +#include "packager/mpd/base/mpd_builder.h" using edash_packager::media::File; diff --git a/packager/mpd/util/mpd_writer.h b/packager/mpd/util/mpd_writer.h index ed9b16a665..26e4c1156d 100644 --- a/packager/mpd/util/mpd_writer.h +++ b/packager/mpd/util/mpd_writer.h @@ -12,7 +12,7 @@ #include #include -#include "base/macros.h" +#include "packager/base/macros.h" namespace edash_packager { namespace media { diff --git a/packager/mpd/util/mpd_writer_unittest.cc b/packager/mpd/util/mpd_writer_unittest.cc index aa5c4a56f0..7cfe24cbcc 100644 --- a/packager/mpd/util/mpd_writer_unittest.cc +++ b/packager/mpd/util/mpd_writer_unittest.cc @@ -6,10 +6,10 @@ #include -#include "base/file_util.h" -#include "base/path_service.h" -#include "mpd/test/mpd_builder_test_helper.h" -#include "mpd/util/mpd_writer.h" +#include "packager/base/file_util.h" +#include "packager/base/path_service.h" +#include "packager/mpd/test/mpd_builder_test_helper.h" +#include "packager/mpd/util/mpd_writer.h" namespace edash_packager {