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

Update internal SW codecs to return unique_ptrs

Browse Source 
TBR=stefan@webrtc.org

Bug: webrtc:7925
Change-Id: I84239b071a2608d928f09b06809090eec5eafb14
Reviewed-on: https://webrtc-review.googlesource.com/21165
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20650}
This commit is contained in:
Magnus Jedvert
2017-11-11 13:28:49 +01:00
committed by Commit Bot
parent 8f91f1ee71
commit 4fe6adc06a
23 changed files with 100 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/video_coding/codecs/stereo/test/stereo_adapter_unittest.cc
View File

@ -31,12 +31,12 @@ class TestStereoAdapter : public VideoCodecTest {
encoder_factory_(new webrtc::MockVideoEncoderFactory) {}
protected:
VideoDecoder* CreateDecoder() override {
return new StereoDecoderAdapter(decoder_factory_.get());
std::unique_ptr<VideoDecoder> CreateDecoder() override {
return rtc::MakeUnique<StereoDecoderAdapter>(decoder_factory_.get());
}
VideoEncoder* CreateEncoder() override {
return new StereoEncoderAdapter(encoder_factory_.get());
std::unique_ptr<VideoEncoder> CreateEncoder() override {
return rtc::MakeUnique<StereoEncoderAdapter>(encoder_factory_.get());
}
VideoCodec codec_settings() override {
@ -62,15 +62,17 @@ class TestStereoAdapter : public VideoCodecTest {
private:
void SetUp() override {
EXPECT_CALL(*decoder_factory_, Die());
VideoDecoder* decoder1 = VP9Decoder::Create();
VideoDecoder* decoder2 = VP9Decoder::Create();
// 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();
VideoEncoder* encoder2 = VP9Encoder::Create();
VideoEncoder* encoder1 = VP9Encoder::Create().release();
VideoEncoder* encoder2 = VP9Encoder::Create().release();
EXPECT_CALL(*encoder_factory_, CreateVideoEncoderProxy(_))
.WillOnce(Return(encoder1))
.WillOnce(Return(encoder2));