diff options
| author | Abhishek Arya <aarya@google.com> | 2015-08-20 17:04:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 17:04:05 +0000 |
| commit | ced2dd3ccf8920621b931bb4b5d9df9a9a23449a (patch) | |
| tree | 437b24d2bc2cba6bc3bbefdfa80211be2c0bc75a /media | |
| parent | a590baca031199327f6382347625dd232de2c95c (diff) | |
| parent | 2c880dde90e4303f9201f46124ee879325c57ba0 (diff) | |
| download | frameworks_av-ced2dd3ccf8920621b931bb4b5d9df9a9a23449a.zip frameworks_av-ced2dd3ccf8920621b931bb4b5d9df9a9a23449a.tar.gz frameworks_av-ced2dd3ccf8920621b931bb4b5d9df9a9a23449a.tar.bz2 | |
am 2c880dde: Merge "Sanity check padding/delay values for gapless playback" into klp-dev
* commit '2c880dde90e4303f9201f46124ee879325c57ba0':
Sanity check padding/delay values for gapless playback
Diffstat (limited to 'media')
| -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; |