Skip to content

Commit 69ca29b

Browse files
aveladjoeyparrish
authored andcommitted
fix(DASH): Revert Dolby Atmos detection when there is not SupplementalProperty (#8132)
Reverts cf581cd Reverts 56c5f52
1 parent 1c1b229 commit 69ca29b

File tree

2 files changed

+2
-27
lines changed

2 files changed

+2
-27
lines changed

lib/dash/dash_parser.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2306,12 +2306,8 @@ shaka.dash.DashParser = class {
23062306
return element.attributes['schemeIdUri'] == expectedUri &&
23072307
element.attributes['value'] == expectedValue;
23082308
});
2309-
const codecs = context.representation.codecs;
2310-
// Detect the presence of Dolby Atmos audio content based on the codec and
2311-
// bandwidth. Bandwidth above 384 kbps is a good indicator of Atmos content.
2312-
const isAtmos = codecs.includes('ec-3') && context.bandwidth > 384000;
23132309
let spatialAudio = false;
2314-
if (hasJoc || isAtmos) {
2310+
if (hasJoc) {
23152311
spatialAudio = true;
23162312
}
23172313

@@ -2343,6 +2339,7 @@ shaka.dash.DashParser = class {
23432339

23442340
let hdr;
23452341
const profiles = context.profiles;
2342+
const codecs = context.representation.codecs;
23462343

23472344
const hevcHDR = 'http://dashif.org/guidelines/dash-if-uhd#hevc-hdr-pq10';
23482345
if (profiles.includes(hevcHDR) && (codecs.includes('hvc1.2.4.L153.B0') ||

test/dash/dash_parser_manifest_unit.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -544,28 +544,6 @@ describe('DashParser Manifest', () => {
544544
expect(stream.spatialAudio).toBe(true);
545545
});
546546

547-
it('Detects spatial audio by codec and bandwidth', async () => {
548-
const source = [
549-
'<MPD>',
550-
' <Period duration="PT30M">',
551-
' <AdaptationSet mimeType="audio/mp4" lang="\u2603">',
552-
' <Representation bandwidth="768000" codecs="ec-3">',
553-
' <BaseURL>http://example.com</BaseURL>',
554-
' <SegmentTemplate media="2.mp4" duration="1" />',
555-
' </Representation>',
556-
' </AdaptationSet>',
557-
' </Period>',
558-
'</MPD>',
559-
].join('\n');
560-
561-
fakeNetEngine.setResponseText('dummy://foo', source);
562-
563-
/** @type {shaka.extern.Manifest} */
564-
const manifest = await parser.start('dummy://foo', playerInterface);
565-
const stream = manifest.variants[0].audio;
566-
expect(stream.spatialAudio).toBe(true);
567-
});
568-
569547
it('correctly parses CEA-608 closed caption tags without channel numbers',
570548
async () => {
571549
const source = [

0 commit comments

Comments
 (0)