Commit be3c7144 authored by philipel's avatar philipel Committed by Commit Bot

Remove logic related to incomplete WebRTC frames.

Related WebRTC CLs:
https://webrtc-review.googlesource.com/c/src/+/190680
https://webrtc-review.googlesource.com/c/src/+/190860

Bug: webrtc:9378, webrtc:7408
Change-Id: I9a4a672ea2e68bd2d1991a78a509439c9b36d05e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2510130Reviewed-by: default avatarFrank Liberato <liberato@chromium.org>
Reviewed-by: default avatarJoe Downing <joedow@google.com>
Reviewed-by: default avatarLambros Lambrou <lambroslambrou@chromium.org>
Commit-Queue: Philip Eliasson <philipel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823224}
parent d6fda399
...@@ -114,7 +114,6 @@ webrtc::EncodedImageCallback::Result WebrtcDummyVideoEncoder::SendEncodedFrame( ...@@ -114,7 +114,6 @@ webrtc::EncodedImageCallback::Result WebrtcDummyVideoEncoder::SendEncodedFrame(
webrtc::EncodedImageBuffer::Create(buffer, buffer_size)); webrtc::EncodedImageBuffer::Create(buffer, buffer_size));
encoded_image._encodedWidth = frame.size.width(); encoded_image._encodedWidth = frame.size.width();
encoded_image._encodedHeight = frame.size.height(); encoded_image._encodedHeight = frame.size.height();
encoded_image._completeFrame = true;
encoded_image._frameType = frame.key_frame encoded_image._frameType = frame.key_frame
? webrtc::VideoFrameType::kVideoFrameKey ? webrtc::VideoFrameType::kVideoFrameKey
: webrtc::VideoFrameType::kVideoFrameDelta; : webrtc::VideoFrameType::kVideoFrameDelta;
......
...@@ -288,8 +288,8 @@ int32_t RTCVideoDecoderAdapter::Decode(const webrtc::EncodedImage& input_image, ...@@ -288,8 +288,8 @@ int32_t RTCVideoDecoderAdapter::Decode(const webrtc::EncodedImage& input_image,
#endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_ASH) #endif // defined(ARCH_CPU_X86_FAMILY) && BUILDFLAG(IS_ASH)
} }
if (missing_frames || !input_image._completeFrame) { if (missing_frames) {
DVLOG(2) << "Missing or incomplete frames"; DVLOG(2) << "Missing frames";
// We probably can't handle broken frames. Request a key frame. // We probably can't handle broken frames. Request a key frame.
return WEBRTC_VIDEO_CODEC_ERROR; return WEBRTC_VIDEO_CODEC_ERROR;
} }
......
...@@ -190,7 +190,6 @@ class RTCVideoDecoderAdapterTest : public ::testing::Test { ...@@ -190,7 +190,6 @@ class RTCVideoDecoderAdapterTest : public ::testing::Test {
input_image.SetEncodedData( input_image.SetEncodedData(
webrtc::EncodedImageBuffer::Create(data, sizeof(data))); webrtc::EncodedImageBuffer::Create(data, sizeof(data)));
input_image._frameType = webrtc::VideoFrameType::kVideoFrameKey; input_image._frameType = webrtc::VideoFrameType::kVideoFrameKey;
input_image._completeFrame = true;
input_image.SetTimestamp(timestamp); input_image.SetTimestamp(timestamp);
return rtc_video_decoder_adapter_->Decode(input_image, false, 0); return rtc_video_decoder_adapter_->Decode(input_image, false, 0);
} }
...@@ -222,7 +221,6 @@ class RTCVideoDecoderAdapterTest : public ::testing::Test { ...@@ -222,7 +221,6 @@ class RTCVideoDecoderAdapterTest : public ::testing::Test {
static const uint8_t data[1] = {0}; static const uint8_t data[1] = {0};
input_image.SetEncodedData( input_image.SetEncodedData(
webrtc::EncodedImageBuffer::Create(data, sizeof(data))); webrtc::EncodedImageBuffer::Create(data, sizeof(data)));
input_image._completeFrame = true;
input_image._frameType = webrtc::VideoFrameType::kVideoFrameKey; input_image._frameType = webrtc::VideoFrameType::kVideoFrameKey;
input_image.SetTimestamp(timestamp); input_image.SetTimestamp(timestamp);
webrtc::ColorSpace webrtc_color_space; webrtc::ColorSpace webrtc_color_space;
......
...@@ -919,7 +919,6 @@ void RTCVideoEncoder::Impl::BitstreamBufferReady( ...@@ -919,7 +919,6 @@ void RTCVideoEncoder::Impl::BitstreamBufferReady(
(metadata.key_frame ? webrtc::VideoFrameType::kVideoFrameKey (metadata.key_frame ? webrtc::VideoFrameType::kVideoFrameKey
: webrtc::VideoFrameType::kVideoFrameDelta); : webrtc::VideoFrameType::kVideoFrameDelta);
image.content_type_ = video_content_type_; image.content_type_ = video_content_type_;
image._completeFrame = true;
webrtc::CodecSpecificInfo info; webrtc::CodecSpecificInfo info;
info.codecType = video_codec_type_; info.codecType = video_codec_type_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment