aboutsummaryrefslogtreecommitdiff
path: root/media/base/codec_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/base/codec_unittest.cc')
-rw-r--r--media/base/codec_unittest.cc25
1 files changed, 2 insertions, 23 deletions
diff --git a/media/base/codec_unittest.cc b/media/base/codec_unittest.cc
index 3586760a14..23bae7b7fe 100644
--- a/media/base/codec_unittest.cc
+++ b/media/base/codec_unittest.cc
@@ -19,7 +19,6 @@
using cricket::AudioCodec;
using cricket::Codec;
-using cricket::DataCodec;
using cricket::FeedbackParam;
using cricket::kCodecParamAssociatedPayloadType;
using cricket::kCodecParamMaxBitrate;
@@ -31,7 +30,8 @@ class TestCodec : public Codec {
TestCodec(int id, const std::string& name, int clockrate)
: Codec(id, name, clockrate) {}
TestCodec() : Codec() {}
- TestCodec(const TestCodec& c) : Codec(c) {}
+ TestCodec(const TestCodec& c) = default;
+ TestCodec& operator=(const TestCodec& c) = default;
};
TEST(CodecTest, TestCodecOperators) {
@@ -303,27 +303,6 @@ TEST(CodecTest, TestH264CodecMatches) {
}
}
-TEST(CodecTest, TestDataCodecMatches) {
- // Test a codec with a static payload type.
- DataCodec c0(34, "D");
- EXPECT_TRUE(c0.Matches(DataCodec(34, "")));
- EXPECT_FALSE(c0.Matches(DataCodec(96, "D")));
- EXPECT_FALSE(c0.Matches(DataCodec(96, "")));
-
- // Test a codec with a dynamic payload type.
- DataCodec c1(96, "D");
- EXPECT_TRUE(c1.Matches(DataCodec(96, "D")));
- EXPECT_TRUE(c1.Matches(DataCodec(97, "D")));
- EXPECT_TRUE(c1.Matches(DataCodec(96, "d")));
- EXPECT_TRUE(c1.Matches(DataCodec(97, "d")));
- EXPECT_TRUE(c1.Matches(DataCodec(35, "d")));
- EXPECT_TRUE(c1.Matches(DataCodec(42, "d")));
- EXPECT_TRUE(c1.Matches(DataCodec(63, "d")));
- EXPECT_FALSE(c1.Matches(DataCodec(96, "")));
- EXPECT_FALSE(c1.Matches(DataCodec(95, "D")));
- EXPECT_FALSE(c1.Matches(DataCodec(34, "D")));
-}
-
TEST(CodecTest, TestSetParamGetParamAndRemoveParam) {
AudioCodec codec;
codec.SetParam("a", "1");