Skip to content

Fix simulcast related code #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 21, 2024
Merged

Fix simulcast related code #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cee7806
fix simulcast_video_encoder
kanat Nov 21, 2024
d2445d1
fix SimulcastVideoEncoder.java
kanat Nov 21, 2024
ee412da
fix simulcast_video_encoder_factory.cc
kanat Nov 21, 2024
eae54b9
fix HardwareVideoEncoderWrapper.java
kanat Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/android/api/org/webrtc/HardwareVideoEncoderWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ public String getImplementationName() {
}

@Override
public long createNativeVideoEncoder() {
return internalEncoder.createNativeVideoEncoder();
public long createNative(long webrtcEnvRef) {
return internalEncoder.createNative(webrtcEnvRef);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions sdk/android/api/org/webrtc/SimulcastVideoEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public class SimulcastVideoEncoder extends WrappedNativeVideoEncoder {

static native long nativeCreateEncoder(VideoEncoderFactory primary, VideoEncoderFactory fallback, VideoCodecInfo info);
static native long nativeCreateEncoder(long webrtcEnvRef, VideoEncoderFactory primary, VideoEncoderFactory fallback, VideoCodecInfo info);

VideoEncoderFactory primary;
VideoEncoderFactory fallback;
Expand All @@ -15,8 +15,8 @@ public SimulcastVideoEncoder(VideoEncoderFactory primary, VideoEncoderFactory fa
}

@Override
public long createNativeVideoEncoder() {
return nativeCreateEncoder(primary, fallback, info);
public long createNative(long webrtcEnvRef) {
return nativeCreateEncoder(webrtcEnvRef, primary, fallback, info);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion sdk/android/src/jni/simulcast_video_encoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ extern "C" {
#endif

// (VideoEncoderFactory primary, VideoEncoderFactory fallback, VideoCodecInfo info)
JNIEXPORT jlong JNICALL Java_org_webrtc_SimulcastVideoEncoder_nativeCreateEncoder(JNIEnv *env, jclass klass, jobject primary, jobject fallback, jobject info) {
JNIEXPORT jlong JNICALL Java_org_webrtc_SimulcastVideoEncoder_nativeCreateEncoder(JNIEnv *env, jclass klass, jlong webrtcEnvRef, jobject primary, jobject fallback, jobject info) {
RTC_LOG(LS_INFO) << "Create simulcast video encoder";
JavaParamRef<jobject> info_ref(info);
SdpVideoFormat format = VideoCodecInfoToSdpVideoFormat(env, info_ref);

// TODO: 影響は軽微だが、リークする可能性があるので将来的に修正したい
// https://github.com/shiguredo-webrtc-build/webrtc-build/pull/16#pullrequestreview-600675795
return NativeToJavaPointer(std::make_unique<SimulcastEncoderAdapter>(
*reinterpret_cast<const webrtc::Environment*>(webrtcEnvRef),
JavaToNativeVideoEncoderFactory(env, primary).release(),
fallback != nullptr ? JavaToNativeVideoEncoderFactory(env, fallback).release() : nullptr,
format).release());
Expand Down
2 changes: 1 addition & 1 deletion sdk/android/src/jni/simulcast_video_encoder.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion sdk/android/src/jni/simulcast_video_encoder_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/sdp_video_format.h"
#include "api/video_codecs/video_codec.h"
#include "api/rtp_parameters.h"

using namespace webrtc;
using namespace webrtc::jni;
Expand All @@ -30,7 +31,7 @@ JNIEXPORT jobject JNICALL Java_org_webrtc_SimulcastVideoEncoderFactory_nativeVP9
JNIEXPORT jobject JNICALL Java_org_webrtc_SimulcastVideoEncoderFactory_nativeAV1Codec
(JNIEnv *env, jclass klass) {
SdpVideoFormat format = SdpVideoFormat(
cricket::kAv1CodecName, SdpVideoFormat::Parameters(),
cricket::kAv1CodecName, CodecParameterMap(),
LibaomAv1EncoderSupportedScalabilityModes());
return SdpVideoFormatToVideoCodecInfo(env, format).Release();
}
Expand Down