s/WebRtcVideoChannel2/WebRtcVideoChannel and s/WebRtcVideoEngine2/WebRtcVideoEngine

webrtc/media/engine/webrtcmediaengine.cc

 /*
  *  Copyright (c) 2014 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 "webrtc/media/engine/webrtcmediaengine.h"
 
 #include <algorithm>
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "webrtc/media/engine/webrtcvoiceengine.h"
 
 #ifdef HAVE_WEBRTC_VIDEO
-#include "webrtc/media/engine/webrtcvideoengine2.h"
+#include "webrtc/media/engine/webrtcvideoengine.h"
 #else
 #include "webrtc/media/engine/nullwebrtcvideoengine.h"
 #endif
 
 namespace cricket {
 
 class WebRtcMediaEngine2
 #ifdef HAVE_WEBRTC_VIDEO
-    : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2> {
+    : public CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine> {
 #else
     : public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> {
 #endif
  public:
   WebRtcMediaEngine2(webrtc::AudioDeviceModule* adm,
                      const rtc::scoped_refptr<webrtc::AudioEncoderFactory>&
                          audio_encoder_factory,
                      const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
                          audio_decoder_factory,
                      WebRtcVideoEncoderFactory* video_encoder_factory,
                      WebRtcVideoDecoderFactory* video_decoder_factory,
                      rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer)
 #ifdef HAVE_WEBRTC_VIDEO
-      : CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine2>(
+      : CompositeMediaEngine<WebRtcVoiceEngine, WebRtcVideoEngine>(
             adm,
             audio_encoder_factory,
             audio_decoder_factory,
             audio_mixer){
 #else
       : CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(
             adm,
             audio_encoder_factory,
             audio_decoder_factory,
             audio_mixer) {
@@ skipping 190 matching lines @@
   }
   if (codec.GetParam(kCodecParamMaxBitrate, &bitrate_kbps) &&
       bitrate_kbps > 0) {
     config.max_bitrate_bps = bitrate_kbps * 1000;
   } else {
     config.max_bitrate_bps = -1;
   }
   return config;
 }
 }  // namespace cricket