Cleanup mocks for Video (en|de)coder factories
In particular remove proxy mocks in favor of lambdas and Return(ByMove(...)) Bug: None Change-Id: If6b79601437e82a7116479d128d538e965622fab Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/174701 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31179}
This commit is contained in:

committed by
Commit Bot

parent
1e83d34fc1
commit
b63331bb8f
@ -180,21 +180,17 @@ class TestMultiplexAdapter : public VideoCodecUnitTest,
|
||||
|
||||
private:
|
||||
void SetUp() override {
|
||||
EXPECT_CALL(*decoder_factory_, Die());
|
||||
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(*decoder_factory_, CreateVideoDecoder)
|
||||
.Times(2)
|
||||
.WillRepeatedly([] { return VP9Decoder::Create(); });
|
||||
|
||||
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));
|
||||
EXPECT_CALL(*encoder_factory_, Die);
|
||||
EXPECT_CALL(*encoder_factory_, CreateVideoEncoder)
|
||||
.Times(2)
|
||||
.WillRepeatedly([] { return VP9Encoder::Create(); });
|
||||
|
||||
VideoCodecUnitTest::SetUp();
|
||||
}
|
||||
|
Reference in New Issue
Block a user