zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add JavaToNativeVideoCodecInfo to native API.

Browse Source 
This conversion function is useful for downstream native codecs
which want to take a VideoCodecInfo in the Java wrapper and use it
as a SdpVideoFormat in the C++ object.

Bug: webrtc:9495
Change-Id: Id2ece708eafd4be648fafff9e94aa13ace504bdf
Reviewed-on: https://webrtc-review.googlesource.com/87381
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23865}
This commit is contained in:
Rasmus Brandt
2018-07-06 10:34:57 +02:00
committed by Commit Bot
parent 282dad1943
commit bfd44e0837
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/android/BUILD.gn
View File

@ -1213,6 +1213,7 @@ rtc_static_library("native_api_codecs") {
deps = [ deps = [
":base_jni", ":base_jni",
":native_api_jni",
":video_jni", ":video_jni",
"//api/video_codecs:video_codecs_api", "//api/video_codecs:video_codecs_api",
"//rtc_base:checks", "//rtc_base:checks",

11
sdk/android/native_api/codecs/wrapper.cc
View File

@ -11,11 +11,18 @@
#include "sdk/android/native_api/codecs/wrapper.h" #include "sdk/android/native_api/codecs/wrapper.h"
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
#include "sdk/android/src/jni/videocodecinfo.h"
#include "sdk/android/src/jni/videodecoderfactorywrapper.h" #include "sdk/android/src/jni/videodecoderfactorywrapper.h"
#include "sdk/android/src/jni/videoencoderfactorywrapper.h" #include "sdk/android/src/jni/videoencoderfactorywrapper.h"
namespace webrtc { namespace webrtc {
SdpVideoFormat JavaToNativeVideoCodecInfo(JNIEnv* jni, jobject codec_info) {
return jni::VideoCodecInfoToSdpVideoFormat(jni,
JavaParamRef<jobject>(codec_info));
}
std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory( std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(
JNIEnv* jni, JNIEnv* jni,
jobject decoder_factory) { jobject decoder_factory) {
@ -25,9 +32,9 @@ std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(
std::unique_ptr<VideoEncoderFactory> JavaToNativeVideoEncoderFactory( std::unique_ptr<VideoEncoderFactory> JavaToNativeVideoEncoderFactory(
JNIEnv* jni, JNIEnv* jni,
jobject en) { jobject encoder_factory) {
return absl::make_unique<jni::VideoEncoderFactoryWrapper>( return absl::make_unique<jni::VideoEncoderFactoryWrapper>(
jni, JavaParamRef<jobject>(en)); jni, JavaParamRef<jobject>(encoder_factory));
} }
} // namespace webrtc } // namespace webrtc

4
sdk/android/native_api/codecs/wrapper.h
View File

@ -14,11 +14,15 @@
#include <jni.h> #include <jni.h>
#include <memory> #include <memory>
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_decoder_factory.h" #include "api/video_codecs/video_decoder_factory.h"
#include "api/video_codecs/video_encoder_factory.h" #include "api/video_codecs/video_encoder_factory.h"
namespace webrtc { namespace webrtc {
// Creates an instance of webrtc::SdpVideoFormat from Java VideoCodecInfo.
SdpVideoFormat JavaToNativeVideoCodecInfo(JNIEnv* jni, jobject codec_info);
// Creates an instance of webrtc::VideoDecoderFactory from Java // Creates an instance of webrtc::VideoDecoderFactory from Java
// VideoDecoderFactory. // VideoDecoderFactory.
std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory( std::unique_ptr<VideoDecoderFactory> JavaToNativeVideoDecoderFactory(