Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b6a02eb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "fix AmrInputStream.read() hang"

parents 177bd652 e1b8b7bf
Loading
Loading
Loading
Loading
+10 −14
Original line number Diff line number Diff line
@@ -140,10 +140,8 @@ public final class AmrInputStream extends InputStream {
                }
            }

            // now read encoded data from the encoder (blocking, since we just filled up the
            // encoder's input with data it should be able to output at least one buffer)
            while (true) {
                int index = mCodec.dequeueOutputBuffer(mInfo, -1);
            // now read encoded data from the encoder
            int index = mCodec.dequeueOutputBuffer(mInfo, 0);
            if (index >= 0) {
                mBufIn = mInfo.size;
                ByteBuffer out = mCodec.getOutputBuffer(index);
@@ -152,8 +150,6 @@ public final class AmrInputStream extends InputStream {
                if ((mInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
                    mSawOutputEOS = true;
                }
                    break;
                }
            }
        }