webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.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/VideoToolbox/objc_video_decoder_factory.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/objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm ('k') | webrtc/video/send_statistics_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm

diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm

index 5a1a51f3f5a515757d14fdf1ca7bfa4ab1f5ffa3..9d4f2b8e0aadc237202d09cefcc3edcbcf62e5d6 100644

--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm

+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/objc_video_decoder_factory.mm

@@ -104,13 +104,9 @@ id<RTCVideoDecoderFactory> ObjCVideoDecoderFactory::wrapped_decoder_factory() co

}

VideoDecoder *ObjCVideoDecoderFactory::CreateVideoDecoder(VideoCodecType type) {

- const rtc::Optional<const char *> codec_name = CodecTypeToPayloadName(type);

- if (!codec_name) {

- LOG(LS_ERROR) << "Invalid codec type: " << type;

- return nullptr;

- }

+ const char *codec_name = CodecTypeToPayloadString(type);

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

+ NSString *codecName = [NSString stringWithUTF8String:codec_name];

for (RTCVideoCodecInfo *codecInfo in decoder_factory_.supportedCodecs) {

if ([codecName isEqualToString:codecInfo.name]) {

id<RTCVideoDecoder> decoder = [decoder_factory_ createDecoder:codecInfo];