diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h index b4c29695e5..650766ab64 100644 --- a/api/video/encoded_image.h +++ b/api/video/encoded_image.h @@ -165,8 +165,6 @@ class RTC_EXPORT EncodedImage { VideoFrameType _frameType = VideoFrameType::kVideoFrameDelta; VideoRotation rotation_ = kVideoRotation_0; VideoContentType content_type_ = VideoContentType::UNSPECIFIED; - // TODO(philipel): Remove when downstream has been updated. - bool _completeFrame = false; int qp_ = -1; // Quantizer value. // When an application indicates non-zero values here, it is taken as an diff --git a/sdk/android/api/org/webrtc/EncodedImage.java b/sdk/android/api/org/webrtc/EncodedImage.java index 5824231d1f..84c420c425 100644 --- a/sdk/android/api/org/webrtc/EncodedImage.java +++ b/sdk/android/api/org/webrtc/EncodedImage.java @@ -54,8 +54,6 @@ 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; // TODO(bugs.webrtc.org/9378): Use retain and release from jni code. @@ -80,7 +78,6 @@ public class EncodedImage implements RefCounted { this.captureTimeNs = captureTimeNs; this.frameType = frameType; this.rotation = rotation; - this.completeFrame = true; this.qp = qp; this.refCountDelegate = new RefCountDelegate(releaseCallback); } @@ -173,11 +170,6 @@ public class EncodedImage implements RefCounted { return this; } - // TODO(philipel): Remove when downstream has been updated. - public Builder setCompleteFrame(boolean completeFrame) { - return this; - } - public Builder setQp(@Nullable Integer qp) { this.qp = qp; return this; diff --git a/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java b/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java index 42800aef10..f6d98bd14f 100644 --- a/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java +++ b/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java @@ -370,7 +370,6 @@ class HardwareVideoEncoder implements VideoEncoder { int bufferSize = videoFrameBuffer.getHeight() * videoFrameBuffer.getWidth() * 3 / 2; EncodedImage.Builder builder = EncodedImage.builder() .setCaptureTimeNs(videoFrame.getTimestampNs()) - .setCompleteFrame(true) .setEncodedWidth(videoFrame.getBuffer().getWidth()) .setEncodedHeight(videoFrame.getBuffer().getHeight()) .setRotation(videoFrame.getRotation()); diff --git a/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java b/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java index c1e8f6c3b3..644b24b1b3 100644 --- a/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java +++ b/sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java @@ -187,7 +187,6 @@ public class AndroidVideoDecoderTest { return EncodedImage.builder() .setBuffer(ByteBuffer.wrap(ENCODED_TEST_DATA), null) .setFrameType(FrameType.VideoFrameKey) - .setCompleteFrame(true) .createEncodedImage(); } diff --git a/sdk/objc/base/RTCEncodedImage.h b/sdk/objc/base/RTCEncodedImage.h index 6d7a602d33..28529e5906 100644 --- a/sdk/objc/base/RTCEncodedImage.h +++ b/sdk/objc/base/RTCEncodedImage.h @@ -44,8 +44,6 @@ RTC_OBJC_EXPORT @property(nonatomic, assign) int64_t encodeFinishMs; @property(nonatomic, assign) RTCFrameType frameType; @property(nonatomic, assign) RTCVideoRotation rotation; -// TODO(philipel): Remove when downstream has been updated. -@property(nonatomic, assign) BOOL completeFrame; @property(nonatomic, strong) NSNumber *qp; @property(nonatomic, assign) RTCVideoContentType contentType; diff --git a/sdk/objc/base/RTCEncodedImage.m b/sdk/objc/base/RTCEncodedImage.m index dec9630539..ad8441aabd 100644 --- a/sdk/objc/base/RTCEncodedImage.m +++ b/sdk/objc/base/RTCEncodedImage.m @@ -23,7 +23,6 @@ @synthesize encodeFinishMs = _encodeFinishMs; @synthesize frameType = _frameType; @synthesize rotation = _rotation; -@synthesize completeFrame = _completeFrame; @synthesize qp = _qp; @synthesize contentType = _contentType;