diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index bb43434cca..bc8e089b06 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -1213,6 +1213,7 @@ rtc_static_library("native_api_codecs") {
 
   deps = [
     ":base_jni",
+    ":native_api_jni",
     ":video_jni",
     "//api/video_codecs:video_codecs_api",
     "//rtc_base:checks",
diff --git a/sdk/android/native_api/codecs/wrapper.cc b/sdk/android/native_api/codecs/wrapper.cc
index 5448955a45..3c5fb3d3e1 100644
--- a/sdk/android/native_api/codecs/wrapper.cc
+++ b/sdk/android/native_api/codecs/wrapper.cc
@@ -11,11 +11,18 @@
 #include "sdk/android/native_api/codecs/wrapper.h"
 
 #include "absl/memory/memory.h"
+#include "sdk/android/native_api/jni/scoped_java_ref.h"
+#include "sdk/android/src/jni/videocodecinfo.h"
 #include "sdk/android/src/jni/videodecoderfactorywrapper.h"
 #include "sdk/android/src/jni/videoencoderfactorywrapper.h"
 
 namespace webrtc {
 
+SdpVideoFormat JavaToNativeVideoCodecInfo(JNIEnv* jni, jobject codec_info) {
+  return jni::VideoCodecInfoToSdpVideoFormat(jni,
+                                             JavaParamRef<jobject>(codec_info));
+}
+
 std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(
     JNIEnv* jni,
     jobject decoder_factory) {
@@ -25,9 +32,9 @@ std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(
 
 std::unique_ptr<VideoEncoderFactory> JavaToNativeVideoEncoderFactory(
     JNIEnv* jni,
-    jobject en) {
+    jobject encoder_factory) {
   return absl::make_unique<jni::VideoEncoderFactoryWrapper>(
-      jni, JavaParamRef<jobject>(en));
+      jni, JavaParamRef<jobject>(encoder_factory));
 }
 
 }  // namespace webrtc
diff --git a/sdk/android/native_api/codecs/wrapper.h b/sdk/android/native_api/codecs/wrapper.h
index b13f2700be..b1ff24c679 100644
--- a/sdk/android/native_api/codecs/wrapper.h
+++ b/sdk/android/native_api/codecs/wrapper.h
@@ -14,11 +14,15 @@
 #include <jni.h>
 #include <memory>
 
+#include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
 
 namespace webrtc {
 
+// Creates an instance of webrtc::SdpVideoFormat from Java VideoCodecInfo.
+SdpVideoFormat JavaToNativeVideoCodecInfo(JNIEnv* jni, jobject codec_info);
+
 // Creates an instance of webrtc::VideoDecoderFactory from Java
 // VideoDecoderFactory.
 std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(