diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-20 19:31:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 19:31:03 +0000 |
| commit | b49b1af06952c310dd715234e30e646db3d525b0 (patch) | |
| tree | 847da345a7fd5e4f59456bf34d3cdfbac52f9bc7 /media | |
| parent | f8f0e0b756b0f96eccc94af89a0087c146232b26 (diff) | |
| parent | f526f687a686201cae03dfa6d59917b91294e913 (diff) | |
| download | frameworks_av-b49b1af06952c310dd715234e30e646db3d525b0.zip frameworks_av-b49b1af06952c310dd715234e30e646db3d525b0.tar.gz frameworks_av-b49b1af06952c310dd715234e30e646db3d525b0.tar.bz2 | |
am f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-dev
* commit 'f526f687a686201cae03dfa6d59917b91294e913':
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 e2e6d79..1da1e5e 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 = mSkip = skip; mBackPadding = cut; mWriteHead = 0; |