Skip to content

Commit

Permalink
Upgrade to 123.0.6312.105 version (#93)
Browse files Browse the repository at this point in the history
Co-authored-by: rogurotus <[email protected]>
  • Loading branch information
instrumentisto-bot and rogurotus authored Apr 11, 2024
1 parent ed747c5 commit dade78d
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 672 deletions.
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ CCACHE_VERSION=4.8.3

# WebRTC doesn't have its own versioning, so we use Chromium versions:
# https://chromiumdash.appspot.com/releases
WEBRTC_VERSION=122.0.6261.128
WEBRTC_VERSION=123.0.6312.105
# Look for the concrete revision for WebRTC in:
# https://chromium.googlesource.com/chromium/src/+/refs/tags/<WEBRTC_VERSION>/DEPS
WEBRTC_COMMIT=6b419a0536b1a0ccfff3682f997c6f19bcbd9bd8
WEBRTC_COMMIT=41b1493ddb5d98e9125d5cb002fd57ce76ebd8a7

PACKAGE_NAMES= \
linux-arm64 \
Expand Down
6 changes: 5 additions & 1 deletion build/ios/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,14 @@ package:
zip -9 -r $(PACKAGE_DIR)/$(subst $(space),,$(PACKAGE_NAME)).zip WebRTC.xcframework/*

.PHONY: patch
# TODO(rogurotus): `fix_ios_capability.patch` needed to create
# `RtpCodecCapability` from raw values.
# Remove when deleting readonly attributes from
# `objc/api/peerconnection/RTCRtpCodecCapability.h`.
patch: common-patch
cd $(SRC_DIR) && \
patch -p2 < $(PATCH_DIR)/enable_ios_scalability_mode.patch && \
patch -p2 < $(PATCH_DIR)/set_codec_preferences_ios.patch
patch -p2 < $(PATCH_DIR)/fix_ios_capability.patch

.PHONY: build
build: patch
Expand Down
4 changes: 2 additions & 2 deletions instrumentisto-libwebrtc-bin.podspec
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Pod::Spec.new do |spec|
spec.name = "instrumentisto-libwebrtc-bin"
spec.version = "122.0.6261.128"
spec.version = "123.0.6312.105"
spec.summary = "Pre-compiled `libwebrtc` library for Darwin used by Medea Flutter-WebRTC."

spec.homepage = "https://github.com/instrumentisto/libwebrtc-bin"
spec.license = { :type => 'BSD', :file => 'WebRTC.xcframework/LICENSE.md' }
spec.author = { 'Instrumentisto Team' => '[email protected]' }
spec.ios.deployment_target = '10.0'

spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/122.0.6261.128/libwebrtc-ios.zip" }
spec.source = { :http => "https://github.com/instrumentisto/libwebrtc-bin/releases/download/123.0.6312.105/libwebrtc-ios.zip" }
spec.vendored_frameworks = "WebRTC.xcframework"

spec.pod_target_xcconfig = {
Expand Down
24 changes: 15 additions & 9 deletions patch/enable_android_scalability_mode.patch
Original file line number Diff line number Diff line change
Expand Up @@ -528,15 +528,16 @@ index 4bd9ee0..1f5957b 100644
Java_Encoding_getScaleResolutionDownBy(jni, j_encoding_parameters);
encoding.scale_resolution_down_by =
diff --git a/src/sdk/android/src/jni/software_video_decoder_factory.cc b/src/sdk/android/src/jni/software_video_decoder_factory.cc
index 151bf5f..fe9373d 100644
index 6e711e8..d7d885f 100644
--- a/src/sdk/android/src/jni/software_video_decoder_factory.cc
+++ b/src/sdk/android/src/jni/software_video_decoder_factory.cc
@@ -8,19 +8,29 @@
* be found in the AUTHORS file in the root of the source tree.
*/
@@ -11,21 +11,31 @@
#include <memory>

#include "api/environment/environment.h"
-#include "api/video_codecs/builtin_video_decoder_factory.h"
#include "api/video_codecs/video_decoder.h"
#include "api/video_codecs/video_decoder_factory.h"
#include "sdk/android/generated_swcodecs_jni/SoftwareVideoDecoderFactory_jni.h"
#include "sdk/android/native_api/jni/java_types.h"
#include "sdk/android/src/jni/jni_helpers.h"
Expand All @@ -550,19 +551,24 @@ index 151bf5f..fe9373d 100644
namespace webrtc {
namespace jni {

static jlong JNI_SoftwareVideoDecoderFactory_CreateFactory(JNIEnv* env) {
-static jlong JNI_SoftwareVideoDecoderFactory_CreateFactory(JNIEnv* env) {
- return webrtc::NativeToJavaPointer(
- CreateBuiltinVideoDecoderFactory().release());
-}
+ static jlong JNI_SoftwareVideoDecoderFactory_CreateFactory(JNIEnv* env) {
+ std::unique_ptr<webrtc::VideoDecoderFactory> video_decoder_factory =
+ std::make_unique<webrtc::VideoDecoderFactoryTemplate<
+ webrtc::LibvpxVp8DecoderTemplateAdapter,
+ webrtc::LibvpxVp9DecoderTemplateAdapter,
+ webrtc::OpenH264DecoderTemplateAdapter,
+ webrtc::Dav1dDecoderTemplateAdapter>>();
return webrtc::NativeToJavaPointer(
- CreateBuiltinVideoDecoderFactory().release());
+ return webrtc::NativeToJavaPointer(
+ video_decoder_factory.release());
}
+ }

static jlong JNI_SoftwareVideoDecoderFactory_CreateDecoder(
jboolean JNI_SoftwareVideoDecoderFactory_IsSupported(
JNIEnv* env,

diff --git a/src/sdk/android/src/jni/software_video_encoder_factory.cc b/src/sdk/android/src/jni/software_video_encoder_factory.cc
index 4b86960..10fa403 100644
--- a/src/sdk/android/src/jni/software_video_encoder_factory.cc
Expand Down
Loading

0 comments on commit dade78d

Please sign in to comment.