aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPDec/src/tpdec_lib.cpp
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-05-06 07:23:21 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-05-06 07:23:21 +0000
commit2fd44f2027f15c5e141f05245819bf424a44cfa1 (patch)
tree8bf6f33f28355cd7dd6c4f5a01c5324a43ec66bc /libMpegTPDec/src/tpdec_lib.cpp
parentfa5ad13b3761cc0d4cfe3780944eed80fb52d842 (diff)
parent9ab67882eca7454dc001e158bc1e6e2219d6650b (diff)
downloadfdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.tar.gz
fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.tar.bz2
fdk-aac-2fd44f2027f15c5e141f05245819bf424a44cfa1.zip
Snap for 4765094 from 9ab67882eca7454dc001e158bc1e6e2219d6650b to pi-release
Change-Id: Iecf0e5905c400a1b43555619b5bf7e1823f15f48
Diffstat (limited to 'libMpegTPDec/src/tpdec_lib.cpp')
-rw-r--r--libMpegTPDec/src/tpdec_lib.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libMpegTPDec/src/tpdec_lib.cpp b/libMpegTPDec/src/tpdec_lib.cpp
index 10e3352..306bec0 100644
--- a/libMpegTPDec/src/tpdec_lib.cpp
+++ b/libMpegTPDec/src/tpdec_lib.cpp
@@ -1151,6 +1151,12 @@ static TRANSPORTDEC_ERROR synchronization(HANDLE_TRANSPORTDEC hTp,
&syncLayerFrameBits, &fConfigFound,
&headerBits);
if (TPDEC_IS_FATAL_ERROR(err)) {
+ /* Rewind - TPDEC_SYNCSKIP, in order to look for a synch one bit ahead
+ * next time. Ensure that the bit amount lands at a multiple of
+ * TPDEC_SYNCSKIP. */
+ FDKpushBiDirectional(
+ hBs, -headerBits + TPDEC_SYNCSKIP + (bitsAvail % TPDEC_SYNCSKIP));
+
goto bail;
}
}