diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-20 04:06:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-20 04:06:25 +0000 |
| commit | 2c880dde90e4303f9201f46124ee879325c57ba0 (patch) | |
| tree | 1046e8298b670c9aa23252f535fc3f9510bb2718 /media/libstagefright | |
| parent | 6ae815e04f618207da9ce52e3c828492c33a7107 (diff) | |
| parent | ba6093a4c6997b9d36d9700ee8c974941bf82e3a (diff) | |
| download | frameworks_av-2c880dde90e4303f9201f46124ee879325c57ba0.zip frameworks_av-2c880dde90e4303f9201f46124ee879325c57ba0.tar.gz frameworks_av-2c880dde90e4303f9201f46124ee879325c57ba0.tar.bz2 | |
Merge "Sanity check padding/delay values for gapless playback" into klp-dev
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/SkipCutBuffer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/SkipCutBuffer.cpp b/media/libstagefright/SkipCutBuffer.cpp index 773854f..4d15d7e 100644 --- a/media/libstagefright/SkipCutBuffer.cpp +++ b/media/libstagefright/SkipCutBuffer.cpp @@ -25,6 +25,13 @@ namespace android { SkipCutBuffer::SkipCutBuffer(int32_t skip, int32_t cut) { + + if (skip < 0 || cut < 0 || cut > 64 * 1024) { + ALOGW("out of range skip/cut: %d/%d, using passthrough instead", skip, cut); + skip = 0; + cut = 0; + } + mFrontPadding = skip; mBackPadding = cut; mWriteHead = 0; |