Skip to content

Commit 7561a09

Browse files
committed
create custom snapshot
1 parent 6ae9eb7 commit 7561a09

File tree

185 files changed

+20
-24047
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+20
-24047
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Create Release on Tag
22

33
on:
44
push:
5-
tags:
6-
- '*'
5+
branches:
6+
- customPackaging
77

88
jobs:
99
create_release:

webrtc-android-framework/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22
apply plugin: 'jacoco'
33
ext {
44
PUBLISH_GROUP_ID = 'io.antmedia'
5-
PUBLISH_VERSION = '3.0.0-SNAPSHOT'
5+
PUBLISH_VERSION = '3.0.0-custom-SNAPSHOT'
66
PUBLISH_ARTIFACT_ID = 'webrtc-android-framework'
77
}
88
apply from: 'publish-remote.gradle'
@@ -76,6 +76,7 @@ dependencies {
7676
api fileTree(include: ['*.jar'], dir: 'libs')
7777
implementation 'com.google.code.findbugs:jsr305:3.0.2'
7878
implementation 'androidx.annotation:annotation:1.5.0'
79+
implementation "live.100ms:android-sdk:2.7.3"
7980
testImplementation 'junit:junit:4.13.2'
8081
testImplementation 'org.mockito:mockito-core:1.10.19'
8182
testImplementation 'org.apache.commons:commons-lang3:3.12.0'

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/api/IWebRTCClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.webrtc.SurfaceViewRenderer;
88
import org.webrtc.VideoCapturer;
99
import org.webrtc.VideoTrack;
10-
import org.webrtc.audio.CustomWebRtcAudioRecord;
10+
//import org.webrtc.audio.CustomWebRtcAudioRecord;
1111

1212
import io.antmedia.webrtcandroidframework.core.StatsCollector;
1313

@@ -289,7 +289,7 @@ void publish(String streamId, String token, boolean videoCallEnabled, boolean au
289289
*
290290
* @return current audio input
291291
*/
292-
CustomWebRtcAudioRecord getAudioInput();
292+
//CustomWebRtcAudioRecord getAudioInput();
293293

294294
/**
295295
* Called to request the subtracks for a main track from server

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/MediaFileReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.antmedia.webrtcandroidframework.core;
22

3-
import static org.webrtc.audio.WebRtcAudioRecord.BUFFERS_PER_SECOND;
3+
//import static org.webrtc.audio.WebRtcAudioRecord.BUFFERS_PER_SECOND;
44

55
import android.content.res.Resources;
66
import android.media.Image;
@@ -222,7 +222,7 @@ private int get10MsBufferLength() {
222222
int bytesPerSample = 2; //WebRtcAudioRecord.getBytesPerSample(WebRtcAudioRecord.DEFAULT_AUDIO_FORMAT)
223223

224224
int bytesPerFrame = channels * bytesPerSample;
225-
int framesPerBuffer = 44100 / BUFFERS_PER_SECOND;
225+
int framesPerBuffer = 44100 / 1000;
226226
int bufferLength = bytesPerFrame * framesPerBuffer;
227227
return bufferLength;
228228
}

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/StatsCollector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public class StatsCollector {
7878

7979

8080
public void onStatsReport(RTCStatsReport report) {
81-
parseStats(report);
81+
//parseStats(report);
8282
}
8383

8484
private void parseStats(RTCStatsReport report) {

webrtc-android-framework/src/main/java/io/antmedia/webrtcandroidframework/core/WebRTCClient.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import org.webrtc.VideoSource;
6161
import org.webrtc.VideoTrack;
6262
import org.webrtc.audio.AudioDeviceModule;
63-
import org.webrtc.audio.CustomWebRtcAudioRecord;
63+
//import org.webrtc.audio.CustomWebRtcAudioRecord;
6464
import org.webrtc.audio.JavaAudioDeviceModule;
6565

6666
import java.nio.ByteBuffer;
@@ -869,7 +869,7 @@ public VideoCapturer createCameraCapturer(CameraEnumerator enumerator) {
869869
for (String deviceName : deviceNames) {
870870
if (enumerator.isFrontFacing(deviceName)) {
871871
Logging.d(TAG, "Creating front facing camera capturer.");
872-
VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null);
872+
VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null, null);
873873

874874
if (videoCapturer != null) {
875875
return videoCapturer;
@@ -883,7 +883,7 @@ public VideoCapturer createCameraCapturer(CameraEnumerator enumerator) {
883883
for (String deviceName : deviceNames) {
884884
if (!enumerator.isFrontFacing(deviceName)) {
885885
Logging.d(TAG, "Creating other camera capturer.");
886-
VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null);
886+
VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null, null);
887887

888888
if (videoCapturer != null) {
889889
return videoCapturer;
@@ -896,7 +896,7 @@ public VideoCapturer createCameraCapturer(CameraEnumerator enumerator) {
896896
for (String deviceName : deviceNames) {
897897
if (enumerator.isFrontFacing(deviceName)) {
898898
Logging.d(TAG, "Creating front facing camera capturer.");
899-
VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null);
899+
VideoCapturer videoCapturer = enumerator.createCapturer(deviceName, null, null);
900900

901901
if (videoCapturer != null) {
902902
return videoCapturer;
@@ -1245,7 +1245,7 @@ public void reportError(String streamId, final String description) {
12451245
public void changeVideoSource(StreamSource newSource) {
12461246
if (!config.videoSource.equals(newSource)) {
12471247
if (newSource.equals(StreamSource.SCREEN) && adm != null) {
1248-
adm.setMediaProjection(config.mediaProjection);
1248+
//FIXME adm.setMediaProjection(config.mediaProjection);
12491249
}
12501250

12511251
Log.i(TAG, "Change video source started!");
@@ -1988,7 +1988,7 @@ public void onWebRtcAudioTrackStop() {
19881988

19891989
JavaAudioDeviceModule.Builder admBuilder = getADMBuilder();
19901990
return admBuilder
1991-
.setCustomAudioFeed(config.customAudioFeed)
1991+
//.setCustomAudioFeed(config.customAudioFeed)
19921992
.setUseHardwareAcousticEchoCanceler(true)
19931993
.setUseHardwareNoiseSuppressor(true)
19941994
.setAudioRecordErrorCallback(audioRecordErrorCallback)
@@ -2797,12 +2797,14 @@ public boolean isReconnectionInProgress() {
27972797
return reconnectionInProgress;
27982798
}
27992799

2800+
/*
28002801
public CustomWebRtcAudioRecord getAudioInput() {
28012802
if (adm != null) {
28022803
return adm.getAudioInput();
28032804
}
28042805
return null;
28052806
}
2807+
*/
28062808

28072809
public VideoCapturer getVideoCapturer() {
28082810
return videoCapturer;

webrtc-android-framework/src/main/java/org/webrtc/AddIceObserver.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)