mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove remaining variables related to incomplete frames.

Browse source 
Bug: webrtc:9378, webrtc:7408
Change-Id: I5b26f09a2da13906b421d0bcf615e721b66d4ce7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/190860
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32552}
This commit is contained in:
philipel 2020-10-30 12:04:33 +01:00 committed by Commit Bot
parent 1109dd0b39
commit c780f25f1a
6 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/video/encoded_image.h
View file

@ -165,8 +165,6 @@ class RTC_EXPORT EncodedImage {
VideoFrameType _frameType = VideoFrameType::kVideoFrameDelta; VideoFrameType _frameType = VideoFrameType::kVideoFrameDelta;
VideoRotation rotation_ = kVideoRotation_0; VideoRotation rotation_ = kVideoRotation_0;
VideoContentType content_type_ = VideoContentType::UNSPECIFIED; VideoContentType content_type_ = VideoContentType::UNSPECIFIED;
// TODO(philipel): Remove when downstream has been updated.
bool _completeFrame = false;
int qp_ = -1; // Quantizer value. int qp_ = -1; // Quantizer value.
// When an application indicates non-zero values here, it is taken as an // When an application indicates non-zero values here, it is taken as an

8
sdk/android/api/org/webrtc/EncodedImage.java
View file

@ -54,8 +54,6 @@ public class EncodedImage implements RefCounted {
public final long captureTimeNs; public final long captureTimeNs;
public final FrameType frameType; public final FrameType frameType;
public final int rotation; public final int rotation;
// TODO(philipel): Remove when downstream has been updated.
public final boolean completeFrame;
public final @Nullable Integer qp; public final @Nullable Integer qp;
// TODO(bugs.webrtc.org/9378): Use retain and release from jni code. // 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.captureTimeNs = captureTimeNs;
this.frameType = frameType; this.frameType = frameType;
this.rotation = rotation; this.rotation = rotation;
this.completeFrame = true;
this.qp = qp; this.qp = qp;
this.refCountDelegate = new RefCountDelegate(releaseCallback); this.refCountDelegate = new RefCountDelegate(releaseCallback);
} }
@ -173,11 +170,6 @@ public class EncodedImage implements RefCounted {
return this; return this;
} }
// TODO(philipel): Remove when downstream has been updated.
public Builder setCompleteFrame(boolean completeFrame) {
return this;
}
public Builder setQp(@Nullable Integer qp) { public Builder setQp(@Nullable Integer qp) {
this.qp = qp; this.qp = qp;
return this; return this;

1
sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
View file

@ -370,7 +370,6 @@ class HardwareVideoEncoder implements VideoEncoder {
int bufferSize = videoFrameBuffer.getHeight() * videoFrameBuffer.getWidth() * 3 / 2; int bufferSize = videoFrameBuffer.getHeight() * videoFrameBuffer.getWidth() * 3 / 2;
EncodedImage.Builder builder = EncodedImage.builder() EncodedImage.Builder builder = EncodedImage.builder()
.setCaptureTimeNs(videoFrame.getTimestampNs()) .setCaptureTimeNs(videoFrame.getTimestampNs())
.setCompleteFrame(true)
.setEncodedWidth(videoFrame.getBuffer().getWidth()) .setEncodedWidth(videoFrame.getBuffer().getWidth())
.setEncodedHeight(videoFrame.getBuffer().getHeight()) .setEncodedHeight(videoFrame.getBuffer().getHeight())
.setRotation(videoFrame.getRotation()); .setRotation(videoFrame.getRotation());

1
sdk/android/tests/src/org/webrtc/AndroidVideoDecoderTest.java
View file

@ -187,7 +187,6 @@ public class AndroidVideoDecoderTest {
return EncodedImage.builder() return EncodedImage.builder()
.setBuffer(ByteBuffer.wrap(ENCODED_TEST_DATA), null) .setBuffer(ByteBuffer.wrap(ENCODED_TEST_DATA), null)
.setFrameType(FrameType.VideoFrameKey) .setFrameType(FrameType.VideoFrameKey)
.setCompleteFrame(true)
.createEncodedImage(); .createEncodedImage();
} }

2
sdk/objc/base/RTCEncodedImage.h
View file

@ -44,8 +44,6 @@ RTC_OBJC_EXPORT
@property(nonatomic, assign) int64_t encodeFinishMs; @property(nonatomic, assign) int64_t encodeFinishMs;
@property(nonatomic, assign) RTCFrameType frameType; @property(nonatomic, assign) RTCFrameType frameType;
@property(nonatomic, assign) RTCVideoRotation rotation; @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, strong) NSNumber *qp;
@property(nonatomic, assign) RTCVideoContentType contentType; @property(nonatomic, assign) RTCVideoContentType contentType;

1
sdk/objc/base/RTCEncodedImage.m
View file

@ -23,7 +23,6 @@
@synthesize encodeFinishMs = _encodeFinishMs; @synthesize encodeFinishMs = _encodeFinishMs;
@synthesize frameType = _frameType; @synthesize frameType = _frameType;
@synthesize rotation = _rotation; @synthesize rotation = _rotation;
@synthesize completeFrame = _completeFrame;
@synthesize qp = _qp; @synthesize qp = _qp;
@synthesize contentType = _contentType; @synthesize contentType = _contentType;