OSDN Git Service
(root)
/
android-x86
/
external-stagefright-plugins.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20a14f3
)
stagefright-plugins: check if input queue is empty
author
Keith Mok
<kmok@cyngn.com>
Tue, 31 May 2016 23:08:48 +0000
(16:08 -0700)
committer
Keith Mok
<kmok@cyngn.com>
Tue, 31 May 2016 23:08:48 +0000
(16:08 -0700)
input queue may be empty when calling decodeAudio.
Add a guard for it.
DOGEDUMP-4184
Change-Id: I261e8d36fb4560fdcc04702b4e09a00c4b10cc47
omx/SoftFFmpegAudio.cpp
patch
|
blob
|
history
diff --git
a/omx/SoftFFmpegAudio.cpp
b/omx/SoftFFmpegAudio.cpp
index
230af55
..
1688398
100644
(file)
--- a/
omx/SoftFFmpegAudio.cpp
+++ b/
omx/SoftFFmpegAudio.cpp
@@
-1124,7
+1124,7
@@
int32_t SoftFFmpegAudio::decodeAudio() {
}
}
- if (!is_flush) {
+ if (!is_flush
&& !inHeader
) {
if (len < 0) {
//if error, we skip the frame
inputBufferUsedLength = mInputBufferSize;