webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm - 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/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc ('k') | webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm

diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm

index af82e0c4f2fc1f8440675cfb0448a069daf6c461..0fb8e46f2e2198f60c3737b27d38b4e86cd9647e 100644

--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm

+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm

@@ -30,10 +30,8 @@

- (instancetype)initWithNativeVideoCodec:(const webrtc::VideoCodec *)videoCodec {

if (self = [super init]) {

if (videoCodec) {

- rtc::Optional<const char *> codecName = CodecTypeToPayloadName(videoCodec->codecType);

- if (codecName) {

- _name = [NSString stringWithUTF8String:codecName.value()];

- }

+ const char *codecName = CodecTypeToPayloadString(videoCodec->codecType);

+ _name = [NSString stringWithUTF8String:codecName];

_width = videoCodec->width;

_height = videoCodec->height;