devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Code style changes in the java part (whitespaces and braces) to match Rockbox coding style.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28065 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-09-12 19:56:13 +00:00
parent 54c838d2ae
commit 282adacb54
5 changed files with 549 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

232
android/src/org/rockbox/RockboxPCM.java
View file

@ -33,142 +33,148 @@ import android.util.Log;
public class RockboxPCM extends AudioTrack
{
private byte[] raw_data;
private PCMListener l;
private HandlerThread ht;
private Handler h = null;
private static final int samplerate = 44100;
private byte[] raw_data;
private PCMListener l;
private HandlerThread ht;
private Handler h = null;
private static final int samplerate = 44100;
/* should be CHANNEL_OUT_STEREO in 2.0 and above */
private static final int channels = AudioFormat.CHANNEL_CONFIGURATION_STEREO;
private static final int encoding = AudioFormat.ENCODING_PCM_16BIT;
private static final int buf_len = getMinBufferSize(44100, channels, encoding);
private static final int channels = AudioFormat.CHANNEL_CONFIGURATION_STEREO;
private static final int encoding = AudioFormat.ENCODING_PCM_16BIT;
private static final int buf_len = getMinBufferSize(44100, channels, encoding);
private void LOG(CharSequence text)
{
Log.d("Rockbox", (String) text);
}
private void LOG(CharSequence text)
{
Log.d("Rockbox", (String) text);
}
public RockboxPCM()
{
super(AudioManager.STREAM_MUSIC, samplerate, channels, encoding,
buf_len, AudioTrack.MODE_STREAM);
ht = new HandlerThread("audio thread", Process.THREAD_PRIORITY_URGENT_AUDIO);
ht.start();
raw_data = new byte[buf_len]; /* in shorts */
Arrays.fill(raw_data, (byte) 0);
l = new PCMListener(buf_len);
}
public RockboxPCM()
{
super(AudioManager.STREAM_MUSIC, samplerate, channels, encoding,
buf_len, AudioTrack.MODE_STREAM);
ht = new HandlerThread("audio thread", Process.THREAD_PRIORITY_URGENT_AUDIO);
ht.start();
raw_data = new byte[buf_len]; /* in shorts */
Arrays.fill(raw_data, (byte) 0);
l = new PCMListener(buf_len);
}
int bytes2frames(int bytes) {
/* 1 sample is 2 bytes, 2 samples are 1 frame */
return (bytes/4);
}
int frames2bytes(int frames) {
/* 1 frame is 2 samples, 1 sample is 2 bytes */
return (frames*4);
}
private int bytes2frames(int bytes)
{
/* 1 sample is 2 bytes, 2 samples are 1 frame */
return (bytes/4);
}
private int frames2bytes(int frames)
{
/* 1 frame is 2 samples, 1 sample is 2 bytes */
return (frames*4);
}
@SuppressWarnings("unused")
private void play_pause(boolean pause) {
if (pause)
{
pause();
}
else
{
if (getPlayState() == AudioTrack.PLAYSTATE_STOPPED)
{
RockboxService.startForeground();
if (getState() == AudioTrack.STATE_INITIALIZED)
{
if (h == null)
h = new Handler(ht.getLooper());
if (setNotificationMarkerPosition(bytes2frames(buf_len)/4) != AudioTrack.SUCCESS)
LOG("setNotificationMarkerPosition Error");
else
setPlaybackPositionUpdateListener(l, h);
}
/* need to fill with silence before starting playback */
write(raw_data, frames2bytes(getPlaybackHeadPosition()), raw_data.length);
}
play();
}
private void play_pause(boolean pause) {
if (pause)
{
pause();
}
else
{
if (getPlayState() == AudioTrack.PLAYSTATE_STOPPED)
{
RockboxService.startForeground();
if (getState() == AudioTrack.STATE_INITIALIZED)
{
if (h == null)
h = new Handler(ht.getLooper());
if (setNotificationMarkerPosition(bytes2frames(buf_len)/4) != AudioTrack.SUCCESS)
LOG("setNotificationMarkerPosition Error");
else
setPlaybackPositionUpdateListener(l, h);
}
/* need to fill with silence before starting playback */
write(raw_data, frames2bytes(getPlaybackHeadPosition()), raw_data.length);
}
play();
}
}
@Override
public void stop() throws IllegalStateException
{
try {
super.stop();
} catch (IllegalStateException e) {
throw new IllegalStateException(e);
}
RockboxService.stopForeground();
try {
super.stop();
} catch (IllegalStateException e) {
throw new IllegalStateException(e);
}
RockboxService.stopForeground();
}
@SuppressWarnings("unused")
private void set_volume(int volume)
{
/* volume comes from 0..-990 from Rockbox */
/* TODO volume is in dB, but this code acts as if it were in %, convert? */
float fvolume;
/* special case min and max volume to not suffer from floating point accuracy */
if (volume == 0)
fvolume = 1.0f;
else if (volume == -990)
fvolume = 0.0f;
else
fvolume = (volume + 990)/990.0f;
setStereoVolume(fvolume, fvolume);
/* volume comes from 0..-990 from Rockbox */
/* TODO volume is in dB, but this code acts as if it were in %, convert? */
float fvolume;
/* special case min and max volume to not suffer from floating point accuracy */
if (volume == 0)
fvolume = 1.0f;
else if (volume == -990)
fvolume = 0.0f;
else
fvolume = (volume + 990)/990.0f;
setStereoVolume(fvolume, fvolume);
}
public native void pcmSamplesToByteArray(byte[] dest);
private class PCMListener implements OnPlaybackPositionUpdateListener {
int max_len;
int refill_mark;
byte[] buf;
public PCMListener(int len) {
private class PCMListener implements OnPlaybackPositionUpdateListener
{
private int max_len;
private int refill_mark;
private byte[] buf;
public PCMListener(int len)
{
max_len = len;
/* refill to 100% when reached the 25% */
buf = new byte[max_len*3/4];
refill_mark = max_len - buf.length;
}
@Override
public void onMarkerReached(AudioTrack track) {
/* push new data to the hardware */
RockboxPCM pcm = (RockboxPCM)track;
int result = -1;
pcm.pcmSamplesToByteArray(buf);
result = track.write(buf, 0, buf.length);
if (result >= 0)
{
switch(track.getPlayState())
{
case AudioTrack.PLAYSTATE_PLAYING:
case AudioTrack.PLAYSTATE_PAUSED:
/* refill at 25% no matter of how many bytes we've written */
if (setNotificationMarkerPosition(bytes2frames(refill_mark)) != AudioTrack.SUCCESS)
LOG("Error in onMarkerReached: Could not set notification marker");
else /* recharge */
setPlaybackPositionUpdateListener(this, h);
break;
case AudioTrack.PLAYSTATE_STOPPED:
LOG("State STOPPED");
break;
}
}
else
{
LOG("Error in onMarkerReached (result="+result+")");
stop();
}
}
}
@Override
public void onMarkerReached(AudioTrack track)
{
/* push new data to the hardware */
RockboxPCM pcm = (RockboxPCM)track;
int result = -1;
pcm.pcmSamplesToByteArray(buf);
result = track.write(buf, 0, buf.length);
if (result >= 0)
{
switch(track.getPlayState())
{
case AudioTrack.PLAYSTATE_PLAYING:
case AudioTrack.PLAYSTATE_PAUSED:
/* refill at 25% no matter of how many bytes we've written */
if (setNotificationMarkerPosition(bytes2frames(refill_mark))
!= AudioTrack.SUCCESS)
LOG("Error in onMarkerReached: Could not set notification marker");
else /* recharge */
setPlaybackPositionUpdateListener(this, h);
break;
case AudioTrack.PLAYSTATE_STOPPED:
LOG("State STOPPED");
break;
}
}
else
{
LOG("Error in onMarkerReached (result="+result+")");
stop();
}
}
@Override
public void onPeriodicNotification(AudioTrack track) {
// TODO Auto-generated method stub
}
}
@Override
public void onPeriodicNotification(AudioTrack track)
{
}
}
}