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

Removed _completeFrame since we never allow incomplete frames.

Browse Source 
In the old jitter buffer the two VCMVideoProtection modes |kProtectionNone| and |kProtectionFEC| could be set on the jitter buffer for it to not wait for NACK and instead generate incomplete frames. This has not been possible for a long time.

Bug: webrtc:9378, webrtc:7408
Change-Id: I0a2d3ec34d721126c1128306d5fad88314f8d59f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190680
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32513}
This commit is contained in:
philipel
2020-10-28 15:50:15 +01:00
committed by Commit Bot
parent 2e08ca50cd
commit 1b0d5437c9
26 changed files with 15 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sdk/android/api/org/webrtc/EncodedImage.java
View File

@ -54,6 +54,7 @@ public class EncodedImage implements RefCounted {
public final long captureTimeNs;
public final FrameType frameType;
public final int rotation;
// TODO(philipel): Remove when downstream has been updated.
public final boolean completeFrame;
public final @Nullable Integer qp;
@ -71,7 +72,7 @@ public class EncodedImage implements RefCounted {
@CalledByNative
private EncodedImage(ByteBuffer buffer, @Nullable Runnable releaseCallback, int encodedWidth,
int encodedHeight, long captureTimeNs, FrameType frameType, int rotation,
boolean completeFrame, @Nullable Integer qp) {
@Nullable Integer qp) {
this.buffer = buffer;
this.encodedWidth = encodedWidth;
this.encodedHeight = encodedHeight;
@ -79,7 +80,7 @@ public class EncodedImage implements RefCounted {
this.captureTimeNs = captureTimeNs;
this.frameType = frameType;
this.rotation = rotation;
this.completeFrame = completeFrame;
this.completeFrame = true;
this.qp = qp;
this.refCountDelegate = new RefCountDelegate(releaseCallback);
}
@ -114,11 +115,6 @@ public class EncodedImage implements RefCounted {
return rotation;
}
@CalledByNative
private boolean getCompleteFrame() {
return completeFrame;
}
@CalledByNative
private @Nullable Integer getQp() {
return qp;
@ -136,7 +132,6 @@ public class EncodedImage implements RefCounted {
private long captureTimeNs;
private EncodedImage.FrameType frameType;
private int rotation;
private boolean completeFrame;
private @Nullable Integer qp;
private Builder() {}
@ -178,8 +173,8 @@ public class EncodedImage implements RefCounted {
return this;
}
// TODO(philipel): Remove when downstream has been updated.
public Builder setCompleteFrame(boolean completeFrame) {
this.completeFrame = completeFrame;
return this;
}
@ -190,7 +185,7 @@ public class EncodedImage implements RefCounted {
public EncodedImage createEncodedImage() {
return new EncodedImage(buffer, releaseCallback, encodedWidth, encodedHeight, captureTimeNs,
frameType, rotation, completeFrame, qp);
frameType, rotation, qp);
}
}
}