Revert "Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config."

This reverts commit efb94d57eb88638c323d93dddc281390dada5021.

Reason for revert: Investigate and fix build errors.

Original change's description:
> Revert "Revert "Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config.""
>
> This reverts commit 7961dc2dbdb3391a003d63630d5107e258ff3e78.
>
> Reason for revert: WebRTC does not build
>
> Original change's description:
> > Revert "Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config."
> >
> > This reverts commit 529d0d9795b81dbed5e4231f15d3752a5fc0df32.
> >
> > Reason for revert: Seems to break perf tests, likely some breakage in video_quality_tests decoder configuration.
> >
> > Original change's description:
> > > Replace VideoDecoder with VideoDecoderFactory in VideoReceiveStream config.
> > >
> > > Preparation for deleting EnableFrameRecordning, and also a step
> > > towards landing of the new VideoStreamDecoder.
> > >
> > > Bug: webrtc:9106
> > > Change-Id: I50964ee458b08a702ec69b82a62e4995c57cee82
> > > Reviewed-on: https://webrtc-review.googlesource.com/97660
> > > Commit-Queue: Niels Moller <nisse@webrtc.org>
> > > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
> > > Reviewed-by: Anders Carlsson <andersc@webrtc.org>
> > > Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> > > Reviewed-by: Erik Språng <sprang@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#24861}
> >
> > TBR=brandtr@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org
> >
> > Change-Id: Id34e4a3452a7dbc06167a4df5bb4c2825ebd7bd0
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: webrtc:9106
> > Reviewed-on: https://webrtc-review.googlesource.com/102421
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Commit-Queue: Niels Moller <nisse@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#24866}
>
> TBR=brandtr@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org
>
> Change-Id: I23a439e1ceef79109b1f966b80b2663203968269
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:9106
> Reviewed-on: https://webrtc-review.googlesource.com/102422
> Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
> Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24867}

TBR=brandtr@webrtc.org,oprypin@webrtc.org,nisse@webrtc.org,andersc@webrtc.org,sprang@webrtc.org,philipel@webrtc.org,srte@webrtc.org

Change-Id: I9dafbc070e7f39dcb0ddbd61cb620164258fe894
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9106
Reviewed-on: https://webrtc-review.googlesource.com/102460
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24872}

1 files changed, 28 insertions, 55 deletions

diff --git a/video/end_to_end_tests/multi_codec_receive_tests.cc b/video/end_to_end_tests/multi_codec_receive_tests.cc
index e13bc351ca..7399ef81a4 100644
--- a/video/end_to_end_tests/multi_codec_receive_tests.cc
+++ b/video/end_to_end_tests/multi_codec_receive_tests.cc
@@ -180,7 +180,6 @@ class MultiCodecReceiveTest : public test::CallTest {
   struct CodecConfig {
     std::string payload_name;
     VideoEncoderFactory* encoder_factory;
-    VideoDecoderFactory* decoder_factory;
     size_t num_temporal_layers;
   };
 
@@ -198,16 +197,18 @@ class MultiCodecReceiveTest : public test::CallTest {
 
 void MultiCodecReceiveTest::ConfigureDecoders(
     const std::vector<CodecConfig>& configs) {
-  video_receive_configs_[0].decoders.clear();
   // Placing the payload names in a std::set retains the unique names only.
   std::set<std::string> unique_payload_names;
   for (const auto& config : configs)
-    if (unique_payload_names.insert(config.payload_name).second) {
-      VideoReceiveStream::Decoder decoder = test::CreateMatchingDecoder(
-          PayloadNameToPayloadType(config.payload_name), config.payload_name);
-      decoder.decoder_factory = config.decoder_factory;
+    unique_payload_names.insert(config.payload_name);
 
-      video_receive_configs_[0].decoders.push_back(decoder);
+  video_receive_configs_[0].decoders.clear();
+  for (const auto& payload_name : unique_payload_names) {
+    VideoReceiveStream::Decoder decoder = test::CreateMatchingDecoder(
+        PayloadNameToPayloadType(payload_name), payload_name);
+    allocated_decoders_.push_back(
+        std::unique_ptr<VideoDecoder>(decoder.decoder));
+    video_receive_configs_[0].decoders.push_back(decoder);
   }
 }
 
@@ -269,13 +270,9 @@ TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8Vp9) {
       []() { return VP8Encoder::Create(); });
   test::FunctionVideoEncoderFactory vp9_encoder_factory(
       []() { return VP9Encoder::Create(); });
-  test::FunctionVideoDecoderFactory vp8_decoder_factory(
-      []() { return VP8Decoder::Create(); });
-  test::FunctionVideoDecoderFactory vp9_decoder_factory(
-      []() { return VP9Decoder::Create(); });
-  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 1},
-                     {"VP9", &vp9_encoder_factory, &vp9_decoder_factory, 1},
-                     {"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 1}});
+  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, 1},
+                     {"VP9", &vp9_encoder_factory, 1},
+                     {"VP8", &vp8_encoder_factory, 1}});
 }
 
 TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8Vp9WithTl) {
@@ -283,13 +280,9 @@ TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8Vp9WithTl) {
       []() { return VP8Encoder::Create(); });
   test::FunctionVideoEncoderFactory vp9_encoder_factory(
       []() { return VP9Encoder::Create(); });
-  test::FunctionVideoDecoderFactory vp8_decoder_factory(
-      []() { return VP8Decoder::Create(); });
-  test::FunctionVideoDecoderFactory vp9_decoder_factory(
-      []() { return VP9Decoder::Create(); });
-  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 2},
-                     {"VP9", &vp9_encoder_factory, &vp9_decoder_factory, 2},
-                     {"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 2}});
+  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, 2},
+                     {"VP9", &vp9_encoder_factory, 2},
+                     {"VP8", &vp8_encoder_factory, 2}});
 }
 
 #if defined(WEBRTC_USE_H264)
@@ -298,13 +291,9 @@ TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8H264) {
       []() { return VP8Encoder::Create(); });
   test::FunctionVideoEncoderFactory h264_encoder_factory(
       []() { return H264Encoder::Create(cricket::VideoCodec("H264")); });
-  test::FunctionVideoDecoderFactory vp8_decoder_factory(
-      []() { return VP8Decoder::Create(); });
-  test::FunctionVideoDecoderFactory h264_decoder_factory(
-      []() { return H264Decoder::Create(); });
-  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 1},
-                     {"H264", &h264_encoder_factory, &h264_decoder_factory, 1},
-                     {"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 1}});
+  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, 1},
+                     {"H264", &h264_encoder_factory, 1},
+                     {"VP8", &vp8_encoder_factory, 1}});
 }
 
 TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8H264WithTl) {
@@ -312,13 +301,9 @@ TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8H264WithTl) {
       []() { return VP8Encoder::Create(); });
   test::FunctionVideoEncoderFactory h264_encoder_factory(
       []() { return H264Encoder::Create(cricket::VideoCodec("H264")); });
-  test::FunctionVideoDecoderFactory vp8_decoder_factory(
-      []() { return VP8Decoder::Create(); });
-  test::FunctionVideoDecoderFactory h264_decoder_factory(
-      []() { return H264Decoder::Create(); });
-  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 3},
-                     {"H264", &h264_encoder_factory, &h264_decoder_factory, 1},
-                     {"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 3}});
+  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, 3},
+                     {"H264", &h264_encoder_factory, 1},
+                     {"VP8", &vp8_encoder_factory, 3}});
 }
 
 TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8Vp9H264) {
@@ -328,16 +313,10 @@ TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8Vp9H264) {
       []() { return VP9Encoder::Create(); });
   test::FunctionVideoEncoderFactory h264_encoder_factory(
       []() { return H264Encoder::Create(cricket::VideoCodec("H264")); });
-  test::FunctionVideoDecoderFactory vp8_decoder_factory(
-      []() { return VP8Decoder::Create(); });
-  test::FunctionVideoDecoderFactory vp9_decoder_factory(
-      []() { return VP9Decoder::Create(); });
-  test::FunctionVideoDecoderFactory h264_decoder_factory(
-      []() { return H264Decoder::Create(); });
-  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 1},
-                     {"VP9", &vp9_encoder_factory, &vp9_decoder_factory, 1},
-                     {"H264", &h264_encoder_factory, &h264_decoder_factory, 1},
-                     {"VP9", &vp9_encoder_factory, &vp9_decoder_factory, 1}});
+  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, 1},
+                     {"VP9", &vp9_encoder_factory, 1},
+                     {"H264", &h264_encoder_factory, 1},
+                     {"VP9", &vp9_encoder_factory, 1}});
 }
 
 TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8Vp9H264WithTl) {
@@ -347,16 +326,10 @@ TEST_F(MultiCodecReceiveTest, SingleStreamReceivesVp8Vp9H264WithTl) {
       []() { return VP9Encoder::Create(); });
   test::FunctionVideoEncoderFactory h264_encoder_factory(
       []() { return H264Encoder::Create(cricket::VideoCodec("H264")); });
-  test::FunctionVideoDecoderFactory vp8_decoder_factory(
-      []() { return VP8Decoder::Create(); });
-  test::FunctionVideoDecoderFactory vp9_decoder_factory(
-      []() { return VP9Decoder::Create(); });
-  test::FunctionVideoDecoderFactory h264_decoder_factory(
-      []() { return H264Decoder::Create(); });
-  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, &vp8_decoder_factory, 3},
-                     {"VP9", &vp9_encoder_factory, &vp9_decoder_factory, 2},
-                     {"H264", &h264_encoder_factory, &h264_decoder_factory, 1},
-                     {"VP9", &vp9_encoder_factory, &vp9_decoder_factory, 3}});
+  RunTestWithCodecs({{"VP8", &vp8_encoder_factory, 3},
+                     {"VP9", &vp9_encoder_factory, 2},
+                     {"H264", &h264_encoder_factory, 1},
+                     {"VP9", &vp9_encoder_factory, 3}});
 }
 #endif  // defined(WEBRTC_USE_H264)