Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1338975 - Don't leak MediaCodec exceptions to CodecProxy. r=jchen

Browse Source 
MozReview-Commit-ID: AaouG5McGNb

--HG--
extra : rebase_source : 8544874ff2e3de067da7ada130afd0de74911fb9
This commit is contained in:
John Lin 2017-02-14 13:43:35 +08:00
parent 6a13464498
commit 246b2132bb
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mobile/android/base/java/org/mozilla/gecko/media/Codec.java
View File

@ -77,10 +77,15 @@ import java.util.concurrent.ConcurrentLinkedQueue;
temp.dispose();
}
if (mInputSamples.offer(sample)) {
feedSampleToBuffer();
} else {
if (!mInputSamples.offer(sample)) {
reportError(Error.FATAL, new Exception("FAIL: input sample queue is full"));
return;
}
try {
feedSampleToBuffer();
} catch (Exception e) {
reportError(Error.FATAL, e);
}
}
@ -369,10 +374,11 @@ import java.util.concurrent.ConcurrentLinkedQueue;
}
private void releaseCodec() {
// In case Codec.stop() is not called yet.
mInputProcessor.stop();
mOutputProcessor.stop();
try {
// In case Codec.stop() is not called yet.
mInputProcessor.stop();
mOutputProcessor.stop();
mCodec.release();
} catch (Exception e) {
reportError(Error.FATAL, e);
@ -430,9 +436,10 @@ import java.util.concurrent.ConcurrentLinkedQueue;
@Override
public synchronized void stop() throws RemoteException {
if (DEBUG) { Log.d(LOGTAG, "stop " + this); }
mInputProcessor.stop();
mOutputProcessor.stop();
try {
mInputProcessor.stop();
mOutputProcessor.stop();
mCodec.stop();
} catch (Exception e) {
reportError(Error.FATAL, e);
@ -442,9 +449,10 @@ import java.util.concurrent.ConcurrentLinkedQueue;
@Override
public synchronized void flush() throws RemoteException {
if (DEBUG) { Log.d(LOGTAG, "flush " + this); }
mInputProcessor.stop();
mOutputProcessor.stop();
try {
mInputProcessor.stop();
mOutputProcessor.stop();
mCodec.flush();
if (DEBUG) { Log.d(LOGTAG, "flushed " + this); }
mInputProcessor.start();
@ -467,7 +475,11 @@ import java.util.concurrent.ConcurrentLinkedQueue;
@Override
public synchronized void releaseOutput(Sample sample, boolean render) {
mOutputProcessor.onRelease(sample, render);
try {
mOutputProcessor.onRelease(sample, render);
} catch (Exception e) {
reportError(Error.FATAL, e);
}
}
@Override