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

This is a reland of bbdabe50db
.
This was reverted because of breaking internal build. I contacted sheriff
and looked at logs but cannot find anything related to this CL. This was landed
with #3850 build which caused exception, but 3847-3855 seem to all have failed.
I am relanding to see if it will work this time or it will give some related
error message that can guide me.
Original change's description:
> Rename stereo video codec to multiplex
>
> This CL only does the rename from"stereo" to multiplex". With this we have a
> better name that doesn't clash with audio's usage of stereo.
>
> Bug: webrtc:7671
> Change-Id: Iebc3fc20839025f1bc8bcf0e16141bf9744ef652
> Reviewed-on: https://webrtc-review.googlesource.com/43242
> Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
> Reviewed-by: Niklas Enbom <niklas.enbom@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#21769}
TBR=niklas.enbom@webrtc.org
Bug: webrtc:7671
Change-Id: I5934abad1ce28acf02842ea8ee2af7768a826eb8
Reviewed-on: https://webrtc-review.googlesource.com/44520
Reviewed-by: Emircan Uysaler <emircan@webrtc.org>
Commit-Queue: Emircan Uysaler <emircan@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21780}
145 lines
5.7 KiB
C++
145 lines
5.7 KiB
C++
/*
|
|
* Copyright (c) 2017 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 "api/test/mock_video_decoder_factory.h"
|
|
#include "api/test/mock_video_encoder_factory.h"
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "common_video/include/video_frame_buffer.h"
|
|
#include "common_video/libyuv/include/webrtc_libyuv.h"
|
|
#include "media/base/mediaconstants.h"
|
|
#include "modules/video_coding/codecs/multiplex/include/multiplex_decoder_adapter.h"
|
|
#include "modules/video_coding/codecs/multiplex/include/multiplex_encoder_adapter.h"
|
|
#include "modules/video_coding/codecs/test/video_codec_test.h"
|
|
#include "modules/video_coding/codecs/vp9/include/vp9.h"
|
|
#include "rtc_base/keep_ref_until_done.h"
|
|
#include "rtc_base/ptr_util.h"
|
|
|
|
using testing::_;
|
|
using testing::Return;
|
|
|
|
namespace webrtc {
|
|
|
|
constexpr const char* kMultiplexAssociatedCodecName = cricket::kVp9CodecName;
|
|
const VideoCodecType kMultiplexAssociatedCodecType =
|
|
PayloadStringToCodecType(kMultiplexAssociatedCodecName);
|
|
|
|
class TestMultiplexAdapter : public VideoCodecTest {
|
|
public:
|
|
TestMultiplexAdapter()
|
|
: decoder_factory_(new webrtc::MockVideoDecoderFactory),
|
|
encoder_factory_(new webrtc::MockVideoEncoderFactory) {}
|
|
|
|
protected:
|
|
std::unique_ptr<VideoDecoder> CreateDecoder() override {
|
|
return rtc::MakeUnique<MultiplexDecoderAdapter>(
|
|
decoder_factory_.get(), SdpVideoFormat(kMultiplexAssociatedCodecName));
|
|
}
|
|
|
|
std::unique_ptr<VideoEncoder> CreateEncoder() override {
|
|
return rtc::MakeUnique<MultiplexEncoderAdapter>(
|
|
encoder_factory_.get(), SdpVideoFormat(kMultiplexAssociatedCodecName));
|
|
}
|
|
|
|
VideoCodec codec_settings() override {
|
|
VideoCodec codec_settings;
|
|
codec_settings.codecType = kMultiplexAssociatedCodecType;
|
|
codec_settings.VP9()->numberOfTemporalLayers = 1;
|
|
codec_settings.VP9()->numberOfSpatialLayers = 1;
|
|
codec_settings.codecType = webrtc::kVideoCodecMultiplex;
|
|
return codec_settings;
|
|
}
|
|
|
|
std::unique_ptr<VideoFrame> CreateI420AInputFrame() {
|
|
rtc::scoped_refptr<webrtc::I420BufferInterface> yuv_buffer =
|
|
input_frame_->video_frame_buffer()->ToI420();
|
|
rtc::scoped_refptr<I420ABufferInterface> yuva_buffer = WrapI420ABuffer(
|
|
yuv_buffer->width(), yuv_buffer->height(), yuv_buffer->DataY(),
|
|
yuv_buffer->StrideY(), yuv_buffer->DataU(), yuv_buffer->StrideU(),
|
|
yuv_buffer->DataV(), yuv_buffer->StrideV(), yuv_buffer->DataY(),
|
|
yuv_buffer->StrideY(), rtc::KeepRefUntilDone(yuv_buffer));
|
|
return rtc::WrapUnique<VideoFrame>(
|
|
new VideoFrame(yuva_buffer, kVideoRotation_0, 0));
|
|
}
|
|
|
|
private:
|
|
void SetUp() override {
|
|
EXPECT_CALL(*decoder_factory_, Die());
|
|
// The decoders/encoders will be owned by the caller of
|
|
// CreateVideoDecoder()/CreateVideoEncoder().
|
|
VideoDecoder* decoder1 = VP9Decoder::Create().release();
|
|
VideoDecoder* decoder2 = VP9Decoder::Create().release();
|
|
EXPECT_CALL(*decoder_factory_, CreateVideoDecoderProxy(_))
|
|
.WillOnce(Return(decoder1))
|
|
.WillOnce(Return(decoder2));
|
|
|
|
EXPECT_CALL(*encoder_factory_, Die());
|
|
VideoEncoder* encoder1 = VP9Encoder::Create().release();
|
|
VideoEncoder* encoder2 = VP9Encoder::Create().release();
|
|
EXPECT_CALL(*encoder_factory_, CreateVideoEncoderProxy(_))
|
|
.WillOnce(Return(encoder1))
|
|
.WillOnce(Return(encoder2));
|
|
|
|
VideoCodecTest::SetUp();
|
|
}
|
|
|
|
const std::unique_ptr<webrtc::MockVideoDecoderFactory> decoder_factory_;
|
|
const std::unique_ptr<webrtc::MockVideoEncoderFactory> encoder_factory_;
|
|
};
|
|
|
|
// TODO(emircan): Currently VideoCodecTest tests do a complete setup
|
|
// step that goes beyond constructing |decoder_|. Simplify these tests to do
|
|
// less.
|
|
TEST_F(TestMultiplexAdapter, ConstructAndDestructDecoder) {
|
|
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, decoder_->Release());
|
|
}
|
|
|
|
TEST_F(TestMultiplexAdapter, ConstructAndDestructEncoder) {
|
|
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, encoder_->Release());
|
|
}
|
|
|
|
TEST_F(TestMultiplexAdapter, EncodeDecodeI420Frame) {
|
|
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
|
|
encoder_->Encode(*input_frame_, nullptr, nullptr));
|
|
EncodedImage encoded_frame;
|
|
CodecSpecificInfo codec_specific_info;
|
|
ASSERT_TRUE(WaitForEncodedFrame(&encoded_frame, &codec_specific_info));
|
|
|
|
EXPECT_EQ(kVideoCodecMultiplex, codec_specific_info.codecType);
|
|
|
|
EXPECT_EQ(
|
|
WEBRTC_VIDEO_CODEC_OK,
|
|
decoder_->Decode(encoded_frame, false, nullptr, &codec_specific_info));
|
|
std::unique_ptr<VideoFrame> decoded_frame;
|
|
rtc::Optional<uint8_t> decoded_qp;
|
|
ASSERT_TRUE(WaitForDecodedFrame(&decoded_frame, &decoded_qp));
|
|
ASSERT_TRUE(decoded_frame);
|
|
EXPECT_GT(I420PSNR(input_frame_.get(), decoded_frame.get()), 36);
|
|
}
|
|
|
|
TEST_F(TestMultiplexAdapter, EncodeDecodeI420AFrame) {
|
|
std::unique_ptr<VideoFrame> yuva_frame = CreateI420AInputFrame();
|
|
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
|
|
encoder_->Encode(*yuva_frame, nullptr, nullptr));
|
|
EncodedImage encoded_frame;
|
|
CodecSpecificInfo codec_specific_info;
|
|
ASSERT_TRUE(WaitForEncodedFrame(&encoded_frame, &codec_specific_info));
|
|
|
|
EXPECT_EQ(kVideoCodecMultiplex, codec_specific_info.codecType);
|
|
|
|
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
|
|
decoder_->Decode(encoded_frame, false, nullptr, nullptr));
|
|
std::unique_ptr<VideoFrame> decoded_frame;
|
|
rtc::Optional<uint8_t> decoded_qp;
|
|
ASSERT_TRUE(WaitForDecodedFrame(&decoded_frame, &decoded_qp));
|
|
ASSERT_TRUE(decoded_frame);
|
|
EXPECT_GT(I420PSNR(yuva_frame.get(), decoded_frame.get()), 36);
|
|
}
|
|
|
|
} // namespace webrtc
|