diff options
Diffstat (limited to 'webrtc/modules/video_coding/codecs/test')
12 files changed, 294 insertions, 331 deletions
diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc index 36ba0e8272..b554b4e9ae 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.cc @@ -57,7 +57,7 @@ int PacketManipulatorImpl::ManipulatePackets( active_burst_packets_--; nbr_packets_dropped++; } else if (RandomUniform() < config_.packet_loss_probability || - packet_loss_has_occurred) { + packet_loss_has_occurred) { packet_loss_has_occurred = true; nbr_packets_dropped++; if (config_.packet_loss_mode == kBurst) { @@ -91,9 +91,9 @@ inline double PacketManipulatorImpl::RandomUniform() { // get the same behavior as long as we're using a fixed initial seed. critsect_->Enter(); srand(random_seed_); - random_seed_ = rand(); + random_seed_ = rand(); // NOLINT (rand_r instead of rand) critsect_->Leave(); - return (random_seed_ + 1.0)/(RAND_MAX + 1.0); + return (random_seed_ + 1.0) / (RAND_MAX + 1.0); } const char* PacketLossModeToStr(PacketLossMode e) { @@ -109,4 +109,4 @@ const char* PacketLossModeToStr(PacketLossMode e) { } } // namespace test -} // namespace webrtcc +} // namespace webrtc diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h index 16a9dc22ef..3334be072b 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator.h @@ -13,7 +13,7 @@ #include <stdlib.h> -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/system_wrappers/include/critical_section_wrapper.h" #include "webrtc/test/testsupport/packet_reader.h" @@ -36,10 +36,11 @@ const char* PacketLossModeToStr(PacketLossMode e); // scenarios caused by network interference. struct NetworkingConfig { NetworkingConfig() - : packet_size_in_bytes(1500), max_payload_size_in_bytes(1440), - packet_loss_mode(kUniform), packet_loss_probability(0.0), - packet_loss_burst_length(1) { - } + : packet_size_in_bytes(1500), + max_payload_size_in_bytes(1440), + packet_loss_mode(kUniform), + packet_loss_probability(0.0), + packet_loss_burst_length(1) {} // Packet size in bytes. Default: 1500 bytes. size_t packet_size_in_bytes; @@ -93,9 +94,11 @@ class PacketManipulatorImpl : public PacketManipulator { virtual ~PacketManipulatorImpl(); int ManipulatePackets(webrtc::EncodedImage* encoded_image) override; virtual void InitializeRandomSeed(unsigned int seed); + protected: // Returns a uniformly distributed random value between 0.0 and 1.0 virtual double RandomUniform(); + private: PacketReader* packet_reader_; const NetworkingConfig& config_; diff --git a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc b/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc index ace7bc0507..8c3d30dc0d 100644 --- a/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/packet_manipulator_unittest.cc @@ -13,7 +13,7 @@ #include <queue> #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h" #include "webrtc/test/testsupport/unittest_utils.h" #include "webrtc/typedefs.h" @@ -25,7 +25,7 @@ const double kNeverDropProbability = 0.0; const double kAlwaysDropProbability = 1.0; const int kBurstLength = 1; -class PacketManipulatorTest: public PacketRelatedTest { +class PacketManipulatorTest : public PacketRelatedTest { protected: PacketReader packet_reader_; EncodedImage image_; @@ -50,19 +50,15 @@ class PacketManipulatorTest: public PacketRelatedTest { virtual ~PacketManipulatorTest() {} - void SetUp() { - PacketRelatedTest::SetUp(); - } + void SetUp() { PacketRelatedTest::SetUp(); } - void TearDown() { - PacketRelatedTest::TearDown(); - } + void TearDown() { PacketRelatedTest::TearDown(); } void VerifyPacketLoss(int expected_nbr_packets_dropped, int actual_nbr_packets_dropped, size_t expected_packet_data_length, uint8_t* expected_packet_data, - EncodedImage& actual_image) { + const EncodedImage& actual_image) { EXPECT_EQ(expected_nbr_packets_dropped, actual_nbr_packets_dropped); EXPECT_EQ(expected_packet_data_length, image_._length); EXPECT_EQ(0, memcmp(expected_packet_data, actual_image._buffer, @@ -75,10 +71,10 @@ TEST_F(PacketManipulatorTest, Constructor) { } TEST_F(PacketManipulatorTest, DropNone) { - PacketManipulatorImpl manipulator(&packet_reader_, no_drop_config_, false); + PacketManipulatorImpl manipulator(&packet_reader_, no_drop_config_, false); int nbr_packets_dropped = manipulator.ManipulatePackets(&image_); - VerifyPacketLoss(0, nbr_packets_dropped, kPacketDataLength, - packet_data_, image_); + VerifyPacketLoss(0, nbr_packets_dropped, kPacketDataLength, packet_data_, + image_); } TEST_F(PacketManipulatorTest, UniformDropNoneSmallFrame) { @@ -87,15 +83,14 @@ TEST_F(PacketManipulatorTest, UniformDropNoneSmallFrame) { PacketManipulatorImpl manipulator(&packet_reader_, no_drop_config_, false); int nbr_packets_dropped = manipulator.ManipulatePackets(&image_); - VerifyPacketLoss(0, nbr_packets_dropped, data_length, - packet_data_, image_); + VerifyPacketLoss(0, nbr_packets_dropped, data_length, packet_data_, image_); } TEST_F(PacketManipulatorTest, UniformDropAll) { PacketManipulatorImpl manipulator(&packet_reader_, drop_config_, false); int nbr_packets_dropped = manipulator.ManipulatePackets(&image_); - VerifyPacketLoss(kPacketDataNumberOfPackets, nbr_packets_dropped, - 0, packet_data_, image_); + VerifyPacketLoss(kPacketDataNumberOfPackets, nbr_packets_dropped, 0, + packet_data_, image_); } // Use our customized test class to make the second packet being lost diff --git a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc index c92cfa48a7..9eba205a88 100644 --- a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc +++ b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.cc @@ -19,13 +19,11 @@ namespace webrtc { namespace test { PredictivePacketManipulator::PredictivePacketManipulator( - PacketReader* packet_reader, const NetworkingConfig& config) - : PacketManipulatorImpl(packet_reader, config, false) { -} - -PredictivePacketManipulator::~PredictivePacketManipulator() { -} + PacketReader* packet_reader, + const NetworkingConfig& config) + : PacketManipulatorImpl(packet_reader, config, false) {} +PredictivePacketManipulator::~PredictivePacketManipulator() {} void PredictivePacketManipulator::AddRandomResult(double result) { assert(result >= 0.0 && result <= 1.0); @@ -33,8 +31,9 @@ void PredictivePacketManipulator::AddRandomResult(double result) { } double PredictivePacketManipulator::RandomUniform() { - if(random_results_.size() == 0u) { - fprintf(stderr, "No more stored results, please make sure AddRandomResult()" + if (random_results_.size() == 0u) { + fprintf(stderr, + "No more stored results, please make sure AddRandomResult()" "is called same amount of times you're going to invoke the " "RandomUniform() function, i.e. once per packet.\n"); assert(false); @@ -45,4 +44,4 @@ double PredictivePacketManipulator::RandomUniform() { } } // namespace test -} // namespace webrtcc +} // namespace webrtc diff --git a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h index 082712d870..45c7848c67 100644 --- a/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h +++ b/webrtc/modules/video_coding/codecs/test/predictive_packet_manipulator.h @@ -31,6 +31,7 @@ class PredictivePacketManipulator : public PacketManipulatorImpl { // FIFO queue so they will be returned in the same order they were added. // Result parameter must be 0.0 to 1.0. void AddRandomResult(double result); + protected: // Returns a uniformly distributed random value between 0.0 and 1.0 double RandomUniform() override; diff --git a/webrtc/modules/video_coding/codecs/test/stats.cc b/webrtc/modules/video_coding/codecs/test/stats.cc index f87407d223..478b2f4901 100644 --- a/webrtc/modules/video_coding/codecs/test/stats.cc +++ b/webrtc/modules/video_coding/codecs/test/stats.cc @@ -39,19 +39,19 @@ Stats::Stats() {} Stats::~Stats() {} bool LessForEncodeTime(const FrameStatistic& s1, const FrameStatistic& s2) { - return s1.encode_time_in_us < s2.encode_time_in_us; + return s1.encode_time_in_us < s2.encode_time_in_us; } bool LessForDecodeTime(const FrameStatistic& s1, const FrameStatistic& s2) { - return s1.decode_time_in_us < s2.decode_time_in_us; + return s1.decode_time_in_us < s2.decode_time_in_us; } bool LessForEncodedSize(const FrameStatistic& s1, const FrameStatistic& s2) { - return s1.encoded_frame_length_in_bytes < s2.encoded_frame_length_in_bytes; + return s1.encoded_frame_length_in_bytes < s2.encoded_frame_length_in_bytes; } bool LessForBitRate(const FrameStatistic& s1, const FrameStatistic& s2) { - return s1.bit_rate_in_kbps < s2.bit_rate_in_kbps; + return s1.bit_rate_in_kbps < s2.bit_rate_in_kbps; } FrameStatistic& Stats::NewFrame(int frame_number) { @@ -78,8 +78,7 @@ void Stats::PrintSummary() { size_t nbr_keyframes = 0; size_t nbr_nonkeyframes = 0; - for (FrameStatisticsIterator it = stats_.begin(); - it != stats_.end(); ++it) { + for (FrameStatisticsIterator it = stats_.begin(); it != stats_.end(); ++it) { total_encoding_time_in_us += it->encode_time_in_us; total_decoding_time_in_us += it->decode_time_in_us; total_encoded_frames_lengths += it->encoded_frame_length_in_bytes; @@ -96,15 +95,13 @@ void Stats::PrintSummary() { // ENCODING printf("Encoding time:\n"); - frame = std::min_element(stats_.begin(), - stats_.end(), LessForEncodeTime); - printf(" Min : %7d us (frame %d)\n", - frame->encode_time_in_us, frame->frame_number); + frame = std::min_element(stats_.begin(), stats_.end(), LessForEncodeTime); + printf(" Min : %7d us (frame %d)\n", frame->encode_time_in_us, + frame->frame_number); - frame = std::max_element(stats_.begin(), - stats_.end(), LessForEncodeTime); - printf(" Max : %7d us (frame %d)\n", - frame->encode_time_in_us, frame->frame_number); + frame = std::max_element(stats_.begin(), stats_.end(), LessForEncodeTime); + printf(" Max : %7d us (frame %d)\n", frame->encode_time_in_us, + frame->frame_number); printf(" Average : %7d us\n", static_cast<int>(total_encoding_time_in_us / stats_.size())); @@ -115,7 +112,7 @@ void Stats::PrintSummary() { // failures) std::vector<FrameStatistic> decoded_frames; for (std::vector<FrameStatistic>::iterator it = stats_.begin(); - it != stats_.end(); ++it) { + it != stats_.end(); ++it) { if (it->decoding_successful) { decoded_frames.push_back(*it); } @@ -123,15 +120,15 @@ void Stats::PrintSummary() { if (decoded_frames.size() == 0) { printf("No successfully decoded frames exist in this statistics.\n"); } else { - frame = std::min_element(decoded_frames.begin(), - decoded_frames.end(), LessForDecodeTime); - printf(" Min : %7d us (frame %d)\n", - frame->decode_time_in_us, frame->frame_number); + frame = std::min_element(decoded_frames.begin(), decoded_frames.end(), + LessForDecodeTime); + printf(" Min : %7d us (frame %d)\n", frame->decode_time_in_us, + frame->frame_number); - frame = std::max_element(decoded_frames.begin(), - decoded_frames.end(), LessForDecodeTime); - printf(" Max : %7d us (frame %d)\n", - frame->decode_time_in_us, frame->frame_number); + frame = std::max_element(decoded_frames.begin(), decoded_frames.end(), + LessForDecodeTime); + printf(" Max : %7d us (frame %d)\n", frame->decode_time_in_us, + frame->frame_number); printf(" Average : %7d us\n", static_cast<int>(total_decoding_time_in_us / decoded_frames.size())); @@ -141,13 +138,11 @@ void Stats::PrintSummary() { // SIZE printf("Frame sizes:\n"); - frame = std::min_element(stats_.begin(), - stats_.end(), LessForEncodedSize); + frame = std::min_element(stats_.begin(), stats_.end(), LessForEncodedSize); printf(" Min : %7" PRIuS " bytes (frame %d)\n", frame->encoded_frame_length_in_bytes, frame->frame_number); - frame = std::max_element(stats_.begin(), - stats_.end(), LessForEncodedSize); + frame = std::max_element(stats_.begin(), stats_.end(), LessForEncodedSize); printf(" Max : %7" PRIuS " bytes (frame %d)\n", frame->encoded_frame_length_in_bytes, frame->frame_number); @@ -167,21 +162,17 @@ void Stats::PrintSummary() { // BIT RATE printf("Bit rates:\n"); - frame = std::min_element(stats_.begin(), - stats_.end(), LessForBitRate); - printf(" Min bit rate: %7d kbps (frame %d)\n", - frame->bit_rate_in_kbps, frame->frame_number); + frame = std::min_element(stats_.begin(), stats_.end(), LessForBitRate); + printf(" Min bit rate: %7d kbps (frame %d)\n", frame->bit_rate_in_kbps, + frame->frame_number); - frame = std::max_element(stats_.begin(), - stats_.end(), LessForBitRate); - printf(" Max bit rate: %7d kbps (frame %d)\n", - frame->bit_rate_in_kbps, frame->frame_number); + frame = std::max_element(stats_.begin(), stats_.end(), LessForBitRate); + printf(" Max bit rate: %7d kbps (frame %d)\n", frame->bit_rate_in_kbps, + frame->frame_number); printf("\n"); - printf("Total encoding time : %7d ms.\n", - total_encoding_time_in_us / 1000); - printf("Total decoding time : %7d ms.\n", - total_decoding_time_in_us / 1000); + printf("Total encoding time : %7d ms.\n", total_encoding_time_in_us / 1000); + printf("Total decoding time : %7d ms.\n", total_decoding_time_in_us / 1000); printf("Total processing time: %7d ms.\n", (total_encoding_time_in_us + total_decoding_time_in_us) / 1000); } diff --git a/webrtc/modules/video_coding/codecs/test/stats.h b/webrtc/modules/video_coding/codecs/test/stats.h index 83ba108bb7..9092631ca1 100644 --- a/webrtc/modules/video_coding/codecs/test/stats.h +++ b/webrtc/modules/video_coding/codecs/test/stats.h @@ -13,7 +13,7 @@ #include <vector> -#include "webrtc/common_video/interface/video_image.h" +#include "webrtc/common_video/include/video_image.h" namespace webrtc { namespace test { diff --git a/webrtc/modules/video_coding/codecs/test/stats_unittest.cc b/webrtc/modules/video_coding/codecs/test/stats_unittest.cc index a2d27e71d6..0403ccfdb3 100644 --- a/webrtc/modules/video_coding/codecs/test/stats_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/stats_unittest.cc @@ -16,21 +16,15 @@ namespace webrtc { namespace test { -class StatsTest: public testing::Test { +class StatsTest : public testing::Test { protected: - StatsTest() { - } + StatsTest() {} - virtual ~StatsTest() { - } + virtual ~StatsTest() {} - void SetUp() { - stats_ = new Stats(); - } + void SetUp() { stats_ = new Stats(); } - void TearDown() { - delete stats_; - } + void TearDown() { delete stats_; } Stats* stats_; }; diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc index c814dfe0e7..7376000bd5 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.cc @@ -93,14 +93,18 @@ bool VideoProcessorImpl::Init() { int32_t register_result = encoder_->RegisterEncodeCompleteCallback(encode_callback_); if (register_result != WEBRTC_VIDEO_CODEC_OK) { - fprintf(stderr, "Failed to register encode complete callback, return code: " - "%d\n", register_result); + fprintf(stderr, + "Failed to register encode complete callback, return code: " + "%d\n", + register_result); return false; } register_result = decoder_->RegisterDecodeCompleteCallback(decode_callback_); if (register_result != WEBRTC_VIDEO_CODEC_OK) { - fprintf(stderr, "Failed to register decode complete callback, return code: " - "%d\n", register_result); + fprintf(stderr, + "Failed to register decode complete callback, return code: " + "%d\n", + register_result); return false; } // Init the encoder and decoder @@ -146,13 +150,14 @@ VideoProcessorImpl::~VideoProcessorImpl() { delete decode_callback_; } - void VideoProcessorImpl::SetRates(int bit_rate, int frame_rate) { int set_rates_result = encoder_->SetRates(bit_rate, frame_rate); assert(set_rates_result >= 0); if (set_rates_result < 0) { - fprintf(stderr, "Failed to update encoder with new rate %d, " - "return code: %d\n", bit_rate, set_rates_result); + fprintf(stderr, + "Failed to update encoder with new rate %d, " + "return code: %d\n", + bit_rate, set_rates_result); } num_dropped_frames_ = 0; num_spatial_resizes_ = 0; @@ -175,7 +180,7 @@ int VideoProcessorImpl::NumberSpatialResizes() { } bool VideoProcessorImpl::ProcessFrame(int frame_number) { - assert(frame_number >=0); + assert(frame_number >= 0); if (!initialized_) { fprintf(stderr, "Attempting to use uninitialized VideoProcessor!\n"); return false; @@ -186,10 +191,8 @@ bool VideoProcessorImpl::ProcessFrame(int frame_number) { } if (frame_reader_->ReadFrame(source_buffer_)) { // Copy the source frame to the newly read frame data. - source_frame_.CreateFrame(source_buffer_, - config_.codec_settings->width, - config_.codec_settings->height, - kVideoRotation_0); + source_frame_.CreateFrame(source_buffer_, config_.codec_settings->width, + config_.codec_settings->height, kVideoRotation_0); // Ensure we have a new statistics data object we can fill: FrameStatistic& stat = stats_->NewFrame(frame_number); @@ -224,10 +227,10 @@ bool VideoProcessorImpl::ProcessFrame(int frame_number) { void VideoProcessorImpl::FrameEncoded(const EncodedImage& encoded_image) { // Timestamp is frame number, so this gives us #dropped frames. - int num_dropped_from_prev_encode = encoded_image._timeStamp - - prev_time_stamp_ - 1; - num_dropped_frames_ += num_dropped_from_prev_encode; - prev_time_stamp_ = encoded_image._timeStamp; + int num_dropped_from_prev_encode = + encoded_image._timeStamp - prev_time_stamp_ - 1; + num_dropped_frames_ += num_dropped_from_prev_encode; + prev_time_stamp_ = encoded_image._timeStamp; if (num_dropped_from_prev_encode > 0) { // For dropped frames, we write out the last decoded frame to avoid getting // out of sync for the computation of PSNR and SSIM. @@ -244,15 +247,16 @@ void VideoProcessorImpl::FrameEncoded(const EncodedImage& encoded_image) { TickTime encode_stop = TickTime::Now(); int frame_number = encoded_image._timeStamp; FrameStatistic& stat = stats_->stats_[frame_number]; - stat.encode_time_in_us = GetElapsedTimeMicroseconds(encode_start_, - encode_stop); + stat.encode_time_in_us = + GetElapsedTimeMicroseconds(encode_start_, encode_stop); stat.encoding_successful = true; stat.encoded_frame_length_in_bytes = encoded_image._length; stat.frame_number = encoded_image._timeStamp; stat.frame_type = encoded_image._frameType; stat.bit_rate_in_kbps = encoded_image._length * bit_rate_factor_; - stat.total_packets = encoded_image._length / - config_.networking_config.packet_size_in_bytes + 1; + stat.total_packets = + encoded_image._length / config_.networking_config.packet_size_in_bytes + + 1; // Perform packet loss if criteria is fullfilled: bool exclude_this_frame = false; @@ -280,7 +284,7 @@ void VideoProcessorImpl::FrameEncoded(const EncodedImage& encoded_image) { copied_image._buffer = copied_buffer.get(); if (!exclude_this_frame) { stat.packets_dropped = - packet_manipulator_->ManipulatePackets(&copied_image); + packet_manipulator_->ManipulatePackets(&copied_image); } // Keep track of if frames are lost due to packet loss so we can tell @@ -305,26 +309,25 @@ void VideoProcessorImpl::FrameDecoded(const VideoFrame& image) { int frame_number = image.timestamp(); // Report stats FrameStatistic& stat = stats_->stats_[frame_number]; - stat.decode_time_in_us = GetElapsedTimeMicroseconds(decode_start_, - decode_stop); + stat.decode_time_in_us = + GetElapsedTimeMicroseconds(decode_start_, decode_stop); stat.decoding_successful = true; // Check for resize action (either down or up): if (static_cast<int>(image.width()) != last_encoder_frame_width_ || - static_cast<int>(image.height()) != last_encoder_frame_height_ ) { + static_cast<int>(image.height()) != last_encoder_frame_height_) { ++num_spatial_resizes_; last_encoder_frame_width_ = image.width(); last_encoder_frame_height_ = image.height(); } // Check if codec size is different from native/original size, and if so, // upsample back to original size: needed for PSNR and SSIM computations. - if (image.width() != config_.codec_settings->width || + if (image.width() != config_.codec_settings->width || image.height() != config_.codec_settings->height) { VideoFrame up_image; - int ret_val = scaler_.Set(image.width(), image.height(), - config_.codec_settings->width, - config_.codec_settings->height, - kI420, kI420, kScaleBilinear); + int ret_val = scaler_.Set( + image.width(), image.height(), config_.codec_settings->width, + config_.codec_settings->height, kI420, kI420, kScaleBilinear); assert(ret_val >= 0); if (ret_val < 0) { fprintf(stderr, "Failed to set scalar for frame: %d, return code: %d\n", @@ -366,7 +369,8 @@ void VideoProcessorImpl::FrameDecoded(const VideoFrame& image) { } int VideoProcessorImpl::GetElapsedTimeMicroseconds( - const webrtc::TickTime& start, const webrtc::TickTime& stop) { + const webrtc::TickTime& start, + const webrtc::TickTime& stop) { uint64_t encode_time = (stop - start).Microseconds(); assert(encode_time < static_cast<unsigned int>(std::numeric_limits<int>::max())); @@ -404,8 +408,7 @@ const char* VideoCodecTypeToStr(webrtc::VideoCodecType e) { } // Callbacks -int32_t -VideoProcessorImpl::VideoProcessorEncodeCompleteCallback::Encoded( +int32_t VideoProcessorImpl::VideoProcessorEncodeCompleteCallback::Encoded( const EncodedImage& encoded_image, const webrtc::CodecSpecificInfo* codec_specific_info, const webrtc::RTPFragmentationHeader* fragmentation) { diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor.h b/webrtc/modules/video_coding/codecs/test/videoprocessor.h index 0b094ae73e..3ee08fd46a 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor.h +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor.h @@ -13,9 +13,10 @@ #include <string> +#include "webrtc/base/checks.h" #include "webrtc/common_video/libyuv/include/scaler.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/stats.h" #include "webrtc/system_wrappers/include/tick_util.h" @@ -242,12 +243,16 @@ class VideoProcessorImpl : public VideoProcessor { // Callback class required to implement according to the VideoDecoder API. class VideoProcessorDecodeCompleteCallback - : public webrtc::DecodedImageCallback { + : public webrtc::DecodedImageCallback { public: - explicit VideoProcessorDecodeCompleteCallback(VideoProcessorImpl* vp) - : video_processor_(vp) { + explicit VideoProcessorDecodeCompleteCallback(VideoProcessorImpl* vp) + : video_processor_(vp) {} + int32_t Decoded(webrtc::VideoFrame& image) override; + int32_t Decoded(webrtc::VideoFrame& image, + int64_t decode_time_ms) override { + RTC_NOTREACHED(); + return -1; } - int32_t Decoded(webrtc::VideoFrame& image) override; private: VideoProcessorImpl* video_processor_; diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc index 3d6aedb22a..7b92616e1b 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc @@ -12,17 +12,16 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" +#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/test/testsupport/fileutils.h" #include "webrtc/test/testsupport/frame_reader.h" #include "webrtc/test/testsupport/frame_writer.h" -#include "webrtc/test/testsupport/gtest_disable.h" #include "webrtc/test/testsupport/metrics/video_metrics.h" #include "webrtc/test/testsupport/packet_reader.h" #include "webrtc/typedefs.h" @@ -81,7 +80,6 @@ struct RateControlMetrics { int num_key_frames; }; - // Sequence used is foreman (CIF): may be better to use VGA for resize test. const int kCIFWidth = 352; const int kCIFHeight = 288; @@ -101,7 +99,7 @@ const float kScaleKeyFrameSize = 0.5f; // dropping/spatial resize, and temporal layers. The limits for the rate // control metrics are set to be fairly conservative, so failure should only // happen when some significant regression or breakdown occurs. -class VideoProcessorIntegrationTest: public testing::Test { +class VideoProcessorIntegrationTest : public testing::Test { protected: VideoEncoder* encoder_; VideoDecoder* decoder_; @@ -148,7 +146,6 @@ class VideoProcessorIntegrationTest: public testing::Test { bool frame_dropper_on_; bool spatial_resize_on_; - VideoProcessorIntegrationTest() {} virtual ~VideoProcessorIntegrationTest() {} @@ -165,14 +162,13 @@ class VideoProcessorIntegrationTest: public testing::Test { // CIF is currently used for all tests below. // Setup the TestConfig struct for processing of a clip in CIF resolution. - config_.input_filename = - webrtc::test::ResourcePath("foreman_cif", "yuv"); + config_.input_filename = webrtc::test::ResourcePath("foreman_cif", "yuv"); // Generate an output filename in a safe way. config_.output_filename = webrtc::test::TempFilename( webrtc::test::OutputPath(), "videoprocessor_integrationtest"); - config_.frame_length_in_bytes = CalcBufferSize(kI420, - kCIFWidth, kCIFHeight); + config_.frame_length_in_bytes = + CalcBufferSize(kI420, kCIFWidth, kCIFHeight); config_.verbose = false; // Only allow encoder/decoder to use single core, for predictability. config_.use_single_core = true; @@ -188,52 +184,46 @@ class VideoProcessorIntegrationTest: public testing::Test { // These features may be set depending on the test. switch (config_.codec_settings->codecType) { - case kVideoCodecVP8: - config_.codec_settings->codecSpecific.VP8.errorConcealmentOn = - error_concealment_on_; - config_.codec_settings->codecSpecific.VP8.denoisingOn = - denoising_on_; - config_.codec_settings->codecSpecific.VP8.numberOfTemporalLayers = - num_temporal_layers_; - config_.codec_settings->codecSpecific.VP8.frameDroppingOn = - frame_dropper_on_; - config_.codec_settings->codecSpecific.VP8.automaticResizeOn = - spatial_resize_on_; - config_.codec_settings->codecSpecific.VP8.keyFrameInterval = - kBaseKeyFrameInterval; - break; - case kVideoCodecVP9: - config_.codec_settings->codecSpecific.VP9.denoisingOn = - denoising_on_; - config_.codec_settings->codecSpecific.VP9.numberOfTemporalLayers = - num_temporal_layers_; - config_.codec_settings->codecSpecific.VP9.frameDroppingOn = - frame_dropper_on_; - config_.codec_settings->codecSpecific.VP9.automaticResizeOn = - spatial_resize_on_; - config_.codec_settings->codecSpecific.VP9.keyFrameInterval = - kBaseKeyFrameInterval; - break; - default: - assert(false); - break; - } - frame_reader_ = - new webrtc::test::FrameReaderImpl(config_.input_filename, - config_.frame_length_in_bytes); - frame_writer_ = - new webrtc::test::FrameWriterImpl(config_.output_filename, - config_.frame_length_in_bytes); + case kVideoCodecVP8: + config_.codec_settings->codecSpecific.VP8.errorConcealmentOn = + error_concealment_on_; + config_.codec_settings->codecSpecific.VP8.denoisingOn = denoising_on_; + config_.codec_settings->codecSpecific.VP8.numberOfTemporalLayers = + num_temporal_layers_; + config_.codec_settings->codecSpecific.VP8.frameDroppingOn = + frame_dropper_on_; + config_.codec_settings->codecSpecific.VP8.automaticResizeOn = + spatial_resize_on_; + config_.codec_settings->codecSpecific.VP8.keyFrameInterval = + kBaseKeyFrameInterval; + break; + case kVideoCodecVP9: + config_.codec_settings->codecSpecific.VP9.denoisingOn = denoising_on_; + config_.codec_settings->codecSpecific.VP9.numberOfTemporalLayers = + num_temporal_layers_; + config_.codec_settings->codecSpecific.VP9.frameDroppingOn = + frame_dropper_on_; + config_.codec_settings->codecSpecific.VP9.automaticResizeOn = + spatial_resize_on_; + config_.codec_settings->codecSpecific.VP9.keyFrameInterval = + kBaseKeyFrameInterval; + break; + default: + assert(false); + break; + } + frame_reader_ = new webrtc::test::FrameReaderImpl( + config_.input_filename, config_.frame_length_in_bytes); + frame_writer_ = new webrtc::test::FrameWriterImpl( + config_.output_filename, config_.frame_length_in_bytes); ASSERT_TRUE(frame_reader_->Init()); ASSERT_TRUE(frame_writer_->Init()); packet_manipulator_ = new webrtc::test::PacketManipulatorImpl( &packet_reader_, config_.networking_config, config_.verbose); - processor_ = new webrtc::test::VideoProcessorImpl(encoder_, decoder_, - frame_reader_, - frame_writer_, - packet_manipulator_, - config_, &stats_); + processor_ = new webrtc::test::VideoProcessorImpl( + encoder_, decoder_, frame_reader_, frame_writer_, packet_manipulator_, + config_, &stats_); ASSERT_TRUE(processor_->Init()); } @@ -247,7 +237,7 @@ class VideoProcessorIntegrationTest: public testing::Test { encoding_bitrate_[i] = 0.0f; // Update layer per-frame-bandwidth. per_frame_bandwidth_[i] = static_cast<float>(bit_rate_layer_[i]) / - static_cast<float>(frame_rate_layer_[i]); + static_cast<float>(frame_rate_layer_[i]); } // Set maximum size of key frames, following setting in the VP8 wrapper. float max_key_size = kScaleKeyFrameSize * kOptimalBufferSize * frame_rate_; @@ -274,28 +264,28 @@ class VideoProcessorIntegrationTest: public testing::Test { // Update rate mismatch relative to per-frame bandwidth for delta frames. if (frame_type == kVideoFrameDelta) { // TODO(marpan): Should we count dropped (zero size) frames in mismatch? - sum_frame_size_mismatch_[layer_] += fabs(encoded_size_kbits - - per_frame_bandwidth_[layer_]) / - per_frame_bandwidth_[layer_]; + sum_frame_size_mismatch_[layer_] += + fabs(encoded_size_kbits - per_frame_bandwidth_[layer_]) / + per_frame_bandwidth_[layer_]; } else { - float target_size = (frame_num == 1) ? target_size_key_frame_initial_ : - target_size_key_frame_; - sum_key_frame_size_mismatch_ += fabs(encoded_size_kbits - target_size) / - target_size; + float target_size = (frame_num == 1) ? target_size_key_frame_initial_ + : target_size_key_frame_; + sum_key_frame_size_mismatch_ += + fabs(encoded_size_kbits - target_size) / target_size; num_key_frames_ += 1; } sum_encoded_frame_size_[layer_] += encoded_size_kbits; // Encoding bitrate per layer: from the start of the update/run to the // current frame. encoding_bitrate_[layer_] = sum_encoded_frame_size_[layer_] * - frame_rate_layer_[layer_] / - num_frames_per_update_[layer_]; + frame_rate_layer_[layer_] / + num_frames_per_update_[layer_]; // Total encoding rate: from the start of the update/run to current frame. sum_encoded_frame_size_total_ += encoded_size_kbits; - encoding_bitrate_total_ = sum_encoded_frame_size_total_ * frame_rate_ / - num_frames_total_; - perc_encoding_rate_mismatch_ = 100 * fabs(encoding_bitrate_total_ - - bit_rate_) / bit_rate_; + encoding_bitrate_total_ = + sum_encoded_frame_size_total_ * frame_rate_ / num_frames_total_; + perc_encoding_rate_mismatch_ = + 100 * fabs(encoding_bitrate_total_ - bit_rate_) / bit_rate_; if (perc_encoding_rate_mismatch_ < kPercTargetvsActualMismatch && !encoding_rate_within_target_) { num_frames_to_hit_target_ = num_frames_total_; @@ -314,34 +304,38 @@ class VideoProcessorIntegrationTest: public testing::Test { int num_key_frames) { int num_dropped_frames = processor_->NumberDroppedFrames(); int num_resize_actions = processor_->NumberSpatialResizes(); - printf("For update #: %d,\n " + printf( + "For update #: %d,\n " " Target Bitrate: %d,\n" " Encoding bitrate: %f,\n" " Frame rate: %d \n", update_index, bit_rate_, encoding_bitrate_total_, frame_rate_); - printf(" Number of frames to approach target rate = %d, \n" - " Number of dropped frames = %d, \n" - " Number of spatial resizes = %d, \n", - num_frames_to_hit_target_, num_dropped_frames, num_resize_actions); + printf( + " Number of frames to approach target rate = %d, \n" + " Number of dropped frames = %d, \n" + " Number of spatial resizes = %d, \n", + num_frames_to_hit_target_, num_dropped_frames, num_resize_actions); EXPECT_LE(perc_encoding_rate_mismatch_, max_encoding_rate_mismatch); if (num_key_frames_ > 0) { - int perc_key_frame_size_mismatch = 100 * sum_key_frame_size_mismatch_ / - num_key_frames_; - printf(" Number of Key frames: %d \n" - " Key frame rate mismatch: %d \n", - num_key_frames_, perc_key_frame_size_mismatch); + int perc_key_frame_size_mismatch = + 100 * sum_key_frame_size_mismatch_ / num_key_frames_; + printf( + " Number of Key frames: %d \n" + " Key frame rate mismatch: %d \n", + num_key_frames_, perc_key_frame_size_mismatch); EXPECT_LE(perc_key_frame_size_mismatch, max_key_frame_size_mismatch); } printf("\n"); printf("Rates statistics for Layer data \n"); - for (int i = 0; i < num_temporal_layers_ ; i++) { + for (int i = 0; i < num_temporal_layers_; i++) { printf("Layer #%d \n", i); - int perc_frame_size_mismatch = 100 * sum_frame_size_mismatch_[i] / - num_frames_per_update_[i]; - int perc_encoding_rate_mismatch = 100 * fabs(encoding_bitrate_[i] - - bit_rate_layer_[i]) / - bit_rate_layer_[i]; - printf(" Target Layer Bit rate: %f \n" + int perc_frame_size_mismatch = + 100 * sum_frame_size_mismatch_[i] / num_frames_per_update_[i]; + int perc_encoding_rate_mismatch = + 100 * fabs(encoding_bitrate_[i] - bit_rate_layer_[i]) / + bit_rate_layer_[i]; + printf( + " Target Layer Bit rate: %f \n" " Layer frame rate: %f, \n" " Layer per frame bandwidth: %f, \n" " Layer Encoding bit rate: %f, \n" @@ -366,13 +360,13 @@ class VideoProcessorIntegrationTest: public testing::Test { if (num_temporal_layers_ == 1) { layer_ = 0; } else if (num_temporal_layers_ == 2) { - // layer 0: 0 2 4 ... - // layer 1: 1 3 - if (frame_number % 2 == 0) { - layer_ = 0; - } else { - layer_ = 1; - } + // layer 0: 0 2 4 ... + // layer 1: 1 3 + if (frame_number % 2 == 0) { + layer_ = 0; + } else { + layer_ = 1; + } } else if (num_temporal_layers_ == 3) { // layer 0: 0 4 8 ... // layer 1: 2 6 @@ -391,20 +385,20 @@ class VideoProcessorIntegrationTest: public testing::Test { // Set the bitrate and frame rate per layer, for up to 3 layers. void SetLayerRates() { - assert(num_temporal_layers_<= 3); + assert(num_temporal_layers_ <= 3); for (int i = 0; i < num_temporal_layers_; i++) { float bit_rate_ratio = kVp8LayerRateAlloction[num_temporal_layers_ - 1][i]; if (i > 0) { - float bit_rate_delta_ratio = kVp8LayerRateAlloction - [num_temporal_layers_ - 1][i] - + float bit_rate_delta_ratio = + kVp8LayerRateAlloction[num_temporal_layers_ - 1][i] - kVp8LayerRateAlloction[num_temporal_layers_ - 1][i - 1]; bit_rate_layer_[i] = bit_rate_ * bit_rate_delta_ratio; } else { bit_rate_layer_[i] = bit_rate_ * bit_rate_ratio; } - frame_rate_layer_[i] = frame_rate_ / static_cast<float>( - 1 << (num_temporal_layers_ - 1)); + frame_rate_layer_[i] = + frame_rate_ / static_cast<float>(1 << (num_temporal_layers_ - 1)); } if (num_temporal_layers_ == 3) { frame_rate_layer_[2] = frame_rate_ / 2.0f; @@ -437,12 +431,12 @@ class VideoProcessorIntegrationTest: public testing::Test { spatial_resize_on_ = process.spatial_resize_on; SetUpCodecConfig(); // Update the layers and the codec with the initial rates. - bit_rate_ = rate_profile.target_bit_rate[0]; + bit_rate_ = rate_profile.target_bit_rate[0]; frame_rate_ = rate_profile.input_frame_rate[0]; SetLayerRates(); // Set the initial target size for key frame. - target_size_key_frame_initial_ = 0.5 * kInitialBufferSize * - bit_rate_layer_[0]; + target_size_key_frame_initial_ = + 0.5 * kInitialBufferSize * bit_rate_layer_[0]; processor_->SetRates(bit_rate_, frame_rate_); // Process each frame, up to |num_frames|. int num_frames = rate_profile.num_frames; @@ -452,7 +446,7 @@ class VideoProcessorIntegrationTest: public testing::Test { int frame_number = 0; FrameType frame_type = kVideoFrameDelta; while (processor_->ProcessFrame(frame_number) && - frame_number < num_frames) { + frame_number < num_frames) { // Get the layer index for the frame |frame_number|. LayerIndexForFrame(frame_number); // Get the frame_type. @@ -468,8 +462,7 @@ class VideoProcessorIntegrationTest: public testing::Test { if (frame_number == rate_profile.frame_index_rate_update[update_index + 1]) { VerifyRateControl( - update_index, - rc_metrics[update_index].max_key_frame_size_mismatch, + update_index, rc_metrics[update_index].max_key_frame_size_mismatch, rc_metrics[update_index].max_delta_frame_size_mismatch, rc_metrics[update_index].max_encoding_rate_mismatch, rc_metrics[update_index].max_time_hit_target, @@ -478,23 +471,22 @@ class VideoProcessorIntegrationTest: public testing::Test { rc_metrics[update_index].num_key_frames); // Update layer rates and the codec with new rates. ++update_index; - bit_rate_ = rate_profile.target_bit_rate[update_index]; + bit_rate_ = rate_profile.target_bit_rate[update_index]; frame_rate_ = rate_profile.input_frame_rate[update_index]; SetLayerRates(); - ResetRateControlMetrics(rate_profile. - frame_index_rate_update[update_index + 1]); + ResetRateControlMetrics( + rate_profile.frame_index_rate_update[update_index + 1]); processor_->SetRates(bit_rate_, frame_rate_); } } - VerifyRateControl( - update_index, - rc_metrics[update_index].max_key_frame_size_mismatch, - rc_metrics[update_index].max_delta_frame_size_mismatch, - rc_metrics[update_index].max_encoding_rate_mismatch, - rc_metrics[update_index].max_time_hit_target, - rc_metrics[update_index].max_num_dropped_frames, - rc_metrics[update_index].num_spatial_resizes, - rc_metrics[update_index].num_key_frames); + VerifyRateControl(update_index, + rc_metrics[update_index].max_key_frame_size_mismatch, + rc_metrics[update_index].max_delta_frame_size_mismatch, + rc_metrics[update_index].max_encoding_rate_mismatch, + rc_metrics[update_index].max_time_hit_target, + rc_metrics[update_index].max_num_dropped_frames, + rc_metrics[update_index].num_spatial_resizes, + rc_metrics[update_index].num_key_frames); EXPECT_EQ(num_frames, frame_number); EXPECT_EQ(num_frames + 1, static_cast<int>(stats_.stats_.size())); @@ -507,16 +499,14 @@ class VideoProcessorIntegrationTest: public testing::Test { // TODO(marpan): should compute these quality metrics per SetRates update. webrtc::test::QualityMetricsResult psnr_result, ssim_result; - EXPECT_EQ(0, webrtc::test::I420MetricsFromFiles( - config_.input_filename.c_str(), - config_.output_filename.c_str(), - config_.codec_settings->width, - config_.codec_settings->height, - &psnr_result, - &ssim_result)); + EXPECT_EQ( + 0, webrtc::test::I420MetricsFromFiles( + config_.input_filename.c_str(), config_.output_filename.c_str(), + config_.codec_settings->width, config_.codec_settings->height, + &psnr_result, &ssim_result)); printf("PSNR avg: %f, min: %f SSIM avg: %f, min: %f\n", - psnr_result.average, psnr_result.min, - ssim_result.average, ssim_result.min); + psnr_result.average, psnr_result.min, ssim_result.average, + ssim_result.min); stats_.PrintSummary(); EXPECT_GT(psnr_result.average, quality_metrics.minimum_avg_psnr); EXPECT_GT(psnr_result.min, quality_metrics.minimum_min_psnr); @@ -549,7 +539,7 @@ void SetCodecParameters(CodecConfigPars* process_settings, bool spatial_resize_on) { process_settings->codec_type = codec_type; process_settings->packet_loss = packet_loss; - process_settings->key_frame_interval = key_frame_interval; + process_settings->key_frame_interval = key_frame_interval; process_settings->num_temporal_layers = num_temporal_layers, process_settings->error_concealment_on = error_concealment_on; process_settings->denoising_on = denoising_on; @@ -608,9 +598,7 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) { // Metrics for rate control. RateControlMetrics rc_metrics[1]; SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } @@ -632,13 +620,10 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) { // Metrics for rate control. RateControlMetrics rc_metrics[1]; SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } - // VP9: Run with no packet loss, with varying bitrate (3 rate updates): // low to high to medium. Check that quality and encoder response to the new // target rate/per-frame bandwidth (for each rate update) is within limits. @@ -657,15 +642,13 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) { false, true, false); // Metrics for expected quality. QualityMetrics quality_metrics; - SetQualityMetrics(&quality_metrics, 35.9, 30.0, 0.90, 0.85); + SetQualityMetrics(&quality_metrics, 35.7, 30.0, 0.90, 0.85); // Metrics for rate control. RateControlMetrics rc_metrics[3]; SetRateControlMetrics(rc_metrics, 0, 0, 30, 20, 20, 30, 0, 1); SetRateControlMetrics(rc_metrics, 1, 2, 0, 20, 20, 60, 0, 0); SetRateControlMetrics(rc_metrics, 2, 0, 0, 25, 20, 40, 0, 0); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } @@ -695,12 +678,10 @@ TEST_F(VideoProcessorIntegrationTest, SetQualityMetrics(&quality_metrics, 31.5, 18.0, 0.80, 0.44); // Metrics for rate control. RateControlMetrics rc_metrics[3]; - SetRateControlMetrics(rc_metrics, 0, 35, 50, 70, 15, 45, 0, 1); + SetRateControlMetrics(rc_metrics, 0, 38, 50, 75, 15, 45, 0, 1); SetRateControlMetrics(rc_metrics, 1, 10, 0, 40, 10, 30, 0, 0); SetRateControlMetrics(rc_metrics, 2, 5, 0, 30, 5, 20, 0, 0); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } @@ -721,19 +702,13 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) { // Metrics for rate control. RateControlMetrics rc_metrics[1]; SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 20, 0, 1); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } // Run with no packet loss, at low bitrate. -// spatial_resize is on, and for this low bitrate expect two resizes during the -// sequence; first resize is 3/4, second is 1/2 (from original). +// spatial_resize is on, for this low bitrate expect one resize in sequence. // Resize happens on delta frame. Expect only one key frame (first frame). -// Disable for msan, see -// https://code.google.com/p/webrtc/issues/detail?id=5110 for details. -#if !defined(MEMORY_SANITIZER) TEST_F(VideoProcessorIntegrationTest, ProcessNoLossSpatialResizeFrameDropVP9) { config_.networking_config.packet_loss_probability = 0; // Bitrate and frame rate profile. @@ -743,20 +718,17 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossSpatialResizeFrameDropVP9) { rate_profile.num_frames = kNbrFramesLong; // Codec/network settings. CodecConfigPars process_settings; - SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, - 1, false, false, true, true); + SetCodecParameters(&process_settings, kVideoCodecVP9, 0.0f, -1, 1, false, + false, true, true); // Metrics for expected quality. QualityMetrics quality_metrics; - SetQualityMetrics(&quality_metrics, 25.0, 13.0, 0.70, 0.40); + SetQualityMetrics(&quality_metrics, 24.0, 13.0, 0.65, 0.37); // Metrics for rate control. RateControlMetrics rc_metrics[1]; - SetRateControlMetrics(rc_metrics, 0, 180, 70, 130, 15, 80, 2, 1); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + SetRateControlMetrics(rc_metrics, 0, 228, 70, 160, 15, 80, 1, 1); + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } -#endif // TODO(marpan): Add temporal layer test for VP9, once changes are in // vp9 wrapper for this. @@ -780,9 +752,7 @@ TEST_F(VideoProcessorIntegrationTest, ProcessZeroPacketLoss) { // Metrics for rate control. RateControlMetrics rc_metrics[1]; SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } @@ -804,9 +774,7 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLoss) { // Metrics for rate control. RateControlMetrics rc_metrics[1]; SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } @@ -828,9 +796,7 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) { // Metrics for rate control. RateControlMetrics rc_metrics[1]; SetRateControlMetrics(rc_metrics, 0, 0, 40, 20, 10, 15, 0, 1); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } @@ -847,8 +813,13 @@ TEST_F(VideoProcessorIntegrationTest, Process10PercentPacketLoss) { // low to high to medium. Check that quality and encoder response to the new // target rate/per-frame bandwidth (for each rate update) is within limits. // One key frame (first frame only) in sequence. -TEST_F(VideoProcessorIntegrationTest, - DISABLED_ON_ANDROID(ProcessNoLossChangeBitRateVP8)) { +#if defined(WEBRTC_ANDROID) +#define MAYBE_ProcessNoLossChangeBitRateVP8 \ + DISABLED_ProcessNoLossChangeBitRateVP8 +#else +#define MAYBE_ProcessNoLossChangeBitRateVP8 ProcessNoLossChangeBitRateVP8 +#endif +TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP8) { // Bitrate and frame rate profile. RateProfile rate_profile; SetRateProfilePars(&rate_profile, 0, 200, 30, 0); @@ -868,9 +839,7 @@ TEST_F(VideoProcessorIntegrationTest, SetRateControlMetrics(rc_metrics, 0, 0, 45, 20, 10, 15, 0, 1); SetRateControlMetrics(rc_metrics, 1, 0, 0, 25, 20, 10, 0, 0); SetRateControlMetrics(rc_metrics, 2, 0, 0, 25, 15, 10, 0, 0); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } @@ -881,8 +850,15 @@ TEST_F(VideoProcessorIntegrationTest, // for the rate control metrics can be lower. One key frame (first frame only). // Note: quality after update should be higher but we currently compute quality // metrics averaged over whole sequence run. +#if defined(WEBRTC_ANDROID) +#define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP8 \ + DISABLED_ProcessNoLossChangeFrameRateFrameDropVP8 +#else +#define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP8 \ + ProcessNoLossChangeFrameRateFrameDropVP8 +#endif TEST_F(VideoProcessorIntegrationTest, - DISABLED_ON_ANDROID(ProcessNoLossChangeFrameRateFrameDropVP8)) { + MAYBE_ProcessNoLossChangeFrameRateFrameDropVP8) { config_.networking_config.packet_loss_probability = 0; // Bitrate and frame rate profile. RateProfile rate_profile; @@ -903,16 +879,21 @@ TEST_F(VideoProcessorIntegrationTest, SetRateControlMetrics(rc_metrics, 0, 40, 20, 75, 15, 60, 0, 1); SetRateControlMetrics(rc_metrics, 1, 10, 0, 25, 10, 35, 0, 0); SetRateControlMetrics(rc_metrics, 2, 0, 0, 20, 10, 15, 0, 0); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } // Run with no packet loss, at low bitrate. During this time we should've // resized once. Expect 2 key frames generated (first and one for resize). +#if defined(WEBRTC_ANDROID) +#define MAYBE_ProcessNoLossSpatialResizeFrameDropVP8 \ + DISABLED_ProcessNoLossSpatialResizeFrameDropVP8 +#else +#define MAYBE_ProcessNoLossSpatialResizeFrameDropVP8 \ + ProcessNoLossSpatialResizeFrameDropVP8 +#endif TEST_F(VideoProcessorIntegrationTest, - DISABLED_ON_ANDROID(ProcessNoLossSpatialResizeFrameDropVP8)) { + MAYBE_ProcessNoLossSpatialResizeFrameDropVP8) { config_.networking_config.packet_loss_probability = 0; // Bitrate and frame rate profile. RateProfile rate_profile; @@ -921,17 +902,15 @@ TEST_F(VideoProcessorIntegrationTest, rate_profile.num_frames = kNbrFramesLong; // Codec/network settings. CodecConfigPars process_settings; - SetCodecParameters(&process_settings, kVideoCodecVP8, 0.0f, -1, - 1, false, true, true, true); + SetCodecParameters(&process_settings, kVideoCodecVP8, 0.0f, -1, 1, false, + true, true, true); // Metrics for expected quality. QualityMetrics quality_metrics; SetQualityMetrics(&quality_metrics, 25.0, 15.0, 0.70, 0.40); // Metrics for rate control. RateControlMetrics rc_metrics[1]; SetRateControlMetrics(rc_metrics, 0, 160, 60, 120, 20, 70, 1, 2); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } @@ -940,8 +919,13 @@ TEST_F(VideoProcessorIntegrationTest, // encoding rate mismatch are applied to each layer. // No dropped frames in this test, and internal spatial resizer is off. // One key frame (first frame only) in sequence, so no spatial resizing. -TEST_F(VideoProcessorIntegrationTest, - DISABLED_ON_ANDROID(ProcessNoLossTemporalLayersVP8)) { +#if defined(WEBRTC_ANDROID) +#define MAYBE_ProcessNoLossTemporalLayersVP8 \ + DISABLED_ProcessNoLossTemporalLayersVP8 +#else +#define MAYBE_ProcessNoLossTemporalLayersVP8 ProcessNoLossTemporalLayersVP8 +#endif +TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossTemporalLayersVP8) { config_.networking_config.packet_loss_probability = 0; // Bitrate and frame rate profile. RateProfile rate_profile; @@ -960,9 +944,7 @@ TEST_F(VideoProcessorIntegrationTest, RateControlMetrics rc_metrics[2]; SetRateControlMetrics(rc_metrics, 0, 0, 20, 30, 10, 10, 0, 1); SetRateControlMetrics(rc_metrics, 1, 0, 0, 30, 15, 10, 0, 0); - ProcessFramesAndVerify(quality_metrics, - rate_profile, - process_settings, + ProcessFramesAndVerify(quality_metrics, rate_profile, process_settings, rc_metrics); } } // namespace webrtc diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc index 88b5467f1f..148d8dc74a 100644 --- a/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc +++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_unittest.cc @@ -10,10 +10,10 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h" +#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h" #include "webrtc/modules/video_coding/codecs/test/mock/mock_packet_manipulator.h" #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h" -#include "webrtc/modules/video_coding/main/interface/video_coding.h" +#include "webrtc/modules/video_coding/include/video_coding.h" #include "webrtc/test/testsupport/mock/mock_frame_reader.h" #include "webrtc/test/testsupport/mock/mock_frame_writer.h" #include "webrtc/test/testsupport/packet_reader.h" @@ -29,7 +29,7 @@ namespace test { // Very basic testing for VideoProcessor. It's mostly tested by running the // video_quality_measurement program. -class VideoProcessorTest: public testing::Test { +class VideoProcessorTest : public testing::Test { protected: MockVideoEncoder encoder_mock_; MockVideoDecoder decoder_mock_; @@ -53,44 +53,34 @@ class VideoProcessorTest: public testing::Test { void TearDown() {} void ExpectInit() { - EXPECT_CALL(encoder_mock_, InitEncode(_, _, _)) - .Times(1); + EXPECT_CALL(encoder_mock_, InitEncode(_, _, _)).Times(1); EXPECT_CALL(encoder_mock_, RegisterEncodeCompleteCallback(_)) - .Times(AtLeast(1)); - EXPECT_CALL(decoder_mock_, InitDecode(_, _)) - .Times(1); + .Times(AtLeast(1)); + EXPECT_CALL(decoder_mock_, InitDecode(_, _)).Times(1); EXPECT_CALL(decoder_mock_, RegisterDecodeCompleteCallback(_)) - .Times(AtLeast(1)); - EXPECT_CALL(frame_reader_mock_, NumberOfFrames()) - .WillOnce(Return(1)); - EXPECT_CALL(frame_reader_mock_, FrameLength()) - .WillOnce(Return(152064)); + .Times(AtLeast(1)); + EXPECT_CALL(frame_reader_mock_, NumberOfFrames()).WillOnce(Return(1)); + EXPECT_CALL(frame_reader_mock_, FrameLength()).WillOnce(Return(152064)); } }; TEST_F(VideoProcessorTest, Init) { ExpectInit(); - VideoProcessorImpl video_processor(&encoder_mock_, &decoder_mock_, - &frame_reader_mock_, - &frame_writer_mock_, - &packet_manipulator_mock_, config_, - &stats_); + VideoProcessorImpl video_processor( + &encoder_mock_, &decoder_mock_, &frame_reader_mock_, &frame_writer_mock_, + &packet_manipulator_mock_, config_, &stats_); ASSERT_TRUE(video_processor.Init()); } TEST_F(VideoProcessorTest, ProcessFrame) { ExpectInit(); - EXPECT_CALL(encoder_mock_, Encode(_, _, _)) - .Times(1); - EXPECT_CALL(frame_reader_mock_, ReadFrame(_)) - .WillOnce(Return(true)); + EXPECT_CALL(encoder_mock_, Encode(_, _, _)).Times(1); + EXPECT_CALL(frame_reader_mock_, ReadFrame(_)).WillOnce(Return(true)); // Since we don't return any callback from the mock, the decoder will not // be more than initialized... - VideoProcessorImpl video_processor(&encoder_mock_, &decoder_mock_, - &frame_reader_mock_, - &frame_writer_mock_, - &packet_manipulator_mock_, config_, - &stats_); + VideoProcessorImpl video_processor( + &encoder_mock_, &decoder_mock_, &frame_reader_mock_, &frame_writer_mock_, + &packet_manipulator_mock_, config_, &stats_); ASSERT_TRUE(video_processor.Init()); video_processor.ProcessFrame(0); } |