Skip to content

Commit

Permalink
clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
Roy-Funderburk committed Feb 8, 2024
1 parent 778fa65 commit bc95591
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
6 changes: 3 additions & 3 deletions packager/media/base/fourccs.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ enum FourCC : uint32_t {
FOURCC_trex = 0x74726578,
FOURCC_trun = 0x7472756e,
FOURCC_udta = 0x75647461,
FOURCC_udts = 0x75647473, // "udts"
FOURCC_url = 0x75726c20, // "url "
FOURCC_urn = 0x75726e20, // "urn "
FOURCC_udts = 0x75647473, // "udts"
FOURCC_url = 0x75726c20, // "url "
FOURCC_urn = 0x75726e20, // "urn "
FOURCC_uuid = 0x75756964,
FOURCC_vide = 0x76696465,
FOURCC_vlab = 0x766c6162,
Expand Down
3 changes: 1 addition & 2 deletions packager/media/codecs/dts_audio_specific_config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@

#include "packager/media/codecs/dts_audio_specific_config.h"


#include "packager/base/logging.h"
#include "packager/media/base/bit_reader.h"
#include "packager/media/base/rcheck.h"

namespace shaka {
namespace media {

bool GetDTSXChannelMask(const std::vector<uint8_t> &udts, uint32_t &mask) {
bool GetDTSXChannelMask(const std::vector<uint8_t>& udts, uint32_t& mask) {
// udts is the DTS-UHD Specific Box: ETSI TS 103 491 V1.2.1 Table B-2
// DecoderProfileCode(6 bits)
// FrameDurationCode(2 bits)
Expand Down
2 changes: 1 addition & 1 deletion packager/media/codecs/dts_audio_specific_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ namespace media {

class BitReader;

bool GetDTSXChannelMask(const std::vector<uint8_t> &udts, uint32_t &mask);
bool GetDTSXChannelMask(const std::vector<uint8_t>& udts, uint32_t& mask);

} // namespace media
} // namespace shaka
Expand Down
8 changes: 4 additions & 4 deletions packager/mpd/base/xml/xml_node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -619,15 +619,15 @@ bool RepresentationXmlNode::AddAudioChannelInfo(const AudioInfo& audio_info) {
audio_info.codec() == kDTSECodec) {
audio_channel_config_value = base::UintToString(audio_info.num_channels());
audio_channel_config_scheme =
"tag:dts.com,2014:dash:audio_channel_configuration:2012";
"tag:dts.com,2014:dash:audio_channel_configuration:2012";
} else if (audio_info.codec() == kDTSXCodec) {
const auto& codec_data = audio_info.codec_specific_data();
const uint32_t channel_config =
base::HostToNet32(codec_data.channel_mask());
base::HostToNet32(codec_data.channel_mask());
audio_channel_config_value =
base::HexEncode(&channel_config, sizeof(channel_config));
base::HexEncode(&channel_config, sizeof(channel_config));
audio_channel_config_scheme =
"tag:dts.com,2018:uhd:audio_channel_configuration";
"tag:dts.com,2018:uhd:audio_channel_configuration";
} else {
audio_channel_config_value =
absl::StrFormat("%u", audio_info.num_channels());
Expand Down

0 comments on commit bc95591

Please sign in to comment.