moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-04-18 14:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the minimum stream buffer size and the sample size when choosing a buffer size

Browse Source
This commit is contained in:
Cameron Gutman
2014-03-17 14:20:12 -04:00
parent 5284db761c
commit cfd788bec0
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/limelight/binding/audio/AndroidAudioRenderer.java
View File

@@ -4,15 +4,19 @@ import android.media.AudioFormat;
import android.media.AudioManager; import android.media.AudioManager;
import android.media.AudioTrack; import android.media.AudioTrack;
import com.limelight.LimeLog;
import com.limelight.nvstream.av.audio.AudioRenderer; import com.limelight.nvstream.av.audio.AudioRenderer;
public class AndroidAudioRenderer implements AudioRenderer { public class AndroidAudioRenderer implements AudioRenderer {
public static final int FRAME_SIZE = 960;
private AudioTrack track; private AudioTrack track;
@Override @Override
public void streamInitialized(int channelCount, int sampleRate) { public void streamInitialized(int channelCount, int sampleRate) {
int channelConfig; int channelConfig;
int bufferSize;
switch (channelCount) switch (channelCount)
{ {
@@ -26,11 +30,20 @@ public class AndroidAudioRenderer implements AudioRenderer {
throw new IllegalArgumentException("Decoder returned unhandled channel count"); throw new IllegalArgumentException("Decoder returned unhandled channel count");
} }
bufferSize = Math.max(AudioTrack.getMinBufferSize(sampleRate,
channelConfig,
AudioFormat.ENCODING_PCM_16BIT),
FRAME_SIZE * 2);
// Round to next frame
bufferSize = (((bufferSize + (FRAME_SIZE - 1)) / FRAME_SIZE) * FRAME_SIZE);
LimeLog.info("Audio track buffer size: "+bufferSize);
track = new AudioTrack(AudioManager.STREAM_MUSIC, track = new AudioTrack(AudioManager.STREAM_MUSIC,
sampleRate, sampleRate,
channelConfig, channelConfig,
AudioFormat.ENCODING_PCM_16BIT, AudioFormat.ENCODING_PCM_16BIT,
1024, // 1KB buffer bufferSize,
AudioTrack.MODE_STREAM); AudioTrack.MODE_STREAM);
track.play(); track.play();