Replace WebRtcVideoEncoderFactory::VideoCodec with cricket::VideoCodec

webrtc/api/android/jni/androidmediaencoder_jni.h

 /*
  *  Copyright 2015 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.
  */
 
@@ skipping 10 matching lines @@
 // Implementation of Android MediaCodec based encoder factory.
 class MediaCodecVideoEncoderFactory
     : public cricket::WebRtcVideoEncoderFactory {
  public:
   MediaCodecVideoEncoderFactory();
   virtual ~MediaCodecVideoEncoderFactory();
 
   void SetEGLContext(JNIEnv* jni, jobject egl_context);
 
   // WebRtcVideoEncoderFactory implementation.
-  webrtc::VideoEncoder* CreateVideoEncoder(webrtc::VideoCodecType type)
-      override;
-  const std::vector<VideoCodec>& codecs() const override;
+  webrtc::VideoEncoder* CreateVideoEncoder(
+      const cricket::VideoCodec& codec) override;
+  const std::vector<cricket::VideoCodec>& supported_codecs() const override;
   void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override;
 
  private:
+  // Disable overloaded virtual function warning. TODO(magjed): Remove once
+  // http://crbug/webrtc/6402 is fixed.
+  using cricket::WebRtcVideoEncoderFactory::CreateVideoEncoder;
+
   jobject egl_context_;
 
   // Empty if platform support is lacking, const after ctor returns.
-  std::vector<VideoCodec> supported_codecs_;
+  std::vector<cricket::VideoCodec> supported_codecs_;
 };
 
 }  // namespace webrtc_jni
 
 #endif  // WEBRTC_API_JAVA_JNI_ANDROIDMEDIAENCODER_JNI_H_