mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00

This deletes the resilienceOn flag in VideoCodecVP8 and VideoCodecVP9. Instead, the implementations of VP8 and VP9 set resilience mode internally, based on the configuration of temporal and spatial layers. The nack_enabled argument to VideoCodecInitializer::SetupCodec becomes unused with this cl. In a followup, it will be deleted, together with the corresponding argument to VideoStreamEncoder methods. An applications which really wants to configure resilience differently can do that by injecting an EncoderFactory with encoders behaving as desired. Bug: webrtc:8830 Change-Id: I9990faf07d3e95c0fb4a56fcc9a56c2005b4a6fa Reviewed-on: https://webrtc-review.googlesource.com/71380 Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23025}
188 lines
6.1 KiB
C++
188 lines
6.1 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include <memory>
|
|
|
|
#include "api/video/i420_buffer.h"
|
|
#include "common_types.h" // NOLINT(build/include)
|
|
#include "media/base/mediaconstants.h"
|
|
#include "modules/video_coding/codecs/test/videoprocessor.h"
|
|
#include "modules/video_coding/include/mock/mock_video_codec_interface.h"
|
|
#include "modules/video_coding/include/video_coding.h"
|
|
#include "rtc_base/event.h"
|
|
#include "rtc_base/ptr_util.h"
|
|
#include "rtc_base/task_queue.h"
|
|
#include "test/gmock.h"
|
|
#include "test/gtest.h"
|
|
#include "test/testsupport/mock/mock_frame_reader.h"
|
|
#include "typedefs.h" // NOLINT(build/include)
|
|
|
|
using ::testing::_;
|
|
using ::testing::Property;
|
|
using ::testing::Return;
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
namespace {
|
|
|
|
const int kWidth = 352;
|
|
const int kHeight = 288;
|
|
const int kFrameSize = kWidth * kHeight * 3 / 2; // I420.
|
|
|
|
} // namespace
|
|
|
|
#define DO_SYNC(q, block) \
|
|
{ \
|
|
rtc::Event event(false, false); \
|
|
q.PostTask([&, this] { \
|
|
block; \
|
|
event.Set(); \
|
|
}); \
|
|
RTC_CHECK(event.Wait(rtc::Event::kForever)); \
|
|
}
|
|
|
|
class VideoProcessorTest : public testing::Test {
|
|
protected:
|
|
VideoProcessorTest() : q_("VP queue") {
|
|
config_.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, false, false,
|
|
false, kWidth, kHeight);
|
|
|
|
decoder_mock_ = new MockVideoDecoder();
|
|
decoders_.push_back(std::unique_ptr<VideoDecoder>(decoder_mock_));
|
|
|
|
ExpectInit();
|
|
EXPECT_CALL(frame_reader_mock_, FrameLength())
|
|
.WillRepeatedly(Return(kFrameSize));
|
|
DO_SYNC(q_, {
|
|
video_processor_ = rtc::MakeUnique<VideoProcessor>(
|
|
&encoder_mock_, &decoders_, &frame_reader_mock_, config_, &stats_,
|
|
nullptr /* encoded_frame_writer */,
|
|
nullptr /* decoded_frame_writer */);
|
|
});
|
|
}
|
|
|
|
~VideoProcessorTest() {
|
|
DO_SYNC(q_, { video_processor_.reset(); });
|
|
}
|
|
|
|
void ExpectInit() {
|
|
EXPECT_CALL(encoder_mock_, InitEncode(_, _, _)).Times(1);
|
|
EXPECT_CALL(encoder_mock_, RegisterEncodeCompleteCallback(_)).Times(1);
|
|
EXPECT_CALL(*decoder_mock_, InitDecode(_, _)).Times(1);
|
|
EXPECT_CALL(*decoder_mock_, RegisterDecodeCompleteCallback(_)).Times(1);
|
|
}
|
|
|
|
void ExpectRelease() {
|
|
EXPECT_CALL(encoder_mock_, Release()).Times(1);
|
|
EXPECT_CALL(encoder_mock_, RegisterEncodeCompleteCallback(_)).Times(1);
|
|
EXPECT_CALL(*decoder_mock_, Release()).Times(1);
|
|
EXPECT_CALL(*decoder_mock_, RegisterDecodeCompleteCallback(_)).Times(1);
|
|
}
|
|
|
|
rtc::TaskQueue q_;
|
|
|
|
TestConfig config_;
|
|
|
|
MockVideoEncoder encoder_mock_;
|
|
MockVideoDecoder* decoder_mock_;
|
|
std::vector<std::unique_ptr<VideoDecoder>> decoders_;
|
|
MockFrameReader frame_reader_mock_;
|
|
Stats stats_;
|
|
std::unique_ptr<VideoProcessor> video_processor_;
|
|
};
|
|
|
|
TEST_F(VideoProcessorTest, InitRelease) {
|
|
ExpectRelease();
|
|
}
|
|
|
|
TEST_F(VideoProcessorTest, ProcessFrames_FixedFramerate) {
|
|
const int kBitrateKbps = 456;
|
|
const int kFramerateFps = 31;
|
|
EXPECT_CALL(encoder_mock_, SetRateAllocation(_, kFramerateFps))
|
|
.Times(1)
|
|
.WillOnce(Return(0));
|
|
DO_SYNC(q_, { video_processor_->SetRates(kBitrateKbps, kFramerateFps); });
|
|
|
|
EXPECT_CALL(frame_reader_mock_, ReadFrame())
|
|
.WillRepeatedly(Return(I420Buffer::Create(kWidth, kHeight)));
|
|
EXPECT_CALL(
|
|
encoder_mock_,
|
|
Encode(Property(&VideoFrame::timestamp, 1 * 90000 / kFramerateFps), _, _))
|
|
.Times(1);
|
|
DO_SYNC(q_, { video_processor_->ProcessFrame(); });
|
|
|
|
EXPECT_CALL(
|
|
encoder_mock_,
|
|
Encode(Property(&VideoFrame::timestamp, 2 * 90000 / kFramerateFps), _, _))
|
|
.Times(1);
|
|
DO_SYNC(q_, { video_processor_->ProcessFrame(); });
|
|
|
|
ExpectRelease();
|
|
}
|
|
|
|
TEST_F(VideoProcessorTest, ProcessFrames_VariableFramerate) {
|
|
const int kBitrateKbps = 456;
|
|
const int kStartFramerateFps = 27;
|
|
const int kStartTimestamp = 90000 / kStartFramerateFps;
|
|
EXPECT_CALL(encoder_mock_, SetRateAllocation(_, kStartFramerateFps))
|
|
.Times(1)
|
|
.WillOnce(Return(0));
|
|
DO_SYNC(q_,
|
|
{ video_processor_->SetRates(kBitrateKbps, kStartFramerateFps); });
|
|
|
|
EXPECT_CALL(frame_reader_mock_, ReadFrame())
|
|
.WillRepeatedly(Return(I420Buffer::Create(kWidth, kHeight)));
|
|
EXPECT_CALL(encoder_mock_,
|
|
Encode(Property(&VideoFrame::timestamp, kStartTimestamp), _, _))
|
|
.Times(1);
|
|
DO_SYNC(q_, { video_processor_->ProcessFrame(); });
|
|
|
|
const int kNewFramerateFps = 13;
|
|
EXPECT_CALL(encoder_mock_, SetRateAllocation(_, kNewFramerateFps))
|
|
.Times(1)
|
|
.WillOnce(Return(0));
|
|
DO_SYNC(q_, { video_processor_->SetRates(kBitrateKbps, kNewFramerateFps); });
|
|
|
|
EXPECT_CALL(encoder_mock_,
|
|
Encode(Property(&VideoFrame::timestamp,
|
|
kStartTimestamp + 90000 / kNewFramerateFps),
|
|
_, _))
|
|
.Times(1);
|
|
DO_SYNC(q_, { video_processor_->ProcessFrame(); });
|
|
|
|
ExpectRelease();
|
|
}
|
|
|
|
TEST_F(VideoProcessorTest, SetRates) {
|
|
const int kBitrateKbps = 123;
|
|
const int kFramerateFps = 17;
|
|
EXPECT_CALL(encoder_mock_,
|
|
SetRateAllocation(
|
|
Property(&VideoBitrateAllocation::get_sum_kbps, kBitrateKbps),
|
|
kFramerateFps))
|
|
.Times(1);
|
|
DO_SYNC(q_, { video_processor_->SetRates(kBitrateKbps, kFramerateFps); });
|
|
|
|
const int kNewBitrateKbps = 456;
|
|
const int kNewFramerateFps = 34;
|
|
EXPECT_CALL(encoder_mock_,
|
|
SetRateAllocation(Property(&VideoBitrateAllocation::get_sum_kbps,
|
|
kNewBitrateKbps),
|
|
kNewFramerateFps))
|
|
.Times(1);
|
|
DO_SYNC(q_,
|
|
{ video_processor_->SetRates(kNewBitrateKbps, kNewFramerateFps); });
|
|
|
|
ExpectRelease();
|
|
}
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|