Skip to content

Commit 4cbf150

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

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
@@ -2133,12 +2133,8 @@ shaka.dash.DashParser = class {
21332133
return element.attributes['schemeIdUri'] == expectedUri &&
21342134
element.attributes['value'] == expectedValue;
21352135
});
2136-
const codecs = context.representation.codecs;
2137-
// Detect the presence of Dolby Atmos audio content based on the codec and
2138-
// bandwidth. Bandwidth above 384 kbps is a good indicator of Atmos content.
2139-
const isAtmos = codecs.includes('ec-3') && context.bandwidth > 384000;
21402136
let spatialAudio = false;
2141-
if (hasJoc || isAtmos) {
2137+
if (hasJoc) {
21422138
spatialAudio = true;
21432139
}
21442140

@@ -2172,6 +2168,7 @@ shaka.dash.DashParser = class {
21722168

21732169
let hdr;
21742170
const profiles = context.profiles;
2171+
const codecs = context.representation.codecs;
21752172

21762173
const hevcHDR = 'http://dashif.org/guidelines/dash-if-uhd#hevc-hdr-pq10';
21772174
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
@@ -538,28 +538,6 @@ describe('DashParser Manifest', () => {
538538
expect(stream.spatialAudio).toBe(true);
539539
});
540540

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

0 commit comments

Comments
 (0)