Index: webrtc/api/android/jni/androidmediaencoder_jni.cc |
diff --git a/webrtc/api/android/jni/androidmediaencoder_jni.cc b/webrtc/api/android/jni/androidmediaencoder_jni.cc |
index d5998c032c6132c71cd9e84cf68594bb010665c9..08fc766be62349aa6cbc6ab6b5dd81c3306ef3db 100644 |
--- a/webrtc/api/android/jni/androidmediaencoder_jni.cc |
+++ b/webrtc/api/android/jni/androidmediaencoder_jni.cc |
@@ -393,7 +393,8 @@ int32_t MediaCodecVideoEncoder::InitEncode( |
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; |
} |
// Factory should guard against other codecs being used with us. |
- const VideoCodecType codec_type = cricket::CodecTypeFromName(codec_.name); |
+ const VideoCodecType codec_type = webrtc::PayloadNameToCodecType(codec_.name) |
+ .value_or(webrtc::kVideoCodecUnknown); |
RTC_CHECK(codec_settings->codecType == codec_type) |
<< "Unsupported codec " << codec_settings->codecType << " for " |
<< codec_type; |
@@ -552,7 +553,8 @@ int32_t MediaCodecVideoEncoder::InitEncodeOnCodecThread( |
JNIEnv* jni = AttachCurrentThreadIfNeeded(); |
ScopedLocalRefFrame local_ref_frame(jni); |
- const VideoCodecType codec_type = cricket::CodecTypeFromName(codec_.name); |
+ const VideoCodecType codec_type = webrtc::PayloadNameToCodecType(codec_.name) |
+ .value_or(webrtc::kVideoCodecUnknown); |
ALOGD << "InitEncodeOnCodecThread Type: " << (int)codec_type << ", " << width |
<< " x " << height << ". Bitrate: " << kbps << " kbps. Fps: " << fps; |
if (kbps == 0) { |
@@ -1067,7 +1069,9 @@ bool MediaCodecVideoEncoder::DeliverPendingOutputs(JNIEnv* jni) { |
} |
// Callback - return encoded frame. |
- const VideoCodecType codec_type = cricket::CodecTypeFromName(codec_.name); |
+ const VideoCodecType codec_type = |
+ webrtc::PayloadNameToCodecType(codec_.name) |
+ .value_or(webrtc::kVideoCodecUnknown); |
webrtc::EncodedImageCallback::Result callback_result( |
webrtc::EncodedImageCallback::Result::OK); |
if (callback_) { |