zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Delete VideoFrame default constructor, and IsZeroSize method. (patchset #5 id:80001 of https://codereview.webrtc.org/2541863002/ )

Browse Source 
Reason for revert:
Crashes perf tests, e.g.,

./out/Debug/webrtc_perf_tests --gtest_filter='FullStackTest.ScreenshareSlidesVP8_2TL_VeryLossyNet'

dies with an assert related to rtc::Optional.

Original issue's description:
> Delete VideoFrame default constructor, and IsZeroSize method.
>
> This ensures that the video_frame_buffer method never can return a
> null pointer.
>
> BUG=webrtc:6591
>
> Committed: https://crrev.com/bfcf561923a42005e4c7d66d8e72e5932155f997
> Cr-Commit-Position: refs/heads/master@{#15574}

TBR=magjed@webrtc.org,stefan@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6591

Review-Url: https://codereview.webrtc.org/2574123002
Cr-Commit-Position: refs/heads/master@{#15597}
This commit is contained in:
nisse
2016-12-14 02:06:44 -08:00
committed by Commit bot
parent 7b2516620c
commit 0989fbcad2
19 changed files with 93 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/common_video/i420_video_frame_unittest.cc
View File

@ -111,6 +111,12 @@ void CheckRotate(int width, int height, webrtc::VideoRotation rotation,
} // namespace
TEST(TestVideoFrame, InitialValues) {
VideoFrame frame;
EXPECT_TRUE(frame.IsZeroSize());
EXPECT_EQ(kVideoRotation_0, frame.rotation());
}
TEST(TestVideoFrame, WidthHeightValues) {
VideoFrame frame(I420Buffer::Create(10, 10, 10, 14, 90),
webrtc::kVideoRotation_0,

2
webrtc/common_video/libyuv/webrtc_libyuv.cc
View File

@ -128,6 +128,8 @@ int PrintVideoFrame(const VideoFrameBuffer& frame, FILE* file) {
}
int PrintVideoFrame(const VideoFrame& frame, FILE* file) {
if (frame.IsZeroSize())
return -1;
return PrintVideoFrame(*frame.video_frame_buffer(), file);
}

11
webrtc/common_video/video_frame.cc
View File

@ -23,6 +23,13 @@ namespace webrtc {
// to optimized bitstream readers. See avcodec_decode_video2.
const size_t EncodedImage::kBufferPaddingBytesH264 = 8;
VideoFrame::VideoFrame()
: video_frame_buffer_(nullptr),
timestamp_rtp_(0),
ntp_time_ms_(0),
timestamp_us_(0),
rotation_(kVideoRotation_0) {}
VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
webrtc::VideoRotation rotation,
int64_t timestamp_us)
@ -52,6 +59,10 @@ int VideoFrame::height() const {
return video_frame_buffer_ ? video_frame_buffer_->height() : 0;
}
bool VideoFrame::IsZeroSize() const {
return !video_frame_buffer_;
}
rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const {
return video_frame_buffer_;
}

9
webrtc/media/base/videobroadcaster_unittest.cc
View File

@ -37,15 +37,8 @@ TEST(VideoBroadcasterTest, OnFrame) {
FakeVideoRenderer sink2;
broadcaster.AddOrUpdateSink(&sink1, rtc::VideoSinkWants());
broadcaster.AddOrUpdateSink(&sink2, rtc::VideoSinkWants());
static int kWidth = 100;
static int kHeight = 50;
rtc::scoped_refptr<webrtc::I420Buffer> buffer(
webrtc::I420Buffer::Create(kWidth, kHeight));
// Initialize, to avoid warnings on use of initialized values.
buffer->SetToBlack();
webrtc::VideoFrame frame(buffer, webrtc::kVideoRotation_0, 0);
webrtc::VideoFrame frame;
broadcaster.OnFrame(frame);
EXPECT_EQ(1, sink1.num_rendered_frames());

26
webrtc/media/engine/fakewebrtccall.cc
View File

@ -161,28 +161,27 @@ int FakeVideoSendStream::GetNumberOfSwappedFrames() const {
}
int FakeVideoSendStream::GetLastWidth() const {
return last_frame_->width();
return last_frame_.width();
}
int FakeVideoSendStream::GetLastHeight() const {
return last_frame_->height();
return last_frame_.height();
}
int64_t FakeVideoSendStream::GetLastTimestamp() const {
RTC_DCHECK(last_frame_->ntp_time_ms() == 0);
return last_frame_->render_time_ms();
RTC_DCHECK(last_frame_.ntp_time_ms() == 0);
return last_frame_.render_time_ms();
}
void FakeVideoSendStream::OnFrame(const webrtc::VideoFrame& frame) {
++num_swapped_frames_;
if (!last_frame_ ||
frame.width() != last_frame_->width() ||
frame.height() != last_frame_->height() ||
frame.rotation() != last_frame_->rotation()) {
if (frame.width() != last_frame_.width() ||
frame.height() != last_frame_.height() ||
frame.rotation() != last_frame_.rotation()) {
video_streams_ = encoder_config_.video_stream_factory->CreateEncoderStreams(
frame.width(), frame.height(), encoder_config_);
}
last_frame_ = rtc::Optional<webrtc::VideoFrame>(frame);
last_frame_ = frame;
}
void FakeVideoSendStream::SetStats(
@ -203,15 +202,8 @@ void FakeVideoSendStream::EnableEncodedFrameRecording(
void FakeVideoSendStream::ReconfigureVideoEncoder(
webrtc::VideoEncoderConfig config) {
int width, height;
if (last_frame_) {
width = last_frame_->width();
height = last_frame_->height();
} else {
width = height = 0;
}
video_streams_ = config.video_stream_factory->CreateEncoderStreams(
width, height, config);
last_frame_.width(), last_frame_.height(), config);
if (config.encoder_specific_settings != NULL) {
if (config_.encoder_settings.payload_name == "VP8") {
config.encoder_specific_settings->FillVideoCodecVp8(&vpx_settings_.vp8);

2
webrtc/media/engine/fakewebrtccall.h
View File

@ -165,7 +165,7 @@ class FakeVideoSendStream final
bool resolution_scaling_enabled_;
rtc::VideoSourceInterface<webrtc::VideoFrame>* source_;
int num_swapped_frames_;
rtc::Optional<webrtc::VideoFrame> last_frame_;
webrtc::VideoFrame last_frame_;
webrtc::VideoSendStream::Stats stats_;
int num_encoder_reconfigurations_ = 0;
};

4
webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc
View File

@ -308,6 +308,10 @@ int32_t H264EncoderImpl::Encode(const VideoFrame& input_frame,
ReportError();
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
if (input_frame.IsZeroSize()) {
ReportError();
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
}
if (!encoded_image_callback_) {
LOG(LS_WARNING) << "InitEncode() has been called, but a callback function "
<< "has not been set with RegisterEncodeCompleteCallback()";

1
webrtc/modules/video_coding/codecs/i420/include/i420.h
View File

@ -131,6 +131,7 @@ class I420Decoder : public VideoDecoder {
uint16_t* width,
uint16_t* height);
VideoFrame _decodedImage;
int _width;
int _height;
bool _inited;

1
webrtc/modules/video_coding/codecs/test/videoprocessor.h
View File

@ -204,6 +204,7 @@ class VideoProcessorImpl : public VideoProcessor {
// Keep track of the last successful frame, since we need to write that
// when decoding fails:
uint8_t* last_successful_frame_buffer_;
webrtc::VideoFrame source_frame_;
// To keep track of if we have excluded the first key frame from packet loss:
bool first_key_frame_has_been_excluded_;
// To tell the decoder previous frame have been dropped due to packet loss:

1
webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc
View File

@ -300,6 +300,7 @@ int SimulcastEncoderAdapter::Encode(
// TODO(perkj): ensure that works going forward, and figure out how this
// affects webrtc:5683.
if ((dst_width == src_width && dst_height == src_height) ||
input_image.IsZeroSize() ||
input_image.video_frame_buffer()->native_handle()) {
int ret = streaminfos_[stream_idx].encoder->Encode(
input_image, codec_specific_info, &stream_frame_types);

23
webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
View File

@ -13,7 +13,6 @@
#include <memory>
#include "webrtc/base/checks.h"
#include "webrtc/base/optional.h"
#include "webrtc/base/timeutils.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
@ -89,7 +88,7 @@ bool Vp8UnitTestEncodeCompleteCallback::EncodeComplete() {
class Vp8UnitTestDecodeCompleteCallback : public webrtc::DecodedImageCallback {
public:
explicit Vp8UnitTestDecodeCompleteCallback(rtc::Optional<VideoFrame>* frame)
explicit Vp8UnitTestDecodeCompleteCallback(VideoFrame* frame)
: decoded_frame_(frame), decode_complete(false) {}
int32_t Decoded(VideoFrame& frame) override;
int32_t Decoded(VideoFrame& frame, int64_t decode_time_ms) override {
@ -99,7 +98,7 @@ class Vp8UnitTestDecodeCompleteCallback : public webrtc::DecodedImageCallback {
bool DecodeComplete();
private:
rtc::Optional<VideoFrame>* decoded_frame_;
VideoFrame* decoded_frame_;
bool decode_complete;
};
@ -112,7 +111,7 @@ bool Vp8UnitTestDecodeCompleteCallback::DecodeComplete() {
}
int Vp8UnitTestDecodeCompleteCallback::Decoded(VideoFrame& image) {
*decoded_frame_ = rtc::Optional<VideoFrame>(image);
*decoded_frame_ = image;
decode_complete = true;
return 0;
}
@ -185,8 +184,8 @@ class TestVp8Impl : public ::testing::Test {
int64_t startTime = rtc::TimeMillis();
while (rtc::TimeMillis() - startTime < kMaxWaitDecTimeMs) {
if (decode_complete_callback_->DecodeComplete()) {
return CalcBufferSize(kI420, decoded_frame_->width(),
decoded_frame_->height());
return CalcBufferSize(kI420, decoded_frame_.width(),
decoded_frame_.height());
}
}
return 0;
@ -203,7 +202,7 @@ class TestVp8Impl : public ::testing::Test {
std::unique_ptr<VideoEncoder> encoder_;
std::unique_ptr<VideoDecoder> decoder_;
EncodedImage encoded_frame_;
rtc::Optional<VideoFrame> decoded_frame_;
VideoFrame decoded_frame_;
VideoCodec codec_inst_;
TemporalLayersFactory tl_factory_;
};
@ -253,11 +252,10 @@ TEST_F(TestVp8Impl, MAYBE_AlignedStrideEncodeDecode) {
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
decoder_->Decode(encoded_frame_, false, NULL));
EXPECT_GT(WaitForDecodedFrame(), 0u);
ASSERT_TRUE(decoded_frame_);
// Compute PSNR on all planes (faster than SSIM).
EXPECT_GT(I420PSNR(input_frame_.get(), &*decoded_frame_), 36);
EXPECT_EQ(kTestTimestamp, decoded_frame_->timestamp());
EXPECT_EQ(kTestNtpTimeMs, decoded_frame_->ntp_time_ms());
EXPECT_GT(I420PSNR(input_frame_.get(), &decoded_frame_), 36);
EXPECT_EQ(kTestTimestamp, decoded_frame_.timestamp());
EXPECT_EQ(kTestNtpTimeMs, decoded_frame_.ntp_time_ms());
}
#if defined(WEBRTC_ANDROID)
@ -282,8 +280,7 @@ TEST_F(TestVp8Impl, MAYBE_DecodeWithACompleteKeyFrame) {
encoded_frame_._frameType = kVideoFrameKey;
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
decoder_->Decode(encoded_frame_, false, NULL));
ASSERT_TRUE(decoded_frame_);
EXPECT_GT(I420PSNR(input_frame_.get(), &*decoded_frame_), 36);
EXPECT_GT(I420PSNR(input_frame_.get(), &decoded_frame_), 36);
}
} // namespace webrtc

2
webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
View File

@ -660,6 +660,8 @@ int VP8EncoderImpl::Encode(const VideoFrame& frame,
if (!inited_)
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
if (frame.IsZeroSize())
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
if (encoded_complete_callback_ == NULL)
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;

3
webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc
View File

@ -486,6 +486,9 @@ int VP9EncoderImpl::Encode(const VideoFrame& input_image,
if (!inited_) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}
if (input_image.IsZeroSize()) {
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
}
if (encoded_complete_callback_ == NULL) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}

10
webrtc/modules/video_coding/generic_encoder.cc
View File

@ -123,14 +123,8 @@ int32_t VCMGenericEncoder::SetPeriodicKeyFrames(bool enable) {
int32_t VCMGenericEncoder::RequestFrame(
const std::vector<FrameType>& frame_types) {
RTC_DCHECK_RUNS_SERIALIZED(&race_checker_);
// TODO(nisse): Used only with internal source. Delete as soon as
// that feature is removed. The only implementation I've been able
// to find ignores what's in the frame.
return encoder_->Encode(VideoFrame(I420Buffer::Create(1, 1),
kVideoRotation_0, 0),
NULL, &frame_types);
return 0;
VideoFrame image;
return encoder_->Encode(image, NULL, &frame_types);
}
bool VCMGenericEncoder::InternalSource() const {

1
webrtc/sdk/objc/Framework/Classes/h264_video_toolbox_encoder.mm
View File

@ -380,6 +380,7 @@ int H264VideoToolboxEncoder::Encode(
// |input_frame| size should always match codec settings.
RTC_DCHECK_EQ(frame.width(), width_);
RTC_DCHECK_EQ(frame.height(), height_);
RTC_DCHECK(!frame.IsZeroSize());
if (!callback_ || !compression_session_) {
return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
}

8
webrtc/test/frame_generator.cc
View File

@ -188,7 +188,7 @@ class ScrollingImageFrameGenerator : public FrameGenerator {
}
CropSourceToScrolledImage(scroll_factor);
return current_frame_ ? &*current_frame_ : nullptr;
return &current_frame_;
}
void UpdateSourceFrame(size_t frame_num) {
@ -219,14 +219,14 @@ class ScrollingImageFrameGenerator : public FrameGenerator {
rtc::scoped_refptr<VideoFrameBuffer> frame_buffer(
current_source_frame_->video_frame_buffer());
current_frame_ = rtc::Optional<webrtc::VideoFrame>(webrtc::VideoFrame(
current_frame_ = webrtc::VideoFrame(
new rtc::RefCountedObject<webrtc::WrappedI420Buffer>(
target_width_, target_height_,
&frame_buffer->DataY()[offset_y], frame_buffer->StrideY(),
&frame_buffer->DataU()[offset_u], frame_buffer->StrideU(),
&frame_buffer->DataV()[offset_v], frame_buffer->StrideV(),
KeepRefUntilDone(frame_buffer)),
kVideoRotation_0, 0));
kVideoRotation_0, 0);
}
Clock* const clock_;
@ -239,7 +239,7 @@ class ScrollingImageFrameGenerator : public FrameGenerator {
size_t current_frame_num_;
VideoFrame* current_source_frame_;
rtc::Optional<VideoFrame> current_frame_;
VideoFrame current_frame_;
YuvFileGenerator file_generator_;
};

50
webrtc/video/video_quality_test.cc
View File

@ -371,7 +371,6 @@ class VideoAnalyzer : public PacketReceiver,
struct FrameComparison {
FrameComparison()
: dropped(false),
input_time_ms(0),
send_time_ms(0),
recv_time_ms(0),
render_time_ms(0),
@ -380,7 +379,6 @@ class VideoAnalyzer : public PacketReceiver,
FrameComparison(const VideoFrame& reference,
const VideoFrame& render,
bool dropped,
int64_t input_time_ms,
int64_t send_time_ms,
int64_t recv_time_ms,
int64_t render_time_ms,
@ -388,29 +386,14 @@ class VideoAnalyzer : public PacketReceiver,
: reference(reference),
render(render),
dropped(dropped),
input_time_ms(input_time_ms),
send_time_ms(send_time_ms),
recv_time_ms(recv_time_ms),
render_time_ms(render_time_ms),
encoded_frame_size(encoded_frame_size) {}
FrameComparison(bool dropped,
int64_t input_time_ms,
int64_t send_time_ms,
int64_t recv_time_ms,
int64_t render_time_ms,
size_t encoded_frame_size)
: dropped(dropped),
input_time_ms(input_time_ms),
send_time_ms(send_time_ms),
recv_time_ms(recv_time_ms),
render_time_ms(render_time_ms),
encoded_frame_size(encoded_frame_size) {}
rtc::Optional<VideoFrame> reference;
rtc::Optional<VideoFrame> render;
VideoFrame reference;
VideoFrame render;
bool dropped;
int64_t input_time_ms;
int64_t send_time_ms;
int64_t recv_time_ms;
int64_t render_time_ms;
@ -493,18 +476,21 @@ class VideoAnalyzer : public PacketReceiver,
if (it != encoded_frame_sizes_.end())
encoded_frame_sizes_.erase(it);
VideoFrame reference_copy;
VideoFrame render_copy;
rtc::CritScope crit(&comparison_lock_);
if (comparisons_.size() < kMaxComparisons) {
comparisons_.push_back(FrameComparison(reference, render, dropped,
reference.ntp_time_ms(),
send_time_ms, recv_time_ms,
render_time_ms, encoded_size));
reference_copy = reference;
render_copy = render;
} else {
comparisons_.push_back(FrameComparison(dropped,
reference.ntp_time_ms(),
send_time_ms, recv_time_ms,
render_time_ms, encoded_size));
// Copy the time to ensure that delay calculations can still be made.
reference_copy.set_ntp_time_ms(reference.ntp_time_ms());
render_copy.set_ntp_time_ms(render.ntp_time_ms());
}
comparisons_.push_back(FrameComparison(reference_copy, render_copy, dropped,
send_time_ms, recv_time_ms,
render_time_ms, encoded_size));
comparison_available_event_.Set();
}
@ -541,6 +527,8 @@ class VideoAnalyzer : public PacketReceiver,
if (AllFramesRecorded())
return false;
VideoFrame reference;
VideoFrame render;
FrameComparison comparison;
if (!PopComparison(&comparison)) {
@ -636,12 +624,12 @@ class VideoAnalyzer : public PacketReceiver,
// Perform expensive psnr and ssim calculations while not holding lock.
double psnr = -1.0;
double ssim = -1.0;
if (comparison.reference) {
psnr = I420PSNR(&*comparison.reference, &*comparison.render);
ssim = I420SSIM(&*comparison.reference, &*comparison.render);
if (!comparison.reference.IsZeroSize()) {
psnr = I420PSNR(&comparison.reference, &comparison.render);
ssim = I420SSIM(&comparison.reference, &comparison.render);
}
int64_t input_time_ms = comparison.reference->ntp_time_ms();
int64_t input_time_ms = comparison.reference.ntp_time_ms();
rtc::CritScope crit(&comparison_lock_);
if (graph_data_output_file_) {

4
webrtc/video/vie_encoder.cc
View File

@ -86,10 +86,10 @@ class ViEEncoder::EncodeTask : public rtc::QueuedTask {
ViEEncoder* vie_encoder,
int64_t time_when_posted_in_ms,
bool log_stats)
: frame_(frame),
vie_encoder_(vie_encoder),
: vie_encoder_(vie_encoder),
time_when_posted_ms_(time_when_posted_in_ms),
log_stats_(log_stats) {
frame_ = frame;
++vie_encoder_->posted_frames_waiting_for_encode_;
}

13
webrtc/video_frame.h
View File

@ -22,6 +22,10 @@ namespace webrtc {
class VideoFrame {
public:
// TODO(nisse): Deprecated. Using the default constructor violates the
// reasonable assumption that video_frame_buffer() returns a valid buffer.
VideoFrame();
// TODO(nisse): This constructor is consistent with
// cricket::WebRtcVideoFrame. After the class
// cricket::WebRtcVideoFrame and its baseclass cricket::VideoFrame
@ -102,6 +106,15 @@ class VideoFrame {
return timestamp_us() / rtc::kNumMicrosecsPerMillisec;
}
// Return true if and only if video_frame_buffer() is null. Which is possible
// only if the object was default-constructed.
// TODO(nisse): Deprecated. Should be deleted in the cricket::VideoFrame and
// webrtc::VideoFrame merge. The intention is that video_frame_buffer() never
// should return nullptr. To handle potentially uninitialized or non-existent
// frames, consider using rtc::Optional. Otherwise, IsZeroSize() can be
// replaced by video_frame_buffer() == nullptr.
bool IsZeroSize() const;
// Return the underlying buffer. Never nullptr for a properly
// initialized VideoFrame.
rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const;