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

4
sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
View File

@ -246,10 +246,6 @@ class AndroidVideoDecoder implements VideoDecoder, VideoSink {
Logging.e(TAG, "decode() - key frame required first");
return VideoCodecStatus.NO_OUTPUT;
}
if (!frame.completeFrame) {
Logging.e(TAG, "decode() - complete frame required first");
return VideoCodecStatus.NO_OUTPUT;
}
}
int index;

4
sdk/android/src/jni/encoded_image.cc
View File

@ -70,7 +70,7 @@ ScopedJavaLocalRef<jobject> NativeToJavaEncodedImage(
static_cast<int>(image._encodedWidth),
static_cast<int>(image._encodedHeight),
image.capture_time_ms_ * rtc::kNumNanosecsPerMillisec, frame_type,
static_cast<jint>(image.rotation_), image._completeFrame, qp);
static_cast<jint>(image.rotation_), qp);
}
ScopedJavaLocalRef<jobjectArray> NativeToJavaFrameTypeArray(
@ -98,8 +98,6 @@ EncodedImage JavaToNativeEncodedImage(JNIEnv* env,
Java_EncodedImage_getEncodedHeight(env, j_encoded_image);
frame.rotation_ =
(VideoRotation)Java_EncodedImage_getRotation(env, j_encoded_image);
frame._completeFrame =
Java_EncodedImage_getCompleteFrame(env, j_encoded_image);
frame.qp_ = JavaToNativeOptionalInt(
env, Java_EncodedImage_getQp(env, j_encoded_image))