Merge "fix AmrInputStream.read() hang" (5b6a02eb) · Commits · e / os / android_frameworks_base

media/java/android/media/AmrInputStream.java

+10 −14

Original line number	Original line	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		// now read encoded data from the encoder
	// encoder's input with data it should be able to output at least one buffer)		int index = mCodec.dequeueOutputBuffer(mInfo, 0);
	while (true) {
	int index = mCodec.dequeueOutputBuffer(mInfo, -1);
	if (index >= 0) {		if (index >= 0) {
	mBufIn = mInfo.size;		mBufIn = mInfo.size;
	ByteBuffer out = mCodec.getOutputBuffer(index);		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) {		if ((mInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
	mSawOutputEOS = true;		mSawOutputEOS = true;
	}		}
	break;
	}
	}		}
	}		}