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

Bug 1346235 - part 4: recycle unpopulated input samples. r=jchen

Browse Source 
MozReview-Commit-ID: Lr0aSQ0OfRg

--HG--
extra : rebase_source : 71f37d29c5d3a08e63171956fa5a02e716bcec0a
This commit is contained in:
John Lin 2017-03-17 15:06:39 +08:00
parent f737b4804b
commit d65535053d
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,18 +66,26 @@ import java.util.concurrent.ConcurrentLinkedQueue;
private synchronized void onSample(Sample sample) {
if (sample == null) {
Log.w(LOGTAG, "WARN: null input sample");
// Ignore empty input.
mSamplePool.recycleInput(mDequeuedSamples.remove());
Log.w(LOGTAG, "WARN: empty input sample");
return;
}
if (!sample.isEOS()) {
Sample temp = sample;
sample = mDequeuedSamples.remove();
sample.info = temp.info;
sample.cryptoInfo = temp.cryptoInfo;
temp.dispose();
if (sample.isEOS()) {
queueSample(sample);
return;
}
Sample dequeued = mDequeuedSamples.remove();
dequeued.info = sample.info;
dequeued.cryptoInfo = sample.cryptoInfo;
queueSample(dequeued);
sample.dispose();
}
private void queueSample(Sample sample) {
if (!mInputSamples.offer(sample)) {
reportError(Error.FATAL, new Exception("FAIL: input sample queue is full"));
return;

44
mobile/android/base/java/org/mozilla/gecko/media/CodecProxy.java
View File

@ -170,34 +170,40 @@ public final class CodecProxy {
Log.e(LOGTAG, "cannot send input to an ended codec");
return false;
}
boolean eos = info.flags == MediaCodec.BUFFER_FLAG_END_OF_STREAM;
mCallbacks.setEndOfInput(eos);
if (eos) {
return sendInput(Sample.EOS);
}
try {
return sendInput(mRemote.dequeueInput(info.size).set(bytes, info, cryptoInfo));
} catch (RemoteException e) {
Log.e(LOGTAG, "fail to dequeue input buffer", e);
return false;
} catch (IOException e) {
Log.e(LOGTAG, "fail to copy input data.", e);
// Balance dequeue/queue.
return sendInput(null);
}
}
private boolean sendInput(Sample sample) {
try {
Sample sample = processInput(bytes, info, cryptoInfo);
if (sample == null) {
return false;
}
mRemote.queueInput(sample);
sample.dispose();
if (sample != null) {
sample.dispose();
}
} catch (Exception e) {
Log.e(LOGTAG, "fail to input sample: size=" + info.size +
", pts=" + info.presentationTimeUs +
", flags=" + Integer.toHexString(info.flags), e);
Log.e(LOGTAG, "fail to queue input:" + sample, e);
return false;
}
return true;
}
private Sample processInput(ByteBuffer bytes, BufferInfo info, CryptoInfo cryptoInfo)
throws RemoteException, IOException {
if (info.flags == MediaCodec.BUFFER_FLAG_END_OF_STREAM) {
mCallbacks.setEndOfInput(true);
return Sample.EOS;
} else {
mCallbacks.setEndOfInput(false);
return mRemote.dequeueInput(info.size).set(bytes, info, cryptoInfo);
}
}
@WrapForJNI
public synchronized boolean flush() {
if (mRemote == null) {