Removed _completeFrame since we never allow incomplete frames.
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}
diff --git a/sdk/android/api/org/webrtc/EncodedImage.java b/sdk/android/api/org/webrtc/EncodedImage.java
index b50136c..5824231 100644
--- a/sdk/android/api/org/webrtc/EncodedImage.java
+++ b/sdk/android/api/org/webrtc/EncodedImage.java
@@ -54,6 +54,7 @@
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 @@
@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 @@
this.captureTimeNs = captureTimeNs;
this.frameType = frameType;
this.rotation = rotation;
- this.completeFrame = completeFrame;
+ this.completeFrame = true;
this.qp = qp;
this.refCountDelegate = new RefCountDelegate(releaseCallback);
}
@@ -115,11 +116,6 @@
}
@CalledByNative
- private boolean getCompleteFrame() {
- return completeFrame;
- }
-
- @CalledByNative
private @Nullable Integer getQp() {
return qp;
}
@@ -136,7 +132,6 @@
private long captureTimeNs;
private EncodedImage.FrameType frameType;
private int rotation;
- private boolean completeFrame;
private @Nullable Integer qp;
private Builder() {}
@@ -178,8 +173,8 @@
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 EncodedImage createEncodedImage() {
return new EncodedImage(buffer, releaseCallback, encodedWidth, encodedHeight, captureTimeNs,
- frameType, rotation, completeFrame, qp);
+ frameType, rotation, qp);
}
}
}