From 681d448d887f8f721b9e06d8a63352ae9d50f9f3 Mon Sep 17 00:00:00 2001 From: "mallinath@webrtc.org" Date: Tue, 25 Mar 2014 18:44:58 +0000 Subject: [PATCH] Removing VideoCodecDerived and moving methods inside VideoCodec. VideoCodecDerived added to handle changes to talk (fakewebrtcvideoengine.h). R=mflodman@webrtc.org TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/10569004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5784 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/common_types.h | 6 ------ webrtc/video_engine/vie_codec_unittest.cc | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/webrtc/common_types.h b/webrtc/common_types.h index b1f1ba05d..5d63a61df 100644 --- a/webrtc/common_types.h +++ b/webrtc/common_types.h @@ -658,13 +658,7 @@ struct VideoCodec { // When using an external encoder/decoder this allows to pass // extra options without requiring webrtc to be aware of them. Config* extra_options; -}; -// TODO(mallinath) - Remove this and push these two methods inside VideoCodec. -// This is done to handle operator== defined in fakewebrtcvideoengine.h -// This modification allows us to commit this CL directly and not with libjingle -// push. -struct VideoCodecDerived : public VideoCodec { bool operator==(const VideoCodec& other) const { bool ret = codecType == other.codecType && (STR_CASE_CMP(plName, other.plName) == 0) && diff --git a/webrtc/video_engine/vie_codec_unittest.cc b/webrtc/video_engine/vie_codec_unittest.cc index 31cec05a1..9f648ec52 100644 --- a/webrtc/video_engine/vie_codec_unittest.cc +++ b/webrtc/video_engine/vie_codec_unittest.cc @@ -60,7 +60,7 @@ void SetSimulcastSettings(webrtc::VideoCodec* video_codec) { // This test compares two VideoCodecInst objects except codec specific and // simulcast streams. TEST(ViECodecTest, TestCompareCodecs) { - VideoCodecDerived codec1, codec2; + VideoCodec codec1, codec2; memset(&codec1, 0, sizeof(VideoCodec)); memset(&codec2, 0, sizeof(VideoCodec)); @@ -119,7 +119,7 @@ TEST(ViECodecTest, TestCompareCodecs) { // Test VP8 specific comparision. TEST(ViECodecTest, TestCompareVP8CodecSpecific) { - VideoCodecDerived codec1, codec2; + VideoCodec codec1, codec2; memset(&codec1, 0, sizeof(VideoCodec)); memset(&codec2, 0, sizeof(VideoCodec)); @@ -179,7 +179,7 @@ TEST(ViECodecTest, TestCompareVP8CodecSpecific) { // This test compares simulcast stream information in VideoCodec. TEST(ViECodecTest, TestCompareSimulcastStreams) { - VideoCodecDerived codec1, codec2; + VideoCodec codec1, codec2; memset(&codec1, 0, sizeof(VideoCodec)); memset(&codec2, 0, sizeof(VideoCodec));