From ce5fd8f4fc2f749a06447c7c0cf24656ba8abbf9 Mon Sep 17 00:00:00 2001
From: Roy Funderburk <Roy.Funderburk@xperi.com>
Date: Thu, 8 Feb 2024 22:48:52 +0000
Subject: [PATCH] Updated for changes in main branch

---
 packager/app/test/testdata/dtsx-dash/output.mpd        | 2 +-
 packager/media/codecs/CMakeLists.txt                   | 1 +
 packager/media/codecs/dts_audio_specific_config.cc     | 7 +++----
 packager/media/event/muxer_listener_internal.cc        | 2 +-
 packager/media/formats/mp4/box_definitions_unittest.cc | 4 ++--
 packager/mpd/base/xml/xml_node.cc                      | 7 +++----
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packager/app/test/testdata/dtsx-dash/output.mpd b/packager/app/test/testdata/dtsx-dash/output.mpd
index 34f1fe771ea..8677077d25e 100644
--- a/packager/app/test/testdata/dtsx-dash/output.mpd
+++ b/packager/app/test/testdata/dtsx-dash/output.mpd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Generated with https://github.com/shaka-project/shaka-packager version <tag>-<hash>-<test>-->
-<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT3.114666700363159S">
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT3.114667S">
   <Period id="0">
     <AdaptationSet id="0" contentType="audio" subsegmentAlignment="true">
       <Representation id="0" bandwidth="227665" codecs="dtsx" mimeType="audio/mp4" audioSamplingRate="48000">
diff --git a/packager/media/codecs/CMakeLists.txt b/packager/media/codecs/CMakeLists.txt
index 0b31e4cd24b..b5bcecbe019 100644
--- a/packager/media/codecs/CMakeLists.txt
+++ b/packager/media/codecs/CMakeLists.txt
@@ -12,6 +12,7 @@ add_library(media_codecs STATIC
     avc_decoder_configuration_record.cc
     decoder_configuration_record.cc
     dovi_decoder_configuration_record.cc
+    dts_audio_specific_config.cc
     ec3_audio_util.cc
     ac4_audio_util.cc
     es_descriptor.cc
diff --git a/packager/media/codecs/dts_audio_specific_config.cc b/packager/media/codecs/dts_audio_specific_config.cc
index 50a189b6cdf..45b9343d055 100644
--- a/packager/media/codecs/dts_audio_specific_config.cc
+++ b/packager/media/codecs/dts_audio_specific_config.cc
@@ -3,11 +3,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "packager/media/codecs/dts_audio_specific_config.h"
+#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"
+#include <packager/media/base/bit_reader.h>
+#include <packager/media/base/rcheck.h>
 
 namespace shaka {
 namespace media {
diff --git a/packager/media/event/muxer_listener_internal.cc b/packager/media/event/muxer_listener_internal.cc
index bfcd6eee406..03f3dc6af17 100644
--- a/packager/media/event/muxer_listener_internal.cc
+++ b/packager/media/event/muxer_listener_internal.cc
@@ -20,7 +20,7 @@
 #include <packager/media/base/text_stream_info.h>
 #include <packager/media/base/video_stream_info.h>
 #include <packager/media/codecs/ac4_audio_util.h>
-#include "packager/media/codecs/dts_audio_specific_config.h"
+#include <packager/media/codecs/dts_audio_specific_config.h>
 #include <packager/media/codecs/ec3_audio_util.h>
 #include <packager/mpd/base/media_info.pb.h>
 #include <packager/utils/bytes_to_string_view.h>
diff --git a/packager/media/formats/mp4/box_definitions_unittest.cc b/packager/media/formats/mp4/box_definitions_unittest.cc
index 3c47b543a76..2515951c1e5 100644
--- a/packager/media/formats/mp4/box_definitions_unittest.cc
+++ b/packager/media/formats/mp4/box_definitions_unittest.cc
@@ -419,12 +419,12 @@ class BoxDefinitionsTestGeneral : public testing::Test {
 
   void Fill(UDTSSpecific* udts) {
     const uint8_t kUdtsData[] = {0x01, 0x20, 0x00, 0x00, 0x0, 0x3F, 0x80, 0x00};
-    udts->data.assign(kUdtsData, kUdtsData + arraysize(kUdtsData));
+    udts->data.assign(kUdtsData, kUdtsData + std::size(kUdtsData));
   }
 
   void Modify(UDTSSpecific* udts) {
     const uint8_t kUdtsData[] = {0x01, 0x20, 0x01, 0x80, 0xA, 0x3F, 0x80, 0x00};
-    udts->data.assign(kUdtsData, kUdtsData + arraysize(kUdtsData));
+    udts->data.assign(kUdtsData, kUdtsData + std::size(kUdtsData));
   }
 
   void Fill(AC3Specific* dac3) {
diff --git a/packager/mpd/base/xml/xml_node.cc b/packager/mpd/base/xml/xml_node.cc
index cfb21c424bd..05d9c04e1e7 100644
--- a/packager/mpd/base/xml/xml_node.cc
+++ b/packager/mpd/base/xml/xml_node.cc
@@ -617,15 +617,14 @@ bool RepresentationXmlNode::AddAudioChannelInfo(const AudioInfo& audio_info) {
     return ret;
   } else if (audio_info.codec() == kDTSCCodec ||
              audio_info.codec() == kDTSECodec) {
-    audio_channel_config_value = base::UintToString(audio_info.num_channels());
+    audio_channel_config_value =
+        absl::StrFormat("%u", audio_info.num_channels());
     audio_channel_config_scheme =
         "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());
     audio_channel_config_value =
-        base::HexEncode(&channel_config, sizeof(channel_config));
+        absl::StrFormat("%08X", codec_data.channel_mask());
     audio_channel_config_scheme =
         "tag:dts.com,2018:uhd:audio_channel_configuration";
   } else {