diff options
| author | Dongwon Kang <dwkang@google.com> | 2014-02-13 11:27:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-13 11:27:25 +0000 |
| commit | cf9b0b6bed2bb559060aa77241f7c6b1b22c7e63 (patch) | |
| tree | 5913bb2909bd3e45591fdd98ef9d0c1f4fa2580e /media/libstagefright/mpeg2ts | |
| parent | c6d7ab74962bfd24d105277b28248b4819763abd (diff) | |
| parent | 499608075bce8a8bc649519687b28c99a0523839 (diff) | |
| download | frameworks_av-cf9b0b6bed2bb559060aa77241f7c6b1b22c7e63.zip frameworks_av-cf9b0b6bed2bb559060aa77241f7c6b1b22c7e63.tar.gz frameworks_av-cf9b0b6bed2bb559060aa77241f7c6b1b22c7e63.tar.bz2 | |
am 49960807: am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8
* commit '499608075bce8a8bc649519687b28c99a0523839':
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.cpp | 2 |
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}; |