Skip to content

Fixed handling of empty buffer in VP8 #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed handling of empty buffer in VP8 #93

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01340ac
Fixed handling of empty buffer
mondain Mar 2, 2016
8c9a19c
Modified based on comments from bgrozev
mondain Mar 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 31 additions & 7 deletions src/org/jitsi/impl/neomedia/codec/video/vp8/DePacketizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,23 @@ protected int doProcess(Buffer inBuffer, Buffer outBuffer)
= VP8PayloadDescriptor.isStartOfFrame(inData, inOffset);
int inLength = inBuffer.getLength();
int inPdSize = VP8PayloadDescriptor.getSize(inData, inOffset);
// handle when inbuffer is empty.
if (inLength < 1)
{
if (logger.isDebugEnabled())
{
logger.debug("inBuffer is empty");
}
outBuffer.setDiscard(true);
return BUFFER_PROCESSED_OK;
}
//TODO handle VP8PayloadDescriptor returning invalid.
int inPayloadLength = inLength - inPdSize;
if (logger.isTraceEnabled())
{
logger.trace("inPayload length " + inPayloadLength + " inLength " +
inLength);
}

if (empty
&& lastSentSeq != -1
Expand Down Expand Up @@ -384,13 +400,21 @@ protected int doProcess(Buffer inBuffer, Buffer outBuffer)
for (Map.Entry<Long, Container> entry : data.entrySet())
{
b = entry.getValue();
System.arraycopy(
b.buf,
0,
outData,
ptr,
b.len);
ptr += b.len;
try
{
System.arraycopy(
b.buf,
0,
outData,
ptr,
b.len);
ptr += b.len;
}
catch (Exception e)
{
// ensure frameLength 0 on copy failure
frameLength = 0;
}
}

outBuffer.setOffset(0);
Expand Down