pei/scrcpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add --audio-bit-rate

Browse Source 
Add an option to configure the audio bit-rate.

PR #3757 <https://github.com/Genymobile/scrcpy/pull/3757>
This commit is contained in:
Romain Vimont
2023-02-18 18:32:43 +01:00
parent 8e640dc90f
commit 0870b8c8be
12 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/main/java/com/genymobile/scrcpy/AudioEncoder.java
View File

@@ -44,12 +44,12 @@ public final class AudioEncoder {
private static final int CHANNELS = 2;
private static final int FORMAT = AudioFormat.ENCODING_PCM_16BIT;
private static final int BYTES_PER_SAMPLE = 2;
private static final int BIT_RATE = 128000;
private static final int READ_MS = 5; // milliseconds
private static final int READ_SIZE = SAMPLE_RATE * CHANNELS * BYTES_PER_SAMPLE * READ_MS / 1000;
private final Streamer streamer;
private final int bitRate;
// Capacity of 64 is in practice "infinite" (it is limited by the number of available MediaCodec buffers, typically 4).
// So many pending tasks would lead to an unacceptable delay anyway.
@@ -64,8 +64,9 @@ public final class AudioEncoder {
private boolean ended;
public AudioEncoder(Streamer streamer) {
public AudioEncoder(Streamer streamer, int bitRate) {
this.streamer = streamer;
this.bitRate = bitRate;
}
private static AudioFormat createAudioFormat() {
@@ -92,10 +93,10 @@ public final class AudioEncoder {
return builder.build();
}
private static MediaFormat createFormat() {
private static MediaFormat createFormat(int bitRate) {
MediaFormat format = new MediaFormat();
format.setString(MediaFormat.KEY_MIME, MIMETYPE);
format.setInteger(MediaFormat.KEY_BIT_RATE, BIT_RATE);
format.setInteger(MediaFormat.KEY_BIT_RATE, bitRate);
format.setInteger(MediaFormat.KEY_CHANNEL_COUNT, CHANNELS);
format.setInteger(MediaFormat.KEY_SAMPLE_RATE, SAMPLE_RATE);
return format;
@@ -220,7 +221,7 @@ public final class AudioEncoder {
mediaCodecThread = new HandlerThread("AudioEncoder");
mediaCodecThread.start();
MediaFormat format = createFormat();
MediaFormat format = createFormat(bitRate);
mediaCodec.setCallback(new EncoderCallback(), new Handler(mediaCodecThread.getLooper()));
mediaCodec.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);

9
server/src/main/java/com/genymobile/scrcpy/Options.java
View File

@@ -12,6 +12,7 @@ public class Options {
private int maxSize;
private VideoCodec videoCodec = VideoCodec.H264;
private int videoBitRate = 8000000;
private int audioBitRate = 128000;
private int maxFps;
private int lockVideoOrientation = -1;
private boolean tunnelForward;
@@ -82,6 +83,14 @@ public class Options {
this.videoBitRate = videoBitRate;
}
public int getAudioBitRate() {
return audioBitRate;
}
public void setAudioBitRate(int audioBitRate) {
this.audioBitRate = audioBitRate;
}
public int getMaxFps() {
return maxFps;
}

6
server/src/main/java/com/genymobile/scrcpy/Server.java
View File

@@ -110,7 +110,7 @@ public final class Server {
if (audio) {
Streamer audioStreamer = new Streamer(connection.getAudioFd(), AudioCodec.OPUS, options.getSendCodecId(), options.getSendFrameMeta());
audioEncoder = new AudioEncoder(audioStreamer);
audioEncoder = new AudioEncoder(audioStreamer, options.getAudioBitRate());
audioEncoder.start();
}
@@ -210,6 +210,10 @@ public final class Server {
int videoBitRate = Integer.parseInt(value);
options.setVideoBitRate(videoBitRate);
break;
case "audio_bit_rate":
int audioBitRate = Integer.parseInt(value);
options.setAudioBitRate(audioBitRate);
break;
case "max_fps":
int maxFps = Integer.parseInt(value);
options.setMaxFps(maxFps);