Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1d am: 0550a7221b

am: c11f019e2f

Change-Id: I4645f478a402648d74c1d103f87959cd71c57ae5

1 files changed, 16 insertions, 4 deletions

diff --git a/src/com/android/tv/tuner/exoplayer/ac3/AudioTrackWrapper.java b/src/com/android/tv/tuner/exoplayer/ac3/AudioTrackWrapper.java
index bc3c5d00..393e12c3 100644
--- a/src/com/android/tv/tuner/exoplayer/ac3/AudioTrackWrapper.java
+++ b/src/com/android/tv/tuner/exoplayer/ac3/AudioTrackWrapper.java
@@ -18,6 +18,7 @@ package com.android.tv.tuner.exoplayer.ac3;
 
 import android.media.MediaFormat;
 
+import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.audio.AudioTrack;
 
 import java.nio.ByteBuffer;
@@ -28,6 +29,10 @@ import java.nio.ByteBuffer;
  * This wrapper class will do nothing in disabled status for those operations.
  */
 public class AudioTrackWrapper {
+    private static final int PCM16_FRAME_BYTES = 2;
+    private static final int AC3_FRAMES_IN_ONE_SAMPLE = 1536;
+    private static final int BUFFERED_SAMPLES_IN_AUDIOTRACK =
+            Ac3DefaultTrackRenderer.BUFFERED_SAMPLES_IN_AUDIOTRACK;
     private final AudioTrack mAudioTrack = new AudioTrack();
     private int mAudioSessionID;
     private boolean mIsEnabled;
@@ -106,7 +111,7 @@ public class AudioTrackWrapper {
         mAudioTrack.setVolume(volume);
     }
 
-    public void reconfigure(MediaFormat format) {
+    public void reconfigure(MediaFormat format, int audioBufferSize) {
         if (!mIsEnabled || format == null) {
             return;
         }
@@ -117,9 +122,9 @@ public class AudioTrackWrapper {
         try {
             pcmEncoding = format.getInteger(MediaFormat.KEY_PCM_ENCODING);
         } catch (Exception e) {
-            pcmEncoding = com.google.android.exoplayer.MediaFormat.NO_VALUE;
+            pcmEncoding = C.ENCODING_PCM_16BIT;
         }
-        // TODO: Handle non-AC3 or non-passthrough audio.
+        // TODO: Handle non-AC3.
         if (MediaFormat.MIMETYPE_AUDIO_AC3.equalsIgnoreCase(mimeType) && channelCount != 2) {
             // Workarounds b/25955476.
             // Since all devices and platforms does not support passthrough for non-stereo AC3,
@@ -127,7 +132,14 @@ public class AudioTrackWrapper {
             // In other words, the channel count should be always 2.
             channelCount = 2;
         }
-        mAudioTrack.configure(mimeType, channelCount, sampleRate, pcmEncoding);
+        if (MediaFormat.MIMETYPE_AUDIO_RAW.equalsIgnoreCase(mimeType)) {
+            audioBufferSize =
+                    channelCount
+                            * PCM16_FRAME_BYTES
+                            * AC3_FRAMES_IN_ONE_SAMPLE
+                            * BUFFERED_SAMPLES_IN_AUDIOTRACK;
+        }
+        mAudioTrack.configure(mimeType, channelCount, sampleRate, pcmEncoding, audioBufferSize);
     }
 
     public void handleDiscontinuity() {