Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Side by Side Diff: webrtc/sdk/android/src/jni/videodecoderfactorywrapper.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:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 12 matching lines...) Expand all
23 jclass decoder_factory_class = jni->GetObjectClass(*decoder_factory_); 23 jclass decoder_factory_class = jni->GetObjectClass(*decoder_factory_);
24 create_decoder_method_ = 24 create_decoder_method_ =
25 jni->GetMethodID(decoder_factory_class, "createDecoder", 25 jni->GetMethodID(decoder_factory_class, "createDecoder",
26 "(Ljava/lang/String;)Lorg/webrtc/VideoDecoder;"); 26 "(Ljava/lang/String;)Lorg/webrtc/VideoDecoder;");
27 } 27 }
28 28
29 webrtc::VideoDecoder* VideoDecoderFactoryWrapper::CreateVideoDecoder( 29 webrtc::VideoDecoder* VideoDecoderFactoryWrapper::CreateVideoDecoder(
30 webrtc::VideoCodecType type) { 30 webrtc::VideoCodecType type) {
31 JNIEnv* jni = AttachCurrentThreadIfNeeded(); 31 JNIEnv* jni = AttachCurrentThreadIfNeeded();
32 ScopedLocalRefFrame local_ref_frame(jni); 32 ScopedLocalRefFrame local_ref_frame(jni);
33 rtc::Optional<const char*> type_payload = 33 const char* type_payload = webrtc::CodecTypeToPayloadString(type);
34 webrtc::CodecTypeToPayloadName(type); 34 jstring name = jni->NewStringUTF(type_payload);
35 RTC_DCHECK(type_payload);
36 jstring name = jni->NewStringUTF(*type_payload);
37 jobject decoder = 35 jobject decoder =
38 jni->CallObjectMethod(*decoder_factory_, create_decoder_method_, name); 36 jni->CallObjectMethod(*decoder_factory_, create_decoder_method_, name);
39 return decoder != nullptr ? new VideoDecoderWrapper(jni, decoder) : nullptr; 37 return decoder != nullptr ? new VideoDecoderWrapper(jni, decoder) : nullptr;
40 } 38 }
41 39
42 void VideoDecoderFactoryWrapper::DestroyVideoDecoder( 40 void VideoDecoderFactoryWrapper::DestroyVideoDecoder(
43 webrtc::VideoDecoder* decoder) { 41 webrtc::VideoDecoder* decoder) {
44 delete decoder; 42 delete decoder;
45 } 43 }
46 44
47 } // namespace webrtc_jni 45 } // namespace webrtc_jni
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698