diff options
| author | Marco Nelissen <marcone@google.com> | 2015-08-18 09:48:10 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-08-18 09:48:10 -0700 |
| commit | d5fa8d5dcdf8742f03fdc165f7529d7627b0eb01 (patch) | |
| tree | 5e065f21d562f5fdefd858934e4385c4546ebb4d /media/libstagefright/SkipCutBuffer.cpp | |
| parent | 39ff8149466ee8e86c0336f706cd4dd3713f359f (diff) | |
| download | frameworks_av-d5fa8d5dcdf8742f03fdc165f7529d7627b0eb01.zip frameworks_av-d5fa8d5dcdf8742f03fdc165f7529d7627b0eb01.tar.gz frameworks_av-d5fa8d5dcdf8742f03fdc165f7529d7627b0eb01.tar.bz2 | |
Sanity check padding/delay values for gapless playback
Bug: 23306638
Change-Id: Id77637eb897d9e484f1b32e022c99c51c1bd9a1e
Diffstat (limited to 'media/libstagefright/SkipCutBuffer.cpp')
| -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; |