From eea1ce3e0a505f04d17feeaceffea6c1ee1df442 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 22 Feb 2019 15:39:36 +0000
Subject: [PATCH] Fix channel count propagation on HLS traditional preparation

PiperOrigin-RevId: 235189983
---
 .../src/main/java/com/google/android/exoplayer2/Format.java  | 1 +
 .../exoplayer2/source/hls/HlsSampleStreamWrapper.java        | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
index 8778a4244b..975f32f64d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/Format.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/Format.java
@@ -1047,6 +1047,7 @@ public final class Format implements Parcelable {
       int bitrate,
       int width,
       int height,
+      int channelCount,
       @C.SelectionFlags int selectionFlags,
       @Nullable String language) {
     return new Format(
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index 6e9d9cd424..c5e0c02925 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -1094,6 +1094,10 @@ import java.util.List;
       return sampleFormat;
     }
     int bitrate = propagateBitrate ? playlistFormat.bitrate : Format.NO_VALUE;
+    int channelCount =
+        playlistFormat.channelCount != Format.NO_VALUE
+            ? playlistFormat.channelCount
+            : sampleFormat.channelCount;
     int sampleTrackType = MimeTypes.getTrackType(sampleFormat.sampleMimeType);
     String codecs = Util.getCodecsOfType(playlistFormat.codecs, sampleTrackType);
     String mimeType = MimeTypes.getMediaMimeType(codecs);
@@ -1108,6 +1112,7 @@ import java.util.List;
         bitrate,
         playlistFormat.width,
         playlistFormat.height,
+        channelCount,
         playlistFormat.selectionFlags,
         playlistFormat.language);
   }