Remove RTPPayloadStrategy and simplify RTPPayloadRegistry

webrtc/modules/rtp_rtcp/source/rtp_payload_registry_unittest.cc

 /*
  *  Copyright (c) 2013 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 <memory>
 
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/modules/rtp_rtcp/source/mock/mock_rtp_payload_strategy.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 
 using ::testing::Eq;
 using ::testing::Return;
 using ::testing::StrEq;
 using ::testing::_;
 
 static const char* kTypicalPayloadName = "name";
 static const size_t kTypicalChannels = 1;
-static const int kTypicalFrequency = 44000;
-static const int kTypicalRate = 32 * 1024;
+static const uint32_t kTypicalFrequency = 44000;

[danilchap, 2016/11/23 19:06:18]

what is the reason for using fixed size integer type?
(generally it is discouraged by style guide).

[magjed_webrtc, 2016/11/24 12:20:39]

I had to change them in order to avoid compiler warnings/errors about comparing
integers with different signs. They will be compared against members from this
class:
struct AudioPayload {
    uint32_t    frequency;
    size_t      channels;
    uint32_t    rate;
};
so I changed the types to match exactly.

+static const uint32_t kTypicalRate = 32 * 1024;
 static const CodecInst kTypicalAudioCodec = {-1 /* pltype */,   "name",
                                              kTypicalFrequency, 0 /* pacsize */,
                                              kTypicalChannels,  kTypicalRate};
 
 class RtpPayloadRegistryTest : public ::testing::Test {

[danilchap, 2016/11/23 19:06:18]

This fixture become so simple that in one CL it is possible to remove it
completely. Nice!

[magjed_webrtc, 2016/11/24 12:20:39]

Yeah, you're right. I went ahead and removed the fixture in this CL.

  public:
   void SetUp() {
     // Note: the payload registry takes ownership of the strategy.
-    mock_payload_strategy_ = new testing::NiceMock<MockRTPPayloadStrategy>();
-    rtp_payload_registry_.reset(new RTPPayloadRegistry(mock_payload_strategy_));
+    rtp_payload_registry_.reset(new RTPPayloadRegistry());
   }
 
  protected:
-  RtpUtility::Payload* ExpectReturnOfTypicalAudioPayload(uint8_t payload_type,
-                                                         uint32_t rate) {
-    bool audio = true;
-    RtpUtility::Payload returned_payload = {
-        "name",
-        audio,
-        {// Initialize the audio struct in this case.
-         {kTypicalFrequency, kTypicalChannels, rate}}};
-
-    // Note: we return a new payload since the payload registry takes ownership
-    // of the created object.
-    RtpUtility::Payload* returned_payload_on_heap =
-        new RtpUtility::Payload(returned_payload);
-    EXPECT_CALL(*mock_payload_strategy_,
-                CreatePayloadType(StrEq(kTypicalPayloadName), payload_type,
-                                  kTypicalFrequency, kTypicalChannels, rate))
-        .WillOnce(Return(returned_payload_on_heap));
-    return returned_payload_on_heap;
-  }
-
   std::unique_ptr<RTPPayloadRegistry> rtp_payload_registry_;
-  testing::NiceMock<MockRTPPayloadStrategy>* mock_payload_strategy_;
 };
 
 TEST_F(RtpPayloadRegistryTest,
        RegistersAndRemembersVideoPayloadsUntilDeregistered) {
   const uint8_t payload_type = 97;
-  RtpUtility::Payload returned_video_payload = {
-      "VP8", false /* audio */, {{kRtpVideoVp8}}};
-  // Note: The payload registry takes ownership of this object in
-  // RegisterReceivePayload.
-  RtpUtility::Payload* returned_video_payload_on_heap =
-      new RtpUtility::Payload(returned_video_payload);
-  EXPECT_CALL(
-      *mock_payload_strategy_,
-      CreatePayloadType(StrEq("VP8"), payload_type, kVideoPayloadTypeFrequency,
-                        0 /* channels */, 0 /* rate */))
-      .WillOnce(Return(returned_video_payload_on_heap));
-
   VideoCodec video_codec;
   video_codec.codecType = kVideoCodecVP8;
   strcpy(video_codec.plName, "VP8");
   video_codec.plType = payload_type;
 
   EXPECT_EQ(0, rtp_payload_registry_->RegisterReceivePayload(video_codec));
 
   const RtpUtility::Payload* retrieved_payload =
       rtp_payload_registry_->PayloadTypeToPayload(payload_type);
   EXPECT_TRUE(retrieved_payload);
 
-  // We should get back the exact pointer to the payload returned by the
-  // payload strategy.
-  EXPECT_EQ(returned_video_payload_on_heap, retrieved_payload);
+  // We should get back the corresponding payload that we registered.
+  EXPECT_STREQ("VP8", retrieved_payload->name);
+  EXPECT_EQ(false, retrieved_payload->audio);

[danilchap, 2016/11/23 19:06:18]

EXPECT_FALSE(retrieved_payload->audio);

[magjed_webrtc, 2016/11/24 12:20:39]

Done.

+  EXPECT_EQ(kRtpVideoVp8, retrieved_payload->typeSpecific.Video.videoCodecType);
 
   // Now forget about it and verify it's gone.
   EXPECT_EQ(0, rtp_payload_registry_->DeRegisterReceivePayload(payload_type));
   EXPECT_FALSE(rtp_payload_registry_->PayloadTypeToPayload(payload_type));
 }
 
 TEST_F(RtpPayloadRegistryTest,
        RegistersAndRemembersAudioPayloadsUntilDeregistered) {
   uint8_t payload_type = 97;
-  RtpUtility::Payload* returned_payload_on_heap =
-      ExpectReturnOfTypicalAudioPayload(payload_type, kTypicalRate);
-
   bool new_payload_created = false;
   CodecInst audio_codec = kTypicalAudioCodec;
   audio_codec.pltype = payload_type;
   EXPECT_EQ(0, rtp_payload_registry_->RegisterReceivePayload(
                    audio_codec, &new_payload_created));
 
   EXPECT_TRUE(new_payload_created) << "A new payload WAS created.";
 
   const RtpUtility::Payload* retrieved_payload =
       rtp_payload_registry_->PayloadTypeToPayload(payload_type);
   EXPECT_TRUE(retrieved_payload);
 
-  // We should get back the exact pointer to the payload returned by the
-  // payload strategy.
-  EXPECT_EQ(returned_payload_on_heap, retrieved_payload);
+  // We should get back the corresponding payload that we registered.
+  EXPECT_STREQ(kTypicalPayloadName, retrieved_payload->name);
+  EXPECT_EQ(true, retrieved_payload->audio);

[danilchap, 2016/11/23 19:06:18]

EXPECT_TRUE(retrieved_payload->audio)

[magjed_webrtc, 2016/11/24 12:20:39]

Done.

+  EXPECT_EQ(kTypicalFrequency, retrieved_payload->typeSpecific.Audio.frequency);
+  EXPECT_EQ(kTypicalChannels, retrieved_payload->typeSpecific.Audio.channels);
+  EXPECT_EQ(kTypicalRate, retrieved_payload->typeSpecific.Audio.rate);
 
   // Now forget about it and verify it's gone.
   EXPECT_EQ(0, rtp_payload_registry_->DeRegisterReceivePayload(payload_type));
   EXPECT_FALSE(rtp_payload_registry_->PayloadTypeToPayload(payload_type));
 }
 
 TEST_F(RtpPayloadRegistryTest, AudioRedWorkProperly) {
   const uint8_t kRedPayloadType = 127;
   const int kRedSampleRate = 8000;
   const size_t kRedChannels = 1;
   const int kRedBitRate = 0;
 
   // This creates an audio RTP payload strategy.
-  rtp_payload_registry_.reset(
-      new RTPPayloadRegistry(RTPPayloadStrategy::CreateStrategy(true)));
+  rtp_payload_registry_.reset(new RTPPayloadRegistry());

[danilchap, 2016/11/23 19:06:18]

without strategies look like the line can be removed completly

[magjed_webrtc, 2016/11/24 12:20:39]

Done.

 
   bool new_payload_created = false;
   CodecInst red_audio_codec;
   strcpy(red_audio_codec.plname, "red");
   red_audio_codec.pltype = kRedPayloadType;
   red_audio_codec.plfreq = kRedSampleRate;
   red_audio_codec.channels = kRedChannels;
   red_audio_codec.rate = kRedBitRate;
   EXPECT_EQ(0, rtp_payload_registry_->RegisterReceivePayload(
                    red_audio_codec, &new_payload_created));
@@ skipping 10 matching lines @@
   // Sample rate is correctly registered.
   EXPECT_EQ(kRedSampleRate,
             rtp_payload_registry_->GetPayloadTypeFrequency(kRedPayloadType));
 }
 
 TEST_F(RtpPayloadRegistryTest,
        DoesNotAcceptSamePayloadTypeTwiceExceptIfPayloadIsCompatible) {
   uint8_t payload_type = 97;
 
   bool ignored = false;
-  RtpUtility::Payload* first_payload_on_heap =
-      ExpectReturnOfTypicalAudioPayload(payload_type, kTypicalRate);
   CodecInst audio_codec = kTypicalAudioCodec;
   audio_codec.pltype = payload_type;
   EXPECT_EQ(
       0, rtp_payload_registry_->RegisterReceivePayload(audio_codec, &ignored));
 
-  EXPECT_EQ(
-      -1, rtp_payload_registry_->RegisterReceivePayload(audio_codec, &ignored))
-      << "Adding same codec twice = bad.";
+  CodecInst audio_codec_2 = kTypicalAudioCodec;
+  audio_codec_2.pltype = payload_type;
+  // Make |audio_codec_2| incompatible with |audio_codec| by changing
+  // the frequency.
+  audio_codec_2.plfreq = kTypicalFrequency + 1;
+  EXPECT_EQ(-1, rtp_payload_registry_->RegisterReceivePayload(audio_codec_2,
+                                                              &ignored))
+      << "Adding incompatible codec with same payload type = bad.";
 
-  RtpUtility::Payload* second_payload_on_heap =
-      ExpectReturnOfTypicalAudioPayload(payload_type - 1, kTypicalRate);
-  CodecInst audio_codec_2 = kTypicalAudioCodec;
+  // Change payload type.
   audio_codec_2.pltype = payload_type - 1;
   EXPECT_EQ(
       0, rtp_payload_registry_->RegisterReceivePayload(audio_codec_2, &ignored))
       << "With a different payload type is fine though.";
 
   // Ensure both payloads are preserved.
   const RtpUtility::Payload* retrieved_payload =
       rtp_payload_registry_->PayloadTypeToPayload(payload_type);
   EXPECT_TRUE(retrieved_payload);
-  EXPECT_EQ(first_payload_on_heap, retrieved_payload);
+  EXPECT_STREQ(kTypicalPayloadName, retrieved_payload->name);
+  EXPECT_EQ(true, retrieved_payload->audio);
+  EXPECT_EQ(kTypicalFrequency, retrieved_payload->typeSpecific.Audio.frequency);
+  EXPECT_EQ(kTypicalChannels, retrieved_payload->typeSpecific.Audio.channels);
+  EXPECT_EQ(kTypicalRate, retrieved_payload->typeSpecific.Audio.rate);
+
   retrieved_payload =
       rtp_payload_registry_->PayloadTypeToPayload(payload_type - 1);
   EXPECT_TRUE(retrieved_payload);
-  EXPECT_EQ(second_payload_on_heap, retrieved_payload);
+  EXPECT_STREQ(kTypicalPayloadName, retrieved_payload->name);
+  EXPECT_EQ(true, retrieved_payload->audio);
+  EXPECT_EQ(kTypicalFrequency + 1,
+            retrieved_payload->typeSpecific.Audio.frequency);
+  EXPECT_EQ(kTypicalChannels, retrieved_payload->typeSpecific.Audio.channels);
+  EXPECT_EQ(kTypicalRate, retrieved_payload->typeSpecific.Audio.rate);
 
   // Ok, update the rate for one of the codecs. If either the incoming rate or
   // the stored rate is zero it's not really an error to register the same
   // codec twice, and in that case roughly the following happens.
-  ON_CALL(*mock_payload_strategy_, PayloadIsCompatible(_, _, _, _))
-      .WillByDefault(Return(true));
-  EXPECT_CALL(*mock_payload_strategy_,
-              UpdatePayloadRate(first_payload_on_heap, kTypicalRate));
   EXPECT_EQ(
       0, rtp_payload_registry_->RegisterReceivePayload(audio_codec, &ignored));
 }
 
 TEST_F(RtpPayloadRegistryTest,
        RemovesCompatibleCodecsOnRegistryIfCodecsMustBeUnique) {
-  ON_CALL(*mock_payload_strategy_, PayloadIsCompatible(_, _, _, _))
-      .WillByDefault(Return(true));
-  ON_CALL(*mock_payload_strategy_, CodecsMustBeUnique())
-      .WillByDefault(Return(true));
-
   uint8_t payload_type = 97;
 
   bool ignored = false;
-  ExpectReturnOfTypicalAudioPayload(payload_type, kTypicalRate);
   CodecInst audio_codec = kTypicalAudioCodec;
   audio_codec.pltype = payload_type;
   EXPECT_EQ(
       0, rtp_payload_registry_->RegisterReceivePayload(audio_codec, &ignored));
-  ExpectReturnOfTypicalAudioPayload(payload_type - 1, kTypicalRate);
   CodecInst audio_codec_2 = kTypicalAudioCodec;
   audio_codec_2.pltype = payload_type - 1;
   EXPECT_EQ(0, rtp_payload_registry_->RegisterReceivePayload(audio_codec_2,
                                                              &ignored));
 
   EXPECT_FALSE(rtp_payload_registry_->PayloadTypeToPayload(payload_type))
       << "The first payload should be "
          "deregistered because the only thing that differs is payload type.";
   EXPECT_TRUE(rtp_payload_registry_->PayloadTypeToPayload(payload_type - 1))
       << "The second payload should still be registered though.";
 
-  // Now ensure non-compatible codecs aren't removed.
-  ON_CALL(*mock_payload_strategy_, PayloadIsCompatible(_, _, _, _))
-      .WillByDefault(Return(false));
-  ExpectReturnOfTypicalAudioPayload(payload_type + 1, kTypicalRate);
+  // Now ensure non-compatible codecs aren't removed. Make |audio_codec_3|
+  // incompatible by changing the frequency.
   CodecInst audio_codec_3 = kTypicalAudioCodec;
   audio_codec_3.pltype = payload_type + 1;
+  audio_codec_3.plfreq = kTypicalFrequency + 1;
   EXPECT_EQ(0, rtp_payload_registry_->RegisterReceivePayload(audio_codec_3,
                                                              &ignored));
 
   EXPECT_TRUE(rtp_payload_registry_->PayloadTypeToPayload(payload_type - 1))
       << "Not compatible; both payloads should be kept.";
   EXPECT_TRUE(rtp_payload_registry_->PayloadTypeToPayload(payload_type + 1))
       << "Not compatible; both payloads should be kept.";
 }
 
 TEST_F(RtpPayloadRegistryTest,
        LastReceivedCodecTypesAreResetWhenRegisteringNewPayloadTypes) {
   rtp_payload_registry_->set_last_received_payload_type(17);
   EXPECT_EQ(17, rtp_payload_registry_->last_received_payload_type());
 
   bool media_type_unchanged = rtp_payload_registry_->ReportMediaPayloadType(18);
   EXPECT_FALSE(media_type_unchanged);
   media_type_unchanged = rtp_payload_registry_->ReportMediaPayloadType(18);
   EXPECT_TRUE(media_type_unchanged);
 
   bool ignored;
-  ExpectReturnOfTypicalAudioPayload(34, kTypicalRate);
   CodecInst audio_codec = kTypicalAudioCodec;
   audio_codec.pltype = 34;
   EXPECT_EQ(
       0, rtp_payload_registry_->RegisterReceivePayload(audio_codec, &ignored));
 
   EXPECT_EQ(-1, rtp_payload_registry_->last_received_payload_type());
   media_type_unchanged = rtp_payload_registry_->ReportMediaPayloadType(18);
   EXPECT_FALSE(media_type_unchanged);
 }
 
 class ParameterizedRtpPayloadRegistryTest
     : public RtpPayloadRegistryTest,
       public ::testing::WithParamInterface<int> {};
 
 TEST_P(ParameterizedRtpPayloadRegistryTest,
        FailsToRegisterKnownPayloadsWeAreNotInterestedIn) {
   int payload_type = GetParam();
 
   bool ignored;
   CodecInst audio_codec;
   strcpy(audio_codec.plname, "whatever");
   audio_codec.pltype = static_cast<uint8_t>(payload_type);
-  audio_codec.plfreq = 19;
+  audio_codec.plfreq = 1900;
   audio_codec.channels = 1;
   audio_codec.rate = 17;
   EXPECT_EQ(
       -1, rtp_payload_registry_->RegisterReceivePayload(audio_codec, &ignored));
 }
 
 INSTANTIATE_TEST_CASE_P(TestKnownBadPayloadTypes,
                         ParameterizedRtpPayloadRegistryTest,
                         testing::Values(64, 72, 73, 74, 75, 76, 77, 78, 79));
 
 class RtpPayloadRegistryGenericTest
     : public RtpPayloadRegistryTest,
       public ::testing::WithParamInterface<int> {};
 
 TEST_P(RtpPayloadRegistryGenericTest, RegisterGenericReceivePayloadType) {
   const uint8_t payload_type = static_cast<uint8_t>(GetParam());
   bool ignored;
   CodecInst audio_codec;
   // Dummy values, except for payload_type.
   strcpy(audio_codec.plname, "generic-codec");
   audio_codec.pltype = payload_type;
-  audio_codec.plfreq = 19;
+  audio_codec.plfreq = 1900;
   audio_codec.channels = 1;
   audio_codec.rate = 17;
   EXPECT_EQ(
       0, rtp_payload_registry_->RegisterReceivePayload(audio_codec, &ignored));
 }
 
 // Generates an RTX packet for the given length and original sequence number.
 // The RTX sequence number and ssrc will use the default value of 9999. The
 // caller takes ownership of the returned buffer.
 const uint8_t* GenerateRtxPacket(size_t header_length,
@@ skipping 88 matching lines @@
   rtp_payload_registry_->SetRtxPayloadType(105, 95);
   TestRtxPacket(rtp_payload_registry_.get(), 105, 95, true);
   TestRtxPacket(rtp_payload_registry_.get(), 106, 0, false);
 }
 
 INSTANTIATE_TEST_CASE_P(TestDynamicRange,
                         RtpPayloadRegistryGenericTest,
                         testing::Range(96, 127 + 1));
 
 }  // namespace webrtc