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

Make rtc_software_fallback_wrappers target visible.

Browse Source 
Need to depend on them from Chromium.

Bug: webrtc:7925
Change-Id: Iea1bb3b937c602920bfd87f885c87c790ac7bc17
Reviewed-on: https://webrtc-review.googlesource.com/82061
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23580}
This commit is contained in:
Anders Carlsson
2018-06-12 11:15:56 +02:00
committed by Commit Bot
parent cf15eb57ff
commit dd3e0ab2bf
18 changed files with 340 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/android/src/jni/videodecoderfallback.cc
View File

@ -10,7 +10,7 @@
#include <jni.h>
#include "media/engine/videodecodersoftwarefallbackwrapper.h"
#include "api/video_codecs/video_decoder_software_fallback_wrapper.h"
#include "sdk/android/generated_video_jni/jni/VideoDecoderFallback_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
#include "sdk/android/src/jni/wrappednativecodec.h"
@ -28,9 +28,10 @@ static jlong JNI_VideoDecoderFallback_CreateDecoder(
std::unique_ptr<VideoDecoder> primary_decoder =
JavaToNativeVideoDecoder(jni, j_primary_decoder);
VideoDecoderSoftwareFallbackWrapper* nativeWrapper =
new VideoDecoderSoftwareFallbackWrapper(std::move(fallback_decoder),
std::move(primary_decoder));
VideoDecoder* nativeWrapper =
CreateVideoDecoderSoftwareFallbackWrapper(std::move(fallback_decoder),
std::move(primary_decoder))
.release();
return jlongFromPointer(nativeWrapper);
}

9
sdk/android/src/jni/videoencoderfallback.cc
View File

@ -10,7 +10,7 @@
#include <jni.h>
#include "media/engine/videoencodersoftwarefallbackwrapper.h"
#include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
#include "sdk/android/generated_video_jni/jni/VideoEncoderFallback_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
#include "sdk/android/src/jni/wrappednativecodec.h"
@ -28,9 +28,10 @@ static jlong JNI_VideoEncoderFallback_CreateEncoder(
std::unique_ptr<VideoEncoder> primary_encoder =
JavaToNativeVideoEncoder(jni, j_primary_encoder);
VideoEncoderSoftwareFallbackWrapper* nativeWrapper =
new VideoEncoderSoftwareFallbackWrapper(std::move(fallback_encoder),
std::move(primary_encoder));
VideoEncoder* nativeWrapper =
CreateVideoEncoderSoftwareFallbackWrapper(std::move(fallback_encoder),
std::move(primary_encoder))
.release();
return jlongFromPointer(nativeWrapper);
}