diff options
author | Marco Nelissen <marcone@google.com> | 2015-08-20 10:26:33 -0700 |
---|---|---|
committer | Marco Nelissen <marcone@google.com> | 2015-08-20 10:26:33 -0700 |
commit | 8a55bcb640c8842348eb41495fdb8fe82cb0465d (patch) | |
tree | 41f51f4322964bf2e296821d8a6f0c8863234603 /media/libstagefright | |
parent | 2562495de9338e14ca3a3ef74ce07a7b310cd1fb (diff) | |
parent | ced2dd3ccf8920621b931bb4b5d9df9a9a23449a (diff) | |
download | frameworks_av-8a55bcb640c8842348eb41495fdb8fe82cb0465d.zip frameworks_av-8a55bcb640c8842348eb41495fdb8fe82cb0465d.tar.gz frameworks_av-8a55bcb640c8842348eb41495fdb8fe82cb0465d.tar.bz2 |
resolved conflicts for merge of ced2dd3c to lmp-dev
Change-Id: I5dbb4f7d6c38c75a54c59d5e59305657bc50ab10
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 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; |