commit 681d448d887f8f721b9e06d8a63352ae9d50f9f3
author mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Mar 25 18:44:58 2014
committer mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Mar 25 18:44:58 2014
tree 1993961092e07eff1aa9450ffdcb40159dd3485b
parent 39f8ddae708e11469b838850f822eba808292402

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

diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index b1f1ba0..5d63a61 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -658,13 +658,7 @@
   // 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) &&

webrtc/video_engine/vie_codec_unittest.cc

diff --git a/webrtc/video_engine/vie_codec_unittest.cc b/webrtc/video_engine/vie_codec_unittest.cc
index 31cec05..9f648ec 100644
--- a/webrtc/video_engine/vie_codec_unittest.cc
+++ b/webrtc/video_engine/vie_codec_unittest.cc
@@ -60,7 +60,7 @@
 // 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 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 @@
 
 // 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));