zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix and optimize input buffer filling in HardwareVideoEncoder.

Browse Source 
Previously input buffers would be filled incorrectly for sparsely
packed buffers where stride is not equal to the plane width.

Bug: webrtc:8478
Change-Id: I080fa3c354a27982bb996be8c1e41b103384e4bc
Reviewed-on: https://webrtc-review.googlesource.com/17321
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20550}
This commit is contained in:
Sami Kalliomäki
2017-11-02 11:25:58 +01:00
committed by Commit Bot
parent 4f167df8fa
commit f6515cd0e3
7 changed files with 310 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
View File

@ -567,36 +567,27 @@ class HardwareVideoEncoder implements VideoEncoder {
/**
* Enumeration of supported YUV color formats used for MediaCodec's input.
*/
private static enum YuvFormat {
private enum YuvFormat {
I420 {
@Override
void fillBuffer(ByteBuffer inputBuffer, VideoFrame.Buffer buffer) {
VideoFrame.I420Buffer i420 = buffer.toI420();
inputBuffer.put(i420.getDataY());
inputBuffer.put(i420.getDataU());
inputBuffer.put(i420.getDataV());
void fillBuffer(ByteBuffer dstBuffer, VideoFrame.Buffer srcBuffer) {
VideoFrame.I420Buffer i420 = srcBuffer.toI420();
YuvHelper.I420Copy(i420.getDataY(), i420.getStrideY(), i420.getDataU(), i420.getStrideU(),
i420.getDataV(), i420.getStrideV(), dstBuffer, i420.getWidth(), i420.getHeight());
i420.release();
}
},
NV12 {
@Override
void fillBuffer(ByteBuffer inputBuffer, VideoFrame.Buffer buffer) {
VideoFrame.I420Buffer i420 = buffer.toI420();
inputBuffer.put(i420.getDataY());
// Interleave the bytes from the U and V portions, starting with U.
ByteBuffer u = i420.getDataU();
ByteBuffer v = i420.getDataV();
int i = 0;
while (u.hasRemaining() && v.hasRemaining()) {
inputBuffer.put(u.get());
inputBuffer.put(v.get());
}
void fillBuffer(ByteBuffer dstBuffer, VideoFrame.Buffer srcBuffer) {
VideoFrame.I420Buffer i420 = srcBuffer.toI420();
YuvHelper.I420ToNV12(i420.getDataY(), i420.getStrideY(), i420.getDataU(), i420.getStrideU(),
i420.getDataV(), i420.getStrideV(), dstBuffer, i420.getWidth(), i420.getHeight());
i420.release();
}
};
abstract void fillBuffer(ByteBuffer inputBuffer, VideoFrame.Buffer buffer);
abstract void fillBuffer(ByteBuffer dstBuffer, VideoFrame.Buffer srcBuffer);
static YuvFormat valueOf(int colorFormat) {
switch (colorFormat) {