fix: Fix AC-3 playback on Tizen 3.0 devices when transmuxing (#7972)

Related to #7955
Also adds test for
#7969

karma.conf.js

@@ -259,6 +259,7 @@ module.exports = (config) => {
       {pattern: 'test/test/assets/7401/*', included: false},
       {pattern: 'test/test/assets/6339/*', included: false},
       {pattern: 'test/test/assets/dash-aes-128/*', included: false},
+      {pattern: 'test/test/assets/dash-audio-ac3/*', included: false},
       {pattern: 'test/test/assets/dash-clearkey/*', included: false},
       {pattern: 'test/test/assets/dash-mpd-alternate/*', included: false},
       {pattern: 'test/test/assets/dash-vr/*', included: false},

lib/transmuxer/ac3_transmuxer.js

@@ -14,6 +14,7 @@ goog.require('shaka.util.Error');
 goog.require('shaka.util.Id3Utils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.Mp4Generator');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Uint8ArrayUtils');
 
 
@@ -86,7 +87,11 @@ shaka.transmuxer.Ac3Transmuxer = class {
    */
   convertCodecs(contentType, mimeType) {
     if (this.isAc3Container_(mimeType)) {
-      return 'audio/mp4; codecs="ac-3"';
+      if (shaka.util.Platform.requiresEC3InitSegments()) {
+        return 'audio/mp4; codecs="ec-3"';
+      } else {
+        return 'audio/mp4; codecs="ac-3"';
+      }
     }
     return mimeType;
   }

lib/util/mp4_generator.js

@@ -8,6 +8,7 @@ goog.provide('shaka.util.Mp4Generator');
 
 goog.require('goog.asserts');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Uint8ArrayUtils');
 
 
@@ -298,6 +299,20 @@ shaka.util.Mp4Generator = class {
   stsd_(streamInfo) {
     const Mp4Generator = shaka.util.Mp4Generator;
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    let audioCodec = 'aac';
+    if (streamInfo.codecs.includes('mp3')) {
+      audioCodec = 'mp3';
+    } else if (streamInfo.codecs.includes('ac-3')) {
+      if (shaka.util.Platform.requiresEC3InitSegments()) {
+        audioCodec = 'ec-3';
+      } else {
+        audioCodec = 'ac-3';
+      }
+    } else if (streamInfo.codecs.includes('ec-3')) {
+      audioCodec = 'ec-3';
+    } else if (streamInfo.codecs.includes('opus')) {
+      audioCodec = 'opus';
+    }
     let bytes = new Uint8Array([]);
     switch (streamInfo.type) {
       case ContentType.VIDEO:
@@ -308,13 +323,13 @@ shaka.util.Mp4Generator = class {
         }
         break;
       case ContentType.AUDIO:
-        if (streamInfo.codecs.includes('mp3')) {
+        if (audioCodec == 'mp3') {
           bytes = this.mp3_(streamInfo);
-        } else if (streamInfo.codecs.includes('ac-3')) {
+        } else if (audioCodec == 'ac-3') {
           bytes = this.ac3_(streamInfo);
-        } else if (streamInfo.codecs.includes('ec-3')) {
+        } else if (audioCodec == 'ec-3') {
           bytes = this.ec3_(streamInfo);
-        } else if (streamInfo.codecs.includes('opus')) {
+        } else if (audioCodec == 'opus') {
           bytes = this.opus_(streamInfo);
         } else {
           bytes = this.mp4a_(streamInfo);

test/media/content_workarounds_integration.js

@@ -0,0 +1,79 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+describe('ContentWorkarounds', () => {
+  const Util = shaka.test.Util;
+
+  /** @type {!jasmine.Spy} */
+  let onErrorSpy;
+
+  /** @type {!HTMLVideoElement} */
+  let video;
+  /** @type {shaka.Player} */
+  let player;
+  /** @type {!shaka.util.EventManager} */
+  let eventManager;
+
+  let compiledShaka;
+
+  /** @type {!shaka.test.Waiter} */
+  let waiter;
+
+  beforeAll(async () => {
+    video = shaka.test.UiUtils.createVideoElement();
+    document.body.appendChild(video);
+    compiledShaka =
+        await shaka.test.Loader.loadShaka(getClientArg('uncompiled'));
+  });
+
+  beforeEach(async () => {
+    await shaka.test.TestScheme.createManifests(compiledShaka, '_compiled');
+    player = new compiledShaka.Player();
+    await player.attach(video);
+
+    // Disable stall detection, which can interfere with playback tests.
+    player.configure('streaming.stallEnabled', false);
+
+    // Grab event manager from the uncompiled library:
+    eventManager = new shaka.util.EventManager();
+    waiter = new shaka.test.Waiter(eventManager);
+    waiter.setPlayer(player);
+
+    onErrorSpy = jasmine.createSpy('onError');
+    onErrorSpy.and.callFake((event) => fail(event.detail));
+    eventManager.listen(player, 'error', Util.spyFunc(onErrorSpy));
+  });
+
+  afterEach(async () => {
+    eventManager.release();
+    await player.destroy();
+  });
+
+  afterAll(() => {
+    document.body.removeChild(video);
+  });
+
+  // Check that fakeEC3 workaround is applied on the platforms where it is
+  // needed.
+  it('supports AC-3 if platform supports it', async () => {
+    if (!await Util.isTypeSupported('audio/mp4; codecs="ac-3"')) {
+      pending('Codec AC-3 is not supported by the platform.');
+    }
+    await player.load('/base/test/test/assets/dash-audio-ac3/dash.mpd');
+    await video.play();
+    expect(player.isLive()).toBe(false);
+
+    // Wait for the video to start playback.  If it takes longer than 10
+    // seconds, fail the test.
+    await waiter.waitForMovementOrFailOnTimeout(video, 10);
+
+    // Play for 5 seconds, but stop early if the video ends.  If it takes
+    // longer than 30 seconds, fail the test.
+    await waiter.waitUntilPlayheadReachesOrFailOnTimeout(video, 5, 30);
+
+    await player.unload();
+  });
+});

test/test/assets/dash-audio-ac3/dash.mpd

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/shaka-project/shaka-packager version v3.4.0-1f0a4d1-release-->
+<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-live:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT4S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="audio" startWithSAP="1" segmentAlignment="true">
+      <Representation id="0" bandwidth="195101" codecs="ac-3" mimeType="audio/mp4" audioSamplingRate="44100">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <SegmentTemplate timescale="44100" initialization="audio_und_2c_192k_ac3_init.mp4" media="audio_und_2c_192k_ac3_$Number$.mp4" startNumber="1">
+          <SegmentTimeline>
+            <S t="0" d="89088"/>
+            <S t="89088" d="87312"/>
+          </SegmentTimeline>
+        </SegmentTemplate>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>

test/test/util/util.js

@@ -360,10 +360,6 @@ shaka.test.Util = class {
       const baseMimeType = MimeUtils.getBasicType(mimetype);
       const codecs = StreamUtils.getCorrectAudioCodecs(
           MimeUtils.getCodecs(mimetype), baseMimeType);
-      if (codecs == 'ac-3' && shaka.util.Platform.isTizen()) {
-        // AC3 is flaky in some Tizen devices, so we need omit it for now.
-        return false;
-      }
       // AudioConfiguration
       mediaDecodingConfig.audio = {
         contentType: MimeUtils.getFullOrConvertedType(

test/transmuxer/transmuxer_integration.js

@@ -399,6 +399,10 @@ describe('Transmuxer Player', () => {
       if (!await Util.isTypeSupported('audio/mp4; codecs="ac-3"')) {
         pending('Codec AC-3 is not supported by the platform.');
       }
+      // This tests is flaky in some Tizen devices, so we need omit it for now.
+      if (shaka.util.Platform.isTizen()) {
+        pending('Disabled on Tizen.');
+      }
 
       // eslint-disable-next-line max-len
       await player.load('/base/test/test/assets/hls-ts-muxed-ac3-h264/media.m3u8');