commit 14c577fac81b8fdcc75e4bf9243f16bd624ba58b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 07 23:02:42 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 07 23:02:42 2018 +0000
tree e71ea8f995dddd0488dce69d9021800d33a19490
parent 64ac8c6301d0e809d2fc0935dbf16bf318b4940d
parent 842e307f6188cd36ca273d05e8d579d6ab75d320

Merge "[MP3] Fix wrong private_bits in side info"

media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp

diff --git a/media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp b/media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp
index 7eaa860..4a02027 100644
--- a/media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp
+++ b/media/libstagefright/codecs/mp3dec/src/pvmp3_get_side_info.cpp
@@ -127,13 +127,13 @@
         {
             tmp = getbits_crc(inputStream, 14, crc, info->error_protection);
             si->main_data_begin = (tmp << 18) >> 23;    /* 9 */
-            si->private_bits    = (tmp << 23) >> 27;    /* 5 */
+            si->private_bits    = (tmp << 27) >> 27;    /* 5 */
         }
         else
         {
             tmp = getbits_crc(inputStream, 12, crc, info->error_protection);
             si->main_data_begin = (tmp << 20) >> 23;    /* 9 */
-            si->private_bits    = (tmp << 23) >> 29;    /* 3 */
+            si->private_bits    = (tmp << 29) >> 29;    /* 3 */
 
         }