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

style: cleanup unused includes and use consistent <> for external code (#1267)

This commit is contained in:
Cosmin Stejerean 2023-10-09 16:21:41 -07:00 committed by GitHub
parent 72117f85ad
commit 1337e86597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
159 changed files with 234 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packager/app/crypto_flags.cc
View File

@ -7,7 +7,7 @@
#include "packager/app/crypto_flags.h" #include "packager/app/crypto_flags.h"
#include <absl/flags/flag.h> #include <absl/flags/flag.h>
#include <stdio.h> #include <cstdio>
ABSL_FLAG(std::string, ABSL_FLAG(std::string,
protection_scheme, protection_scheme,

2
packager/app/job_manager.h
View File

@ -13,7 +13,7 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include "absl/synchronization/mutex.h" #include <absl/synchronization/mutex.h>
#include "packager/status/status.h" #include "packager/status/status.h"
namespace shaka { namespace shaka {

6
packager/app/mpd_generator.cc
View File

@ -6,12 +6,12 @@
#include <iostream> #include <iostream>
#include <absl/flags/parse.h>
#include <absl/flags/usage.h>
#include <absl/flags/usage_config.h>
#include <absl/strings/str_format.h> #include <absl/strings/str_format.h>
#include <absl/strings/str_split.h> #include <absl/strings/str_split.h>
#include <glog/logging.h> #include <glog/logging.h>
#include "absl/flags/parse.h"
#include "absl/flags/usage.h"
#include "absl/flags/usage_config.h"
#include "packager/app/mpd_generator_flags.h" #include "packager/app/mpd_generator_flags.h"
#include "packager/mpd/util/mpd_writer.h" #include "packager/mpd/util/mpd_writer.h"
#include "packager/tools/license_notice.h" #include "packager/tools/license_notice.h"

2
packager/app/muxer_factory.cc
View File

@ -6,9 +6,7 @@
#include "packager/app/muxer_factory.h" #include "packager/app/muxer_factory.h"
#include <chrono>
#include "packager/media/base/muxer.h" #include "packager/media/base/muxer.h"
#include "packager/media/base/muxer_options.h"
#include "packager/media/formats/mp2t/ts_muxer.h" #include "packager/media/formats/mp2t/ts_muxer.h"
#include "packager/media/formats/mp4/mp4_muxer.h" #include "packager/media/formats/mp4/mp4_muxer.h"
#include "packager/media/formats/packed_audio/packed_audio_writer.h" #include "packager/media/formats/packed_audio/packed_audio_writer.h"

6
packager/app/packager_main.cc
View File

@ -7,14 +7,14 @@
#include <absl/flags/flag.h> #include <absl/flags/flag.h>
#include <iostream> #include <iostream>
#include <absl/flags/parse.h>
#include <absl/flags/usage.h>
#include <absl/flags/usage_config.h>
#include <absl/strings/numbers.h> #include <absl/strings/numbers.h>
#include <absl/strings/str_format.h> #include <absl/strings/str_format.h>
#include <absl/strings/str_split.h> #include <absl/strings/str_split.h>
#include <glog/logging.h> #include <glog/logging.h>
#include <optional> #include <optional>
#include "absl/flags/parse.h"
#include "absl/flags/usage.h"
#include "absl/flags/usage_config.h"
#include "packager/app/ad_cue_generator_flags.h" #include "packager/app/ad_cue_generator_flags.h"
#include "packager/app/crypto_flags.h" #include "packager/app/crypto_flags.h"
#include "packager/app/hls_flags.h" #include "packager/app/hls_flags.h"

3
packager/app/packager_util.cc
View File

@ -6,8 +6,6 @@
#include "packager/app/packager_util.h" #include "packager/app/packager_util.h"
#include <absl/strings/numbers.h>
#include <absl/strings/str_split.h>
#include <glog/logging.h> #include <glog/logging.h>
#include "packager/file/file.h" #include "packager/file/file.h"
#include "packager/media/base/media_handler.h" #include "packager/media/base/media_handler.h"
@ -17,7 +15,6 @@
#include "packager/media/base/request_signer.h" #include "packager/media/base/request_signer.h"
#include "packager/media/base/widevine_key_source.h" #include "packager/media/base/widevine_key_source.h"
#include "packager/mpd/base/mpd_options.h" #include "packager/mpd/base/mpd_options.h"
#include "packager/status/status.h"
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/app/retired_flags.cc
View File

@ -9,7 +9,7 @@
#include "packager/app/retired_flags.h" #include "packager/app/retired_flags.h"
#include <stdio.h> #include <cstdio>
ABSL_FLAG(std::string, profile, "", "This flag is deprecated. Do not use."); ABSL_FLAG(std::string, profile, "", "This flag is deprecated. Do not use.");
ABSL_FLAG(bool, single_segment, true, "This flag is deprecated. Do not use."); ABSL_FLAG(bool, single_segment, true, "This flag is deprecated. Do not use.");

2
packager/app/validate_flag.cc
View File

@ -8,7 +8,7 @@
#include "packager/app/validate_flag.h" #include "packager/app/validate_flag.h"
#include <stdio.h> #include <cstdio>
namespace shaka { namespace shaka {

2
packager/app/vlog_flags.cc
View File

@ -7,7 +7,7 @@
// Defines verbose logging flags. // Defines verbose logging flags.
#include "packager/app/vlog_flags.h" #include "packager/app/vlog_flags.h"
#include "absl/strings/numbers.h" #include <absl/strings/numbers.h>
#include "packager/kv_pairs/kv_pairs.h" #include "packager/kv_pairs/kv_pairs.h"
ABSL_FLAG(int32_t, ABSL_FLAG(int32_t,

2
packager/app/widevine_encryption_flags.cc
View File

@ -11,11 +11,9 @@
#include <absl/flags/flag.h> #include <absl/flags/flag.h>
#include <absl/strings/ascii.h> #include <absl/strings/ascii.h>
#include <absl/strings/match.h> #include <absl/strings/match.h>
#include <absl/strings/str_format.h>
#include <glog/logging.h> #include <glog/logging.h>
#include <string_view> #include <string_view>
#include "packager/app/validate_flag.h" #include "packager/app/validate_flag.h"
#include "packager/utils/absl_flag_hexbytes.h"
ABSL_FLAG(bool, ABSL_FLAG(bool,
enable_widevine_encryption, enable_widevine_encryption,

2
packager/file/callback_file.cc
View File

@ -6,7 +6,7 @@
#include "packager/file/callback_file.h" #include "packager/file/callback_file.h"
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/macros.h" #include "packager/macros.h"
namespace shaka { namespace shaka {

8
packager/file/file.cc
View File

@ -12,10 +12,10 @@
#include <filesystem> #include <filesystem>
#include <memory> #include <memory>
#include "absl/flags/flag.h" #include <absl/flags/flag.h>
#include "absl/strings/numbers.h" #include <absl/strings/numbers.h>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/file/callback_file.h" #include "packager/file/callback_file.h"
#include "packager/file/file_util.h" #include "packager/file/file_util.h"

2
packager/file/file_closer.h
View File

@ -7,7 +7,7 @@
#ifndef MEDIA_FILE_FILE_CLOSER_H_ #ifndef MEDIA_FILE_FILE_CLOSER_H_
#define MEDIA_FILE_FILE_CLOSER_H_ #define MEDIA_FILE_FILE_CLOSER_H_
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/file/file.h" #include "packager/file/file.h"
namespace shaka { namespace shaka {

2
packager/file/file_test_util.cc
View File

@ -6,8 +6,6 @@
#include "packager/file/file_test_util.h" #include "packager/file/file_test_util.h"
#include <stdlib.h>
#include <filesystem> #include <filesystem>
namespace shaka { namespace shaka {

6
packager/file/file_unittest.cc
View File

@ -5,14 +5,12 @@
// https://developers.google.com/open-source/licenses/bsd // https://developers.google.com/open-source/licenses/bsd
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <stdio.h> #include <cstdio>
#include <stdlib.h>
#include <sys/stat.h>
#include <filesystem> #include <filesystem>
#include <locale> #include <locale>
#include "absl/flags/declare.h" #include <absl/flags/declare.h>
#include "packager/file/file.h" #include "packager/file/file.h"
#include "packager/file/file_test_util.h" #include "packager/file/file_test_util.h"
#include "packager/flag_saver.h" #include "packager/flag_saver.h"

4
packager/file/file_util.cc
View File

@ -6,8 +6,6 @@
#include "packager/file/file_util.h" #include "packager/file/file_util.h"
#include <inttypes.h>
#if defined(OS_WIN) #if defined(OS_WIN)
#include <windows.h> #include <windows.h>
#else #else
@ -17,7 +15,7 @@
#include <filesystem> #include <filesystem>
#include <thread> #include <thread>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
namespace shaka { namespace shaka {
namespace { namespace {

2
packager/file/file_util_unittest.cc
View File

@ -8,7 +8,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {

10
packager/file/http_file.cc
View File

@ -8,11 +8,11 @@
#include <curl/curl.h> #include <curl/curl.h>
#include "absl/flags/declare.h" #include <absl/flags/declare.h>
#include "absl/flags/flag.h" #include <absl/flags/flag.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/file/thread_pool.h" #include "packager/file/thread_pool.h"
#include "packager/macros.h" #include "packager/macros.h"

2
packager/file/http_file.h
View File

@ -10,7 +10,7 @@
#include <memory> #include <memory>
#include <string> #include <string>
#include "absl/synchronization/notification.h" #include <absl/synchronization/notification.h>
#include "packager/file/file.h" #include "packager/file/file.h"
#include "packager/file/io_cache.h" #include "packager/file/io_cache.h"

4
packager/file/http_file_unittest.cc
View File

@ -11,8 +11,8 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "absl/strings/str_split.h" #include <absl/strings/str_split.h>
#include "nlohmann/json.hpp" #include <nlohmann/json.hpp>
#include "packager/file/file.h" #include "packager/file/file.h"
#include "packager/file/file_closer.h" #include "packager/file/file_closer.h"
#include "packager/media/test/test_web_server.h" #include "packager/media/test/test_web_server.h"

2
packager/file/io_cache.cc
View File

@ -10,7 +10,7 @@
#include <algorithm> #include <algorithm>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {

2
packager/file/io_cache.h
View File

@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include "absl/synchronization/mutex.h" #include <absl/synchronization/mutex.h>
#include "packager/macros.h" #include "packager/macros.h"
namespace shaka { namespace shaka {

4
packager/file/local_file.cc
View File

@ -6,7 +6,7 @@
#include "packager/file/local_file.h" #include "packager/file/local_file.h"
#include <stdio.h> #include <cstdio>
#if defined(OS_WIN) #if defined(OS_WIN)
#include <windows.h> #include <windows.h>
@ -16,7 +16,7 @@
#include <filesystem> #include <filesystem>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {

4
packager/file/memory_file.cc
View File

@ -13,8 +13,8 @@
#include <memory> #include <memory>
#include <set> #include <set>
#include "absl/synchronization/mutex.h" #include <absl/synchronization/mutex.h>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace { namespace {

4
packager/file/thread_pool.cc
View File

@ -8,8 +8,8 @@
#include <thread> #include <thread>
#include "absl/time/time.h" #include <absl/time/time.h>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {

4
packager/file/thread_pool.h
View File

@ -10,8 +10,8 @@
#include <functional> #include <functional>
#include <queue> #include <queue>
#include "absl/base/thread_annotations.h" #include <absl/base/thread_annotations.h>
#include "absl/synchronization/mutex.h" #include <absl/synchronization/mutex.h>
#include "packager/macros.h" #include "packager/macros.h"
namespace shaka { namespace shaka {

2
packager/file/threaded_io_file.h
View File

@ -10,7 +10,7 @@
#include <atomic> #include <atomic>
#include <memory> #include <memory>
#include "absl/synchronization/mutex.h" #include <absl/synchronization/mutex.h>
#include "packager/file/file.h" #include "packager/file/file.h"
#include "packager/file/file_closer.h" #include "packager/file/file_closer.h"
#include "packager/file/io_cache.h" #include "packager/file/io_cache.h"

2
packager/file/udp_file.cc
View File

@ -28,7 +28,7 @@
#include <limits> #include <limits>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/file/udp_options.h" #include "packager/file/udp_options.h"
namespace shaka { namespace shaka {

8
packager/file/udp_options.cc
View File

@ -8,10 +8,10 @@
#include <iterator> #include <iterator>
#include "absl/flags/flag.h" #include <absl/flags/flag.h>
#include "absl/strings/numbers.h" #include <absl/strings/numbers.h>
#include "absl/strings/str_split.h" #include <absl/strings/str_split.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/kv_pairs/kv_pairs.h" #include "packager/kv_pairs/kv_pairs.h"
#include "packager/macros.h" #include "packager/macros.h"

4
packager/file/udp_options_unittest.cc
View File

@ -8,8 +8,8 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "absl/flags/declare.h" #include <absl/flags/declare.h>
#include "absl/flags/flag.h" #include <absl/flags/flag.h>
#include "packager/flag_saver.h" #include "packager/flag_saver.h"
ABSL_DECLARE_FLAG(std::string, udp_interface_address); ABSL_DECLARE_FLAG(std::string, udp_interface_address);

2
packager/flag_saver.h
View File

@ -7,7 +7,7 @@
#ifndef PACKAGER_FLAG_SAVER_H_ #ifndef PACKAGER_FLAG_SAVER_H_
#define PACKAGER_FLAG_SAVER_H_ #define PACKAGER_FLAG_SAVER_H_
#include "absl/flags/flag.h" #include <absl/flags/flag.h>
namespace shaka { namespace shaka {

2
packager/kv_pairs/kv_pairs.cc
View File

@ -6,7 +6,7 @@
#include "packager/kv_pairs/kv_pairs.h" #include "packager/kv_pairs/kv_pairs.h"
#include "absl/strings/str_split.h" #include <absl/strings/str_split.h>
namespace shaka { namespace shaka {

4
packager/media/base/aes_cryptor.cc
View File

@ -9,8 +9,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "glog/logging.h" #include <glog/logging.h>
#include "mbedtls/entropy.h" #include <mbedtls/entropy.h>
namespace { namespace {

2
packager/media/base/aes_cryptor.h
View File

@ -11,7 +11,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "mbedtls/cipher.h" #include <mbedtls/cipher.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/media/base/fourccs.h" #include "packager/media/base/fourccs.h"

4
packager/media/base/aes_cryptor_unittest.cc
View File

@ -9,8 +9,8 @@
#include <iterator> #include <iterator>
#include <memory> #include <memory>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/aes_decryptor.h" #include "packager/media/base/aes_decryptor.h"
#include "packager/media/base/aes_encryptor.h" #include "packager/media/base/aes_encryptor.h"
#include "packager/utils/bytes_to_string_view.h" #include "packager/utils/bytes_to_string_view.h"

2
packager/media/base/aes_decryptor.cc
View File

@ -8,7 +8,7 @@
#include <algorithm> #include <algorithm>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/base/aes_encryptor.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/base/aes_encryptor.h" #include "packager/media/base/aes_encryptor.h"
#include "glog/logging.h" #include <glog/logging.h>
namespace { namespace {

2
packager/media/base/aes_pattern_cryptor.cc
View File

@ -8,7 +8,7 @@
#include <algorithm> #include <algorithm>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/base/aes_pattern_cryptor_unittest.cc
View File

@ -7,7 +7,7 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "packager/media/base/aes_pattern_cryptor.h" #include "packager/media/base/aes_pattern_cryptor.h"
#include "packager/media/base/mock_aes_cryptor.h" #include "packager/media/base/mock_aes_cryptor.h"

4
packager/media/base/audio_stream_info.cc
View File

@ -8,8 +8,8 @@
#include <inttypes.h> #include <inttypes.h>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/media/base/limits.h" #include "packager/media/base/limits.h"

2
packager/media/base/audio_timestamp_helper.cc
View File

@ -4,7 +4,7 @@
#include "packager/media/base/audio_timestamp_helper.h" #include "packager/media/base/audio_timestamp_helper.h"
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/timestamp.h" #include "packager/media/base/timestamp.h"
namespace shaka { namespace shaka {

2
packager/media/base/bit_reader.h
View File

@ -8,7 +8,7 @@
#include <stdint.h> #include <stdint.h>
#include <sys/types.h> #include <sys/types.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/macros.h" #include "packager/macros.h"
namespace shaka { namespace shaka {

2
packager/media/base/bit_writer.h
View File

@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/base/buffer_reader.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/base/buffer_reader.h" #include "packager/media/base/buffer_reader.h"
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

4
packager/media/base/buffer_writer.cc
View File

@ -6,8 +6,8 @@
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "absl/base/internal/endian.h" #include <absl/base/internal/endian.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/file/file.h" #include "packager/file/file.h"
namespace shaka { namespace shaka {

2
packager/media/base/buffer_writer_unittest.cc
View File

@ -10,7 +10,7 @@
#include <limits> #include <limits>
#include <memory> #include <memory>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/file/file.h" #include "packager/file/file.h"
#include "packager/file/file_test_util.h" #include "packager/file/file_test_util.h"
#include "packager/media/base/buffer_reader.h" #include "packager/media/base/buffer_reader.h"

2
packager/media/base/byte_queue.cc
View File

@ -4,7 +4,7 @@
#include "packager/media/base/byte_queue.h" #include "packager/media/base/byte_queue.h"
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/base/container_names.cc
View File

@ -13,7 +13,7 @@
#include <iterator> #include <iterator>
#include <limits> #include <limits>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/mpd/base/xml/scoped_xml_ptr.h" #include "packager/mpd/base/xml/scoped_xml_ptr.h"

2
packager/media/base/container_names_unittest.cc
View File

@ -4,10 +4,8 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <filesystem>
#include <iterator> #include <iterator>
#include "packager/macros.h"
#include "packager/media/base/container_names.h" #include "packager/media/base/container_names.h"
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"

2
packager/media/base/decrypt_config.cc
View File

@ -4,7 +4,7 @@
#include "packager/media/base/decrypt_config.h" #include "packager/media/base/decrypt_config.h"
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/base/decryptor_source.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/base/decryptor_source.h" #include "packager/media/base/decryptor_source.h"
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/aes_decryptor.h" #include "packager/media/base/aes_decryptor.h"
#include "packager/media/base/aes_pattern_cryptor.h" #include "packager/media/base/aes_pattern_cryptor.h"

2
packager/media/base/http_key_fetcher_unittest.cc
View File

@ -8,7 +8,7 @@
#include <algorithm> #include <algorithm>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/test/test_web_server.h" #include "packager/media/test/test_web_server.h"
#include "packager/status/status_test_util.h" #include "packager/status/status_test_util.h"

2
packager/media/base/id3_tag.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/base/id3_tag.h" #include "packager/media/base/id3_tag.h"
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/base/fourccs.h" #include "packager/media/base/fourccs.h"

2
packager/media/base/language_utils.cc
View File

@ -8,7 +8,7 @@
#include <iterator> #include <iterator>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/macros.h" #include "packager/macros.h"
namespace { namespace {

4
packager/media/base/media_handler_test_base.h
View File

@ -10,8 +10,8 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "absl/strings/numbers.h" #include <absl/strings/numbers.h>
#include "packager/media/base/media_handler.h" #include "packager/media/base/media_handler.h"
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "packager/utils/bytes_to_string_view.h" #include "packager/utils/bytes_to_string_view.h"

4
packager/media/base/media_sample.cc
View File

@ -8,8 +8,8 @@
#include <inttypes.h> #include <inttypes.h>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/base/media_sample.h
View File

@ -12,7 +12,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/decrypt_config.h" #include "packager/media/base/decrypt_config.h"
namespace shaka { namespace shaka {

8
packager/media/base/muxer_util.cc
View File

@ -11,10 +11,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "absl/strings/numbers.h" #include <absl/strings/numbers.h>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "absl/strings/str_split.h" #include <absl/strings/str_split.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
namespace shaka { namespace shaka {

2
packager/media/base/offset_byte_queue.cc
View File

@ -6,7 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

4
packager/media/base/playready_key_source.cc
View File

@ -9,8 +9,8 @@
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/base/http_key_fetcher.h" #include "packager/media/base/http_key_fetcher.h"
#include "packager/media/base/key_source.h" #include "packager/media/base/key_source.h"

6
packager/media/base/playready_pssh_generator.cc
View File

@ -11,9 +11,9 @@
#include <set> #include <set>
#include <vector> #include <vector>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "mbedtls/cipher.h" #include <mbedtls/cipher.h>
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/base/protection_system_ids.h" #include "packager/media/base/protection_system_ids.h"

6
packager/media/base/producer_consumer_queue.h
View File

@ -10,9 +10,9 @@
#include <chrono> #include <chrono>
#include <deque> #include <deque>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "absl/synchronization/mutex.h" #include <absl/synchronization/mutex.h>
#include "absl/time/time.h" #include <absl/time/time.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/status/status.h" #include "packager/status/status.h"

4
packager/media/base/producer_consumer_queue_unittest.cc
View File

@ -8,8 +8,8 @@
#include <thread> #include <thread>
#include "absl/synchronization/notification.h" #include <absl/synchronization/notification.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/producer_consumer_queue.h" #include "packager/media/base/producer_consumer_queue.h"
#include "packager/status/status_test_util.h" #include "packager/status/status_test_util.h"

2
packager/media/base/protection_system_specific_info.h
View File

@ -11,7 +11,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/public/crypto_params.h" #include "packager/media/public/crypto_params.h"
namespace shaka { namespace shaka {

2
packager/media/base/proto_json_util.cc
View File

@ -8,7 +8,7 @@
#include <google/protobuf/util/json_util.h> #include <google/protobuf/util/json_util.h>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

4
packager/media/base/raw_key_source.cc
View File

@ -8,8 +8,8 @@
#include <algorithm> #include <algorithm>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/key_source.h" #include "packager/media/base/key_source.h"
#include "packager/status/status_macros.h" #include "packager/status/status_macros.h"
#include "packager/utils/bytes_to_string_view.h" #include "packager/utils/bytes_to_string_view.h"

2
packager/media/base/raw_key_source_unittest.cc
View File

@ -7,7 +7,7 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "packager/media/base/raw_key_source.h" #include "packager/media/base/raw_key_source.h"
#include "packager/status/status_test_util.h" #include "packager/status/status_test_util.h"

2
packager/media/base/rcheck.h
View File

@ -5,7 +5,7 @@
#ifndef PACKAGER_MEDIA_BASE_RCHECK_H_ #ifndef PACKAGER_MEDIA_BASE_RCHECK_H_
#define PACKAGER_MEDIA_BASE_RCHECK_H_ #define PACKAGER_MEDIA_BASE_RCHECK_H_
#include "glog/logging.h" #include <glog/logging.h>
#define RCHECK(x) \ #define RCHECK(x) \
do { \ do { \

4
packager/media/base/request_signer.cc
View File

@ -6,8 +6,8 @@
#include "packager/media/base/request_signer.h" #include "packager/media/base/request_signer.h"
#include "glog/logging.h" #include <glog/logging.h>
#include "mbedtls/md.h" #include <mbedtls/md.h>
#include "packager/media/base/aes_encryptor.h" #include "packager/media/base/aes_encryptor.h"
#include "packager/media/base/rsa_key.h" #include "packager/media/base/rsa_key.h"

6
packager/media/base/rsa_key.cc
View File

@ -21,9 +21,9 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "glog/logging.h" #include <glog/logging.h>
#include "mbedtls/error.h" #include <mbedtls/error.h>
#include "mbedtls/md.h" #include <mbedtls/md.h>
namespace { namespace {

6
packager/media/base/rsa_key.h
View File

@ -12,9 +12,9 @@
#include <string> #include <string>
#include "mbedtls/ctr_drbg.h" #include <mbedtls/ctr_drbg.h>
#include "mbedtls/entropy.h" #include <mbedtls/entropy.h>
#include "mbedtls/pk.h" #include <mbedtls/pk.h>
#include "packager/macros.h" #include "packager/macros.h"
namespace shaka { namespace shaka {

2
packager/media/base/rsa_key_unittest.cc
View File

@ -10,7 +10,7 @@
#include <filesystem> #include <filesystem>
#include <memory> #include <memory>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/rsa_key.h" #include "packager/media/base/rsa_key.h"
#include "packager/media/base/test/rsa_test_data.h" #include "packager/media/base/test/rsa_test_data.h"
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"

4
packager/media/base/stream_info.cc
View File

@ -8,8 +8,8 @@
#include <inttypes.h> #include <inttypes.h>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/media/base/timestamp.h" #include "packager/media/base/timestamp.h"

2
packager/media/base/text_sample.cc
View File

@ -9,7 +9,7 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include "glog/logging.h" #include <glog/logging.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

2
packager/media/base/text_stream_info.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/base/text_stream_info.h" #include "packager/media/base/text_stream_info.h"
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
namespace shaka { namespace shaka {
namespace media { namespace media {

4
packager/media/base/video_stream_info.cc
View File

@ -6,8 +6,8 @@
#include "packager/media/base/video_stream_info.h" #include "packager/media/base/video_stream_info.h"
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/media/base/limits.h" #include "packager/media/base/limits.h"

6
packager/media/base/widevine_key_source.cc
View File

@ -9,9 +9,9 @@
#include <functional> #include <functional>
#include <iterator> #include <iterator>
#include "absl/base/internal/endian.h" #include <absl/base/internal/endian.h>
#include "absl/flags/flag.h" #include <absl/flags/flag.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "packager/media/base/http_key_fetcher.h" #include "packager/media/base/http_key_fetcher.h"
#include "packager/media/base/producer_consumer_queue.h" #include "packager/media/base/producer_consumer_queue.h"
#include "packager/media/base/protection_system_ids.h" #include "packager/media/base/protection_system_ids.h"

4
packager/media/base/widevine_key_source.h
View File

@ -11,8 +11,8 @@
#include <memory> #include <memory>
#include <thread> #include <thread>
#include "absl/synchronization/mutex.h" #include <absl/synchronization/mutex.h>
#include "absl/synchronization/notification.h" #include <absl/synchronization/notification.h>
#include "packager/media/base/fourccs.h" #include "packager/media/base/fourccs.h"
#include "packager/media/base/key_source.h" #include "packager/media/base/key_source.h"

4
packager/media/base/widevine_key_source_unittest.cc
View File

@ -11,8 +11,8 @@
#include <algorithm> #include <algorithm>
#include <iterator> #include <iterator>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "packager/media/base/key_fetcher.h" #include "packager/media/base/key_fetcher.h"
#include "packager/media/base/protection_system_ids.h" #include "packager/media/base/protection_system_ids.h"
#include "packager/media/base/request_signer.h" #include "packager/media/base/request_signer.h"

2
packager/media/chunking/chunking_handler.cc
View File

@ -8,7 +8,7 @@
#include <algorithm> #include <algorithm>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/media_sample.h" #include "packager/media/base/media_sample.h"
#include "packager/status/status_macros.h" #include "packager/status/status_macros.h"

2
packager/media/chunking/chunking_handler.h
View File

@ -11,7 +11,7 @@
#include <optional> #include <optional>
#include <queue> #include <queue>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/media_handler.h" #include "packager/media/base/media_handler.h"
#include "packager/media/public/chunking_params.h" #include "packager/media/public/chunking_params.h"

2
packager/media/chunking/sync_point_queue.h
View File

@ -7,7 +7,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include "absl/synchronization/mutex.h" #include <absl/synchronization/mutex.h>
#include "packager/media/public/ad_cue_generator_params.h" #include "packager/media/public/ad_cue_generator_params.h"
namespace shaka { namespace shaka {

2
packager/media/codecs/aac_audio_specific_config.cc
View File

@ -6,7 +6,7 @@
#include <algorithm> #include <algorithm>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"

2
packager/media/codecs/ac3_audio_util.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/codecs/ac3_audio_util.h" #include "packager/media/codecs/ac3_audio_util.h"
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"
#include "packager/utils/bytes_to_string_view.h" #include "packager/utils/bytes_to_string_view.h"

4
packager/media/codecs/ac4_audio_util.cc
View File

@ -6,8 +6,8 @@
#include "packager/media/codecs/ac4_audio_util.h" #include "packager/media/codecs/ac4_audio_util.h"
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"

2
packager/media/codecs/av1_codec_configuration_record.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/codecs/av1_codec_configuration_record.h" #include "packager/media/codecs/av1_codec_configuration_record.h"
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"

2
packager/media/codecs/av1_parser.cc
View File

@ -8,7 +8,7 @@
#include <algorithm> #include <algorithm>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"

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

@ -6,8 +6,8 @@
#include "packager/media/codecs/avc_decoder_configuration_record.h" #include "packager/media/codecs/avc_decoder_configuration_record.h"
#include "absl/strings/ascii.h" #include <absl/strings/ascii.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/media/base/buffer_reader.h" #include "packager/media/base/buffer_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"

2
packager/media/codecs/decoder_configuration_record.h
View File

@ -9,7 +9,7 @@
#include <vector> #include <vector>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/media/codecs/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"

2
packager/media/codecs/dovi_decoder_configuration_record.cc
View File

@ -6,7 +6,7 @@
#include "packager/media/codecs/dovi_decoder_configuration_record.h" #include "packager/media/codecs/dovi_decoder_configuration_record.h"
#include "absl/strings/str_format.h" #include <absl/strings/str_format.h>
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"

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

@ -6,7 +6,7 @@
#include "packager/media/codecs/ec3_audio_util.h" #include "packager/media/codecs/ec3_audio_util.h"
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "packager/macros.h" #include "packager/macros.h"
#include "packager/media/base/bit_reader.h" #include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"

2
packager/media/codecs/h264_byte_to_unit_stream_converter.cc
View File

@ -8,7 +8,7 @@
#include <limits> #include <limits>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/codecs/h264_parser.h" #include "packager/media/codecs/h264_parser.h"

3
packager/media/codecs/h264_byte_to_unit_stream_converter_unittest.cc
View File

@ -7,9 +7,8 @@
#include "packager/media/codecs/h264_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h264_byte_to_unit_stream_converter.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <stdio.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"
namespace { namespace {

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

@ -6,7 +6,7 @@
#include <memory> #include <memory>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/buffer_reader.h" #include "packager/media/base/buffer_reader.h"
#define LOG_ERROR_ONCE(msg) \ #define LOG_ERROR_ONCE(msg) \

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

@ -6,7 +6,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"
namespace shaka { namespace shaka {

2
packager/media/codecs/h265_byte_to_unit_stream_converter.cc
View File

@ -8,7 +8,7 @@
#include <limits> #include <limits>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/media/base/rcheck.h" #include "packager/media/base/rcheck.h"
#include "packager/media/codecs/h265_parser.h" #include "packager/media/codecs/h265_parser.h"

3
packager/media/codecs/h265_byte_to_unit_stream_converter_unittest.cc
View File

@ -7,9 +7,8 @@
#include "packager/media/codecs/h265_byte_to_unit_stream_converter.h" #include "packager/media/codecs/h265_byte_to_unit_stream_converter.h"
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <stdio.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "packager/media/codecs/hevc_decoder_configuration_record.h" #include "packager/media/codecs/hevc_decoder_configuration_record.h"
#include "packager/media/test/test_data_util.h" #include "packager/media/test/test_data_util.h"

2
packager/media/codecs/h265_parser.cc
View File

@ -10,7 +10,7 @@
#include <algorithm> #include <algorithm>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/macros.h" #include "packager/media/base/macros.h"
#include "packager/media/codecs/nalu_reader.h" #include "packager/media/codecs/nalu_reader.h"

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

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

6
packager/media/codecs/h26x_byte_to_unit_stream_converter.cc
View File

@ -8,9 +8,9 @@
#include <limits> #include <limits>
#include "absl/flags/flag.h" #include <absl/flags/flag.h>
#include "absl/strings/escaping.h" #include <absl/strings/escaping.h>
#include "glog/logging.h" #include <glog/logging.h>
#include "packager/media/base/buffer_writer.h" #include "packager/media/base/buffer_writer.h"
#include "packager/utils/bytes_to_string_view.h" #include "packager/utils/bytes_to_string_view.h"

Some files were not shown because too many files have changed in this diff Show More