From 275152755d86e3eac082059f97a7bb96bc465b44 Mon Sep 17 00:00:00 2001 From: Cosmin Stejerean Date: Tue, 7 May 2024 00:06:11 -0700 Subject: [PATCH] reformat --- packager/hls/base/master_playlist.cc | 4 +-- packager/hls/base/media_playlist.cc | 11 ++++--- .../dovi_decoder_configuration_record.cc | 6 ++-- .../dovi_decoder_configuration_record.h | 3 +- .../media/formats/mp4/mp4_media_parser.cc | 31 ++++++++++--------- packager/media/formats/mp4/mp4_media_parser.h | 3 +- packager/media/formats/mp4/mp4_muxer.cc | 6 ++-- packager/mpd/base/mpd_builder.cc | 7 ++--- packager/mpd/base/mpd_utils.cc | 10 +++--- packager/mpd/base/representation.cc | 9 ++++-- 10 files changed, 48 insertions(+), 42 deletions(-) diff --git a/packager/hls/base/master_playlist.cc b/packager/hls/base/master_playlist.cc index 75426f8bb5..8cc5eb714d 100644 --- a/packager/hls/base/master_playlist.cc +++ b/packager/hls/base/master_playlist.cc @@ -228,8 +228,8 @@ void BuildStreamInfTag(const MediaPlaylist& playlist, variant.text_codecs.end()); tag.AddQuotedString("CODECS", absl::StrJoin(all_codecs, ",")); - if (playlist.supplemental_codec() != "" - && playlist.compatible_brand() != media::FOURCC_NULL) { + if (playlist.supplemental_codec() != "" && + playlist.compatible_brand() != media::FOURCC_NULL) { std::vector supplemental_codecs; supplemental_codecs.push_back(playlist.supplemental_codec()); supplemental_codecs.push_back(FourCCToString(playlist.compatible_brand())); diff --git a/packager/hls/base/media_playlist.cc b/packager/hls/base/media_playlist.cc index fb3560a2e9..b480c0e2ce 100644 --- a/packager/hls/base/media_playlist.cc +++ b/packager/hls/base/media_playlist.cc @@ -393,10 +393,10 @@ bool MediaPlaylist::SetMediaInfo(const MediaInfo& media_info) { if (media_info.has_video_info()) { stream_type_ = MediaPlaylistStreamType::kVideo; codec_ = AdjustVideoCodec(media_info.video_info().codec()); - if (media_info.video_info().has_supplemental_codec() - && media_info.video_info().has_compatible_brand()) { - supplemental_codec_ = AdjustVideoCodec( - media_info.video_info().supplemental_codec()); + if (media_info.video_info().has_supplemental_codec() && + media_info.video_info().has_compatible_brand()) { + supplemental_codec_ = + AdjustVideoCodec(media_info.video_info().supplemental_codec()); compatible_brand_ = static_cast( media_info.video_info().compatible_brand()); } @@ -589,7 +589,8 @@ std::string MediaPlaylist::GetVideoRange() const { // Dolby Vision profile 8.4 may have a transfer_characteristics 14, the // actual value refers to preferred_transfer_characteristic value in SEI // message, using compatible brand as a workaround - if (!supplemental_codec_.empty() && compatible_brand_ == media::FOURCC_db4g) + if (!supplemental_codec_.empty() && + compatible_brand_ == media::FOURCC_db4g) return "HLG"; else return "SDR"; diff --git a/packager/media/codecs/dovi_decoder_configuration_record.cc b/packager/media/codecs/dovi_decoder_configuration_record.cc index 4a74124d55..9072dddecb 100644 --- a/packager/media/codecs/dovi_decoder_configuration_record.cc +++ b/packager/media/codecs/dovi_decoder_configuration_record.cc @@ -24,7 +24,8 @@ bool DOVIDecoderConfigurationRecord::Parse(const std::vector& data) { RCHECK(reader.ReadBits(8, &major_version) && major_version == 1 && reader.ReadBits(8, &minor_version) && minor_version == 0 && reader.ReadBits(7, &profile_) && reader.ReadBits(6, &level_) && - reader.SkipBits(3) && reader.ReadBits(4, &bl_signal_compatibility_id_)); + reader.SkipBits(3) && + reader.ReadBits(4, &bl_signal_compatibility_id_)); return true; } @@ -47,8 +48,7 @@ FourCC DOVIDecoderConfigurationRecord::GetDoViCompatibleBrand( case 4: if (transfer_characteristics == 14) { return FOURCC_db4g; - } - else if (transfer_characteristics == 18) { + } else if (transfer_characteristics == 18) { return FOURCC_db4h; } default: diff --git a/packager/media/codecs/dovi_decoder_configuration_record.h b/packager/media/codecs/dovi_decoder_configuration_record.h index 831c657b12..da61e8aded 100644 --- a/packager/media/codecs/dovi_decoder_configuration_record.h +++ b/packager/media/codecs/dovi_decoder_configuration_record.h @@ -35,7 +35,8 @@ class DOVIDecoderConfigurationRecord { /// DASH and HLS manifests. std::string GetCodecString(FourCC codec_fourcc) const; - /// @return The compatiable brand in the format defined by https://mp4ra.org/#/brands. + /// @return The compatiable brand in the format defined by + /// https://mp4ra.org/#/brands. FourCC GetDoViCompatibleBrand(const uint8_t transfer_characteristics) const; private: diff --git a/packager/media/formats/mp4/mp4_media_parser.cc b/packager/media/formats/mp4/mp4_media_parser.cc index f88c9283b8..9502f0a0dc 100644 --- a/packager/media/formats/mp4/mp4_media_parser.cc +++ b/packager/media/formats/mp4/mp4_media_parser.cc @@ -150,7 +150,6 @@ std::vector GetDOVIDecoderConfig( return std::vector(); } - bool UpdateCodecStringForDolbyVision( FourCC actual_format, const std::vector& configs, @@ -188,14 +187,12 @@ bool UpdateCodecStringForDolbyVision( return true; } - -bool UpdateDolbyVisionInfo( - FourCC actual_format, - const std::vector& configs, - uint8_t transfer_characteristics, - std::string* codec_string, - std::string* dovi_supplemental_codec_string, - FourCC* dovi_compatible_brand) { +bool UpdateDolbyVisionInfo(FourCC actual_format, + const std::vector& configs, + uint8_t transfer_characteristics, + std::string* codec_string, + std::string* dovi_supplemental_codec_string, + FourCC* dovi_compatible_brand) { DOVIDecoderConfigurationRecord dovi_config; if (!dovi_config.Parse(GetDOVIDecoderConfig(configs))) { LOG(ERROR) << "Failed to parse Dolby Vision decoder " @@ -445,7 +442,8 @@ bool MP4MediaParser::ParseMoov(BoxReader* reader) { std::vector> streams; - bool use_dovi_supplemental = absl::GetFlag(FLAGS_use_dovi_supplemental_codecs); + bool use_dovi_supplemental = + absl::GetFlag(FLAGS_use_dovi_supplemental_codecs); for (std::vector::const_iterator track = moov_->tracks.begin(); track != moov_->tracks.end(); ++track) { @@ -696,8 +694,9 @@ bool MP4MediaParser::ParseMoov(BoxReader* reader) { return false; } } else { - if (!UpdateCodecStringForDolbyVision( - actual_format, entry.extra_codec_configs, &codec_string)) { + if (!UpdateCodecStringForDolbyVision(actual_format, + entry.extra_codec_configs, + &codec_string)) { return false; } } @@ -774,8 +773,9 @@ bool MP4MediaParser::ParseMoov(BoxReader* reader) { return false; } } else { - if (!UpdateCodecStringForDolbyVision( - actual_format, entry.extra_codec_configs, &codec_string)) { + if (!UpdateCodecStringForDolbyVision(actual_format, + entry.extra_codec_configs, + &codec_string)) { return false; } } @@ -826,7 +826,8 @@ bool MP4MediaParser::ParseMoov(BoxReader* reader) { nalu_length_size, track->media.header.language.code, is_encrypted)); if (use_dovi_supplemental) { - video_stream_info->set_supplemental_codec(dovi_supplemental_codec_string); + video_stream_info->set_supplemental_codec( + dovi_supplemental_codec_string); video_stream_info->set_compatible_brand(dovi_compatible_brand); } video_stream_info->set_extra_config(entry.ExtraCodecConfigsAsVector()); diff --git a/packager/media/formats/mp4/mp4_media_parser.h b/packager/media/formats/mp4/mp4_media_parser.h index f0222c0ec2..4463aae95c 100644 --- a/packager/media/formats/mp4/mp4_media_parser.h +++ b/packager/media/formats/mp4/mp4_media_parser.h @@ -12,8 +12,8 @@ #include #include -#include #include +#include #include #include @@ -22,7 +22,6 @@ ABSL_DECLARE_FLAG(bool, use_dovi_supplemental_codecs); - namespace shaka { namespace media { namespace mp4 { diff --git a/packager/media/formats/mp4/mp4_muxer.cc b/packager/media/formats/mp4/mp4_muxer.cc index eef0172829..3527a9e7be 100644 --- a/packager/media/formats/mp4/mp4_muxer.cc +++ b/packager/media/formats/mp4/mp4_muxer.cc @@ -238,9 +238,11 @@ Status MP4Muxer::DelayInitializeMuxer() { // https://professional.dolby.com/siteassets/content-creation/dolby-vision-for-content-creators/dolby_vision_bitstreams_within_the_iso_base_media_file_format_dec2017.pdf std::string codec_string = - static_cast(streams()[0].get())->codec_string(); + static_cast(streams()[0].get()) + ->codec_string(); std::string supplemental_codec_string = - static_cast(streams()[0].get())->supplemental_codec(); + static_cast(streams()[0].get()) + ->supplemental_codec(); if (codec_string.find("dvh") != std::string::npos || supplemental_codec_string.find("dvh") != std::string::npos) ftyp->compatible_brands.push_back(FOURCC_dby1); diff --git a/packager/mpd/base/mpd_builder.cc b/packager/mpd/base/mpd_builder.cc index 8bc8374236..d633231d95 100644 --- a/packager/mpd/base/mpd_builder.cc +++ b/packager/mpd/base/mpd_builder.cc @@ -55,12 +55,9 @@ bool AddMpdNameSpaceInfo(XmlNode* mpd) { static const char kMsprNamespace[] = "urn:microsoft:playready"; static const char kScte214Namespace[] = "scte214"; - const std::map uris = { - {"cenc", kCencNamespace}, - {"mas", kMarlinNamespace}, - {"xlink", kXmlNamespaceXlink}, - {"mspr", kMsprNamespace}, + {"cenc", kCencNamespace}, {"mas", kMarlinNamespace}, + {"xlink", kXmlNamespaceXlink}, {"mspr", kMsprNamespace}, {"scte214", kScte214Namespace}, }; diff --git a/packager/mpd/base/mpd_utils.cc b/packager/mpd/base/mpd_utils.cc index 3dab211e71..32df6a5f1e 100644 --- a/packager/mpd/base/mpd_utils.cc +++ b/packager/mpd/base/mpd_utils.cc @@ -133,7 +133,8 @@ std::string GetSupplementalCodecs(const MediaInfo& media_info) { CHECK(OnlyOneTrue(media_info.has_video_info(), media_info.has_audio_info(), media_info.has_text_info())); - if (media_info.has_video_info() && media_info.video_info().has_supplemental_codec()) { + if (media_info.has_video_info() && + media_info.video_info().has_supplemental_codec()) { return media_info.video_info().supplemental_codec(); } return ""; @@ -143,9 +144,10 @@ std::string GetSupplementalProfiles(const MediaInfo& media_info) { CHECK(OnlyOneTrue(media_info.has_video_info(), media_info.has_audio_info(), media_info.has_text_info())); - if (media_info.has_video_info() && media_info.video_info().has_compatible_brand()) { - return FourCCToString(static_cast( - media_info.video_info().compatible_brand())); + if (media_info.has_video_info() && + media_info.video_info().has_compatible_brand()) { + return FourCCToString( + static_cast(media_info.video_info().compatible_brand())); } return ""; } diff --git a/packager/mpd/base/representation.cc b/packager/mpd/base/representation.cc index 9e7b2bf000..e27ae26aaf 100644 --- a/packager/mpd/base/representation.cc +++ b/packager/mpd/base/representation.cc @@ -273,9 +273,12 @@ std::optional Representation::GetXml() { } if (!supplemental_codecs_.empty() && !supplemental_profiles_.empty()) { - if (!representation.SetStringAttribute("scte214:supplementalCodecs", supplemental_codecs_) || - !representation.SetStringAttribute("scte214:supplementalProfiles", supplemental_profiles_)) { - LOG(ERROR) << "Failed to add supplemental codecs/profiles to Representation XML."; + if (!representation.SetStringAttribute("scte214:supplementalCodecs", + supplemental_codecs_) || + !representation.SetStringAttribute("scte214:supplementalProfiles", + supplemental_profiles_)) { + LOG(ERROR) << "Failed to add supplemental codecs/profiles to " + "Representation XML."; } }