summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
diff options
context:
space:
mode:
authorDongwon Kang <dwkang@google.com>2014-02-13 03:00:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-13 03:00:06 +0000
commit499608075bce8a8bc649519687b28c99a0523839 (patch)
tree8b63a92f28908a84e4ef6821a495b22a8bebe0ab /media/libstagefright/mpeg2ts
parent1c178d3e7b8d037ac8d348922ba841b28eee662f (diff)
parent0105027f2a385ecb29a64b055f3046fb01ca2803 (diff)
downloadframeworks_av-499608075bce8a8bc649519687b28c99a0523839.zip
frameworks_av-499608075bce8a8bc649519687b28c99a0523839.tar.gz
frameworks_av-499608075bce8a8bc649519687b28c99a0523839.tar.bz2
am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8
* commit '0105027f2a385ecb29a64b055f3046fb01ca2803': Fix wrong channel table in ESQueue according to the A/52 table 5.8
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/ESQueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index 5c7e741..c0c9717 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -60,7 +60,7 @@ void ElementaryStreamQueue::clear(bool clearFormat) {
// update metadata only applicable, and return the payload size
static unsigned parseAC3SyncFrame(
const uint8_t *ptr, size_t size, sp<MetaData> *metaData) {
- static const unsigned channelCountTable[] = {2, 1, 2, 3, 4, 4, 5, 6};
+ static const unsigned channelCountTable[] = {2, 1, 2, 3, 3, 4, 4, 5};
static const unsigned samplingRateTable[] = {48000, 44100, 32000};
static const unsigned rates[] = {32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256,
320, 384, 448, 512, 576, 640};