Skip to content

1. remove rtmp injection in all platforms #124

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
plutoless merged 11 commits into from
Feb 25, 2021
Merged

1. remove rtmp injection in all platforms #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3c7aadd
1. remove rtmp injection in all platforms
Feb 9, 2021
e27845e
fix ios build
Feb 9, 2021
9747c04
remove rtmpinject example from windows
Feb 9, 2021
7d7520c
Merge branch 'dev/ios' of https://github.i.agoralab.co/AgoraIO/API-Ex…
Feb 9, 2021
8261908
fix media player compatible with 3.3.0
Feb 9, 2021
f1869f8
Merge branch 'master' into dev/ios
Feb 9, 2021
0168374
Merge remote-tracking branch 'origin/dev/ios' into dev/ios
Feb 9, 2021
515ec2c
fix windows build
Feb 9, 2021
2ab40d9
fix windows build for missing item in resource.h
Feb 10, 2021
cd14f9c
fix audio raw data sample
Feb 10, 2021
4d9c008
remove logupload calling in examples
Feb 10, 2021
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: 0 additions & 4 deletions Android/APIExample/app/src/main/java/io/agora/api/example/ExampleActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import io.agora.api.example.examples.advanced.SetAudioProfile;
import io.agora.api.example.examples.advanced.MultiProcess;
import io.agora.api.example.examples.advanced.VideoQuickSwitch;
import io.agora.api.example.examples.advanced.RTMPInjection;
import io.agora.api.example.examples.advanced.RTMPStreaming;
import io.agora.api.example.examples.advanced.StreamEncrypt;
import io.agora.api.example.examples.advanced.SwitchCameraScreenShare;
Expand Down Expand Up @@ -112,9 +111,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
case R.id.action_mainFragment_to_GeoFencing:
fragment = new GeoFencing();
break;
case R.id.action_mainFragment_to_RTMPInjection:
fragment = new RTMPInjection();
break;
case R.id.action_mainFragment_to_RTMPStreaming:
fragment = new RTMPStreaming();
break;
Expand Down
9 changes: 0 additions & 9 deletions Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ARCore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,15 +375,6 @@ public void onError(int err)
{
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...oid/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/AdjustVolume.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...PIExample/app/src/main/java/io/agora/api/example/examples/advanced/ChannelEncryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,15 +275,6 @@ public void onError(int err)
{
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...ple/app/src/main/java/io/agora/api/example/examples/advanced/CustomRemoteVideoRender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/GeoFencing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,15 +278,6 @@ public void onError(int err) {
handler.post(() -> join.setEnabled(true));
} else
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...PIExample/app/src/main/java/io/agora/api/example/examples/advanced/HostAcrossChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,15 +297,6 @@ public void onError(int err)
{
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...oid/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/InCallReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,15 +275,6 @@ public void onError(int err)
{
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...Example/app/src/main/java/io/agora/api/example/examples/advanced/JoinMultipleChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**
Expand Down
9 changes: 0 additions & 9 deletions ...id/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/LiveStreaming.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,15 +299,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...d/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MediaPlayerKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,15 +386,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...oid/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/MultiProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,15 +309,6 @@ public void onError(int err)
{
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...d/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PlayAudioFiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,15 +321,6 @@ public void onError(int err)
{
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/PreCallTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
13 changes: 4 additions & 9 deletions ...Example/app/src/main/java/io/agora/api/example/examples/advanced/ProcessAudioRawData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class ProcessAudioRawData extends BaseFragment implements View.OnClickLis
private boolean isEnableLoopBack = false;
private AudioPlayer mAudioPlayer;
private static final Integer SAMPLE_RATE = 44100;
private static final Integer SAMPLES_PER_CALL = 4410;
private static final Integer SAMPLE_NUM_OF_CHANNEL = 1;

@Override
Expand Down Expand Up @@ -238,6 +239,9 @@ public boolean onPlaybackFrameBeforeMixingEx(byte[] samples, int numOfSamples, i
return false;
}
});
engine.setRecordingAudioFrameParameters(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, SAMPLES_PER_CALL);
engine.setMixedAudioFrameParameters(SAMPLE_RATE, SAMPLES_PER_CALL);
engine.setPlaybackAudioFrameParameters(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, SAMPLES_PER_CALL);
mAudioPlayer = new AudioPlayer(AudioManager.STREAM_VOICE_CALL, SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, AudioFormat.CHANNEL_OUT_MONO);
}
catch (Exception e) {
Expand Down Expand Up @@ -382,15 +386,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...d/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ProcessRawData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,15 +298,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
9 changes: 0 additions & 9 deletions ...PIExample/app/src/main/java/io/agora/api/example/examples/advanced/PushExternalVideo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,15 +415,6 @@ public void onWarning(int warn) {
public void onError(int err) {
Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
/** Upload current log file immediately to server.
* only use this when an error occurs
* block before log file upload success or timeout.
*
* @return
* - 0: Success.
* - < 0: Failure.
*/
engine.uploadLogFile();
}

/**Occurs when a user leaves the channel.
Expand Down
Loading