webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc - Issue 2998293002: Make CodecType conversion functions non-optional.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc

Issue 2998293002: Make CodecType conversion functions non-optional. (Closed)

Patch Set: Keep old functions for backwards-compat Created 3 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc

diff --git a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc

index efbf2c23f2f537b7f4b7a9ef3a756855a803e8fb..5b2c0ac645b3881d346f380008100b243080c397 100644

--- a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc

+++ b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc

@@ -553,8 +553,7 @@ int32_t MediaCodecVideoEncoder::ProcessHWErrorOnEncode() {

}

VideoCodecType MediaCodecVideoEncoder::GetCodecType() const {

- return webrtc::PayloadNameToCodecType(codec_.name)

- .value_or(webrtc::kVideoCodecUnknown);

+ return webrtc::PayloadStringToCodecType(codec_.name);

}

int32_t MediaCodecVideoEncoder::InitEncodeInternal(int width,