From 740724f8cfe9e9a9b1ebd8cd1ff9fb1e0e45dfe1 Mon Sep 17 00:00:00 2001 From: Aaron Vaage Date: Tue, 19 Jun 2018 09:58:29 -0700 Subject: [PATCH] Run 'clang-format' over stream_info Ran 'clang-format' over stream_info.h and stream_info.cc so that later changes can focus on the actual changes and not the formatting. Change-Id: I8a75fe0f88db533f4a811d65dabd023033f07bda --- packager/media/base/stream_info.cc | 19 +++++++++++-------- packager/media/base/stream_info.h | 18 +++++++++++++----- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/packager/media/base/stream_info.cc b/packager/media/base/stream_info.cc index b856514a0f..bbe8c75ca1 100644 --- a/packager/media/base/stream_info.cc +++ b/packager/media/base/stream_info.cc @@ -14,11 +14,16 @@ namespace shaka { namespace media { -StreamInfo::StreamInfo(StreamType stream_type, int track_id, - uint32_t time_scale, uint64_t duration, Codec codec, +StreamInfo::StreamInfo(StreamType stream_type, + int track_id, + uint32_t time_scale, + uint64_t duration, + Codec codec, const std::string& codec_string, - const uint8_t* codec_config, size_t codec_config_size, - const std::string& language, bool is_encrypted) + const uint8_t* codec_config, + size_t codec_config_size, + const std::string& language, + bool is_encrypted) : stream_type_(stream_type), track_id_(track_id), time_scale_(time_scale), @@ -38,10 +43,8 @@ std::string StreamInfo::ToString() const { return base::StringPrintf( "type: %s\n codec_string: %s\n time_scale: %d\n duration: " "%" PRIu64 " (%.1f seconds)\n is_encrypted: %s\n", - (stream_type_ == kStreamAudio ? "Audio" : "Video"), - codec_string_.c_str(), - time_scale_, duration_, - static_cast(duration_) / time_scale_, + (stream_type_ == kStreamAudio ? "Audio" : "Video"), codec_string_.c_str(), + time_scale_, duration_, static_cast(duration_) / time_scale_, is_encrypted_ ? "true" : "false"); } diff --git a/packager/media/base/stream_info.h b/packager/media/base/stream_info.h index 20a6871e40..bbd98e926d 100644 --- a/packager/media/base/stream_info.h +++ b/packager/media/base/stream_info.h @@ -60,10 +60,16 @@ class StreamInfo { public: StreamInfo() = default; - StreamInfo(StreamType stream_type, int track_id, uint32_t time_scale, - uint64_t duration, Codec codec, const std::string& codec_string, - const uint8_t* codec_config, size_t codec_config_size, - const std::string& language, bool is_encrypted); + StreamInfo(StreamType stream_type, + int track_id, + uint32_t time_scale, + uint64_t duration, + Codec codec, + const std::string& codec_string, + const uint8_t* codec_config, + size_t codec_config_size, + const std::string& language, + bool is_encrypted); virtual ~StreamInfo(); @@ -95,7 +101,9 @@ class StreamInfo { void set_duration(uint64_t duration) { duration_ = duration; } void set_codec(Codec codec) { codec_ = codec; } - void set_codec_config(const std::vector& data) { codec_config_ = data; } + void set_codec_config(const std::vector& data) { + codec_config_ = data; + } void set_codec_string(const std::string& codec_string) { codec_string_ = codec_string; }