#include <assert.h>
#include <jni.h>
#include <dlfcn.h>
+#include <stdbool.h>
+#include <sys/queue.h>
+#include <vlc_atomic.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_threads.h>
+/* Maximum VLC buffers queued by the internal queue in microseconds. This delay
+ * doesn't include audiotrack delay */
+#define MAX_QUEUE_US INT64_C(1000000) // 1000ms
+
static int Open( vlc_object_t * );
static void Close( vlc_object_t * );
+static void JNIThread_Stop( JNIEnv *env, audio_output_t *p_aout );
+
+struct thread_cmd;
+typedef TAILQ_HEAD(, thread_cmd) THREAD_CMD_QUEUE;
struct aout_sys_t {
/* sw gain */
/* Owned by JNIThread */
jobject p_audiotrack; /* AudioTrack ref */
- jbyteArray p_bytearray; /* ByteArray ref */
+ jobject p_audioTimestamp; /* AudioTimestamp ref */
+ jbyteArray p_bytearray; /* ByteArray ref (for Write) */
size_t i_bytearray_size; /* size of the ByteArray */
+ jfloatArray p_floatarray; /* FloatArray ref (for WriteFloat) */
+ size_t i_floatarray_size; /* size of the FloatArray */
+ jobject p_bytebuffer; /* ByteBuffer ref (for WriteV21) */
audio_sample_format_t fmt; /* fmt setup by Start */
- uint32_t i_samples_written; /* samples written since start/flush */
- uint32_t i_dsp_initial; /* initial delay of the dsp */
- int i_bytes_per_frame; /* byte per frame */
+ uint32_t i_pos_initial; /* initial position set by getPlaybackHeadPosition */
+ uint32_t i_samples_written; /* number of samples written since last flush */
+ uint32_t i_bytes_per_frame; /* byte per frame */
+ uint32_t i_max_audiotrack_samples;
+ mtime_t i_play_time; /* time when play was called */
+ bool b_audiotrack_exception; /* true if audiotrack throwed an exception */
+ int i_audiotrack_stuck_count;
+ uint8_t i_chans_to_reorder; /* do we need channel reordering */
+ uint8_t p_chan_table[AOUT_CHAN_MAX];
+ enum {
+ WRITE,
+ WRITE_V21,
+ WRITE_FLOAT
+ } i_write_type;
/* JNIThread control */
vlc_mutex_t mutex;
vlc_cond_t cond;
vlc_thread_t thread;
+
+ /* Shared between two threads, must be locked */
bool b_thread_run; /* is thread alive */
- struct thread_cmd *p_cmd; /* actual cmd process by JNIThread */
+ THREAD_CMD_QUEUE thread_cmd_queue; /* thread cmd queue */
+ uint32_t i_samples_queued; /* number of samples queued */
};
/* Soft volume helper */
#include "audio_output/volume.h"
-//#define AUDIOTRACK_USE_FLOAT
+#define AUDIOTRACK_USE_FLOAT
+// TODO: activate getTimestamp for new android versions
+//#define AUDIOTRACK_USE_TIMESTAMP
vlc_module_begin ()
set_shortname( "AudioTrack" )
set_callbacks( Open, Close )
vlc_module_end ()
-struct thread_cmd {
+struct thread_cmd
+{
+ TAILQ_ENTRY(thread_cmd) next;
enum {
CMD_START,
CMD_STOP,
CMD_PLAY,
CMD_PAUSE,
- CMD_FLUSH,
CMD_TIME_GET,
+ CMD_FLUSH,
CMD_DONE,
} id;
union {
mtime_t i_delay;
} time_get;
} out;
+ void ( *pf_destroy )( struct thread_cmd * );
};
#define THREAD_NAME "android_audiotrack"
jclass clazz;
jmethodID ctor;
jmethodID release;
+ jmethodID getState;
jmethodID play;
jmethodID stop;
jmethodID flush;
jmethodID pause;
jmethodID write;
+ jmethodID writeV21;
+ jmethodID writeFloat;
jmethodID getPlaybackHeadPosition;
+ jmethodID getTimestamp;
jmethodID getMinBufferSize;
+ jint STATE_INITIALIZED;
jint MODE_STREAM;
jint ERROR;
jint ERROR_BAD_VALUE;
jint ERROR_INVALID_OPERATION;
+ jint WRITE_NON_BLOCKING;
} AudioTrack;
struct {
jint ENCODING_PCM_8BIT;
bool has_ENCODING_PCM_FLOAT;
jint CHANNEL_OUT_MONO;
jint CHANNEL_OUT_STEREO;
+ jint CHANNEL_OUT_FRONT_LEFT;
+ jint CHANNEL_OUT_FRONT_RIGHT;
+ jint CHANNEL_OUT_BACK_LEFT;
+ jint CHANNEL_OUT_BACK_RIGHT;
+ jint CHANNEL_OUT_FRONT_CENTER;
+ jint CHANNEL_OUT_LOW_FREQUENCY;
+ jint CHANNEL_OUT_BACK_CENTER;
+ jint CHANNEL_OUT_5POINT1;
+ jint CHANNEL_OUT_SIDE_LEFT;
+ jint CHANNEL_OUT_SIDE_RIGHT;
+ bool has_CHANNEL_OUT_SIDE;
} AudioFormat;
struct {
jint ERROR_DEAD_OBJECT;
bool has_ERROR_DEAD_OBJECT;
jint STREAM_MUSIC;
} AudioManager;
+ struct {
+ jclass clazz;
+ jmethodID ctor;
+ jfieldID framePosition;
+ jfieldID nanoTime;
+ } AudioTimestamp;
} jfields;
/* init all jni fields.
} \
} while( 0 )
+ /* AudioTrack class init */
GET_CLASS( "android/media/AudioTrack", true );
jfields.AudioTrack.clazz = (jclass) (*env)->NewGlobalRef( env, clazz );
CHECK_EXCEPTION( "NewGlobalRef", true );
GET_ID( GetMethodID, AudioTrack.ctor, "<init>", "(IIIIII)V", true );
GET_ID( GetMethodID, AudioTrack.release, "release", "()V", true );
+ GET_ID( GetMethodID, AudioTrack.getState, "getState", "()I", true );
GET_ID( GetMethodID, AudioTrack.play, "play", "()V", true );
GET_ID( GetMethodID, AudioTrack.stop, "stop", "()V", true );
GET_ID( GetMethodID, AudioTrack.flush, "flush", "()V", true );
GET_ID( GetMethodID, AudioTrack.pause, "pause", "()V", true );
- GET_ID( GetMethodID, AudioTrack.write, "write", "([BII)I", true );
+
+ GET_ID( GetMethodID, AudioTrack.writeV21, "write", "(Ljava/nio/ByteBuffer;II)I", false );
+ if( jfields.AudioTrack.writeV21 )
+ {
+ GET_CONST_INT( AudioTrack.WRITE_NON_BLOCKING, "WRITE_NON_BLOCKING", true );
+#ifdef AUDIOTRACK_USE_FLOAT
+ GET_ID( GetMethodID, AudioTrack.writeFloat, "write", "([FIII)I", true );
+#endif
+ } else
+ GET_ID( GetMethodID, AudioTrack.write, "write", "([BII)I", true );
+
+ GET_ID( GetMethodID, AudioTrack.getTimestamp,
+ "getTimestamp", "(Landroid/media/AudioTimestamp;)Z", false );
GET_ID( GetMethodID, AudioTrack.getPlaybackHeadPosition,
"getPlaybackHeadPosition", "()I", true );
+
GET_ID( GetStaticMethodID, AudioTrack.getMinBufferSize, "getMinBufferSize",
"(III)I", true );
+ GET_CONST_INT( AudioTrack.STATE_INITIALIZED, "STATE_INITIALIZED", true );
GET_CONST_INT( AudioTrack.MODE_STREAM, "MODE_STREAM", true );
GET_CONST_INT( AudioTrack.ERROR, "ERROR", true );
GET_CONST_INT( AudioTrack.ERROR_BAD_VALUE , "ERROR_BAD_VALUE", true );
- GET_CONST_INT( AudioTrack.ERROR_INVALID_OPERATION ,
+ GET_CONST_INT( AudioTrack.ERROR_INVALID_OPERATION,
"ERROR_INVALID_OPERATION", true );
+ /* AudioTimestamp class init (if any) */
+ if( jfields.AudioTrack.getTimestamp )
+ {
+ GET_CLASS( "android/media/AudioTimestamp", true );
+ jfields.AudioTimestamp.clazz = (jclass) (*env)->NewGlobalRef( env,
+ clazz );
+ CHECK_EXCEPTION( "NewGlobalRef", true );
+
+ GET_ID( GetMethodID, AudioTimestamp.ctor, "<init>", "()V", true );
+ GET_ID( GetFieldID, AudioTimestamp.framePosition,
+ "framePosition", "J", true );
+ GET_ID( GetFieldID, AudioTimestamp.nanoTime,
+ "nanoTime", "J", true );
+ }
+
+ /* AudioFormat class init */
GET_CLASS( "android/media/AudioFormat", true );
GET_CONST_INT( AudioFormat.ENCODING_PCM_8BIT, "ENCODING_PCM_8BIT", true );
GET_CONST_INT( AudioFormat.ENCODING_PCM_16BIT, "ENCODING_PCM_16BIT", true );
#ifdef AUDIOTRACK_USE_FLOAT
GET_CONST_INT( AudioFormat.ENCODING_PCM_FLOAT, "ENCODING_PCM_FLOAT",
false );
- jfields.AudioFormat.has_ENCODING_PCM_FLOAT = field != NULL;
+ jfields.AudioFormat.has_ENCODING_PCM_FLOAT = field != NULL &&
+ jfields.AudioTrack.writeFloat;
#else
jfields.AudioFormat.has_ENCODING_PCM_FLOAT = false;
#endif
GET_CONST_INT( AudioFormat.CHANNEL_OUT_MONO, "CHANNEL_OUT_MONO", true );
GET_CONST_INT( AudioFormat.CHANNEL_OUT_STEREO, "CHANNEL_OUT_STEREO", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_FRONT_LEFT, "CHANNEL_OUT_FRONT_LEFT", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_FRONT_RIGHT, "CHANNEL_OUT_FRONT_RIGHT", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_5POINT1, "CHANNEL_OUT_5POINT1", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_BACK_LEFT, "CHANNEL_OUT_BACK_LEFT", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_BACK_RIGHT, "CHANNEL_OUT_BACK_RIGHT", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_FRONT_CENTER, "CHANNEL_OUT_FRONT_CENTER", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_LOW_FREQUENCY, "CHANNEL_OUT_LOW_FREQUENCY", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_BACK_CENTER, "CHANNEL_OUT_BACK_CENTER", true );
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_SIDE_LEFT, "CHANNEL_OUT_SIDE_LEFT", false );
+ if( field != NULL )
+ {
+ GET_CONST_INT( AudioFormat.CHANNEL_OUT_SIDE_RIGHT, "CHANNEL_OUT_SIDE_RIGHT", true );
+ jfields.AudioFormat.has_CHANNEL_OUT_SIDE = true;
+ } else
+ jfields.AudioFormat.has_CHANNEL_OUT_SIDE = false;
+ /* AudioManager class init */
GET_CLASS( "android/media/AudioManager", true );
GET_CONST_INT( AudioManager.ERROR_DEAD_OBJECT, "ERROR_DEAD_OBJECT", false );
jfields.AudioManager.has_ERROR_DEAD_OBJECT = field != NULL;
}
static inline bool
-check_exception( JNIEnv *env, bool *p_error, audio_output_t *p_aout,
+check_exception( JNIEnv *env, audio_output_t *p_aout,
const char *method )
{
if( (*env)->ExceptionOccurred( env ) )
{
+ aout_sys_t *p_sys = p_aout->sys;
+
+ p_sys->b_audiotrack_exception = true;
(*env)->ExceptionClear( env );
- *p_error = true;
msg_Err( p_aout, "AudioTrack.%s triggered an exception !", method );
return true;
} else
return false;
}
-#define CHECK_EXCEPTION( method ) check_exception( env, p_error, p_aout, method )
+#define CHECK_AT_EXCEPTION( method ) check_exception( env, p_aout, method )
#define JNI_CALL( what, obj, method, ... ) (*env)->what( env, obj, method, ##__VA_ARGS__ )
#define JNI_CALL_INT( obj, method, ... ) JNI_CALL( CallIntMethod, obj, method, ##__VA_ARGS__ )
+#define JNI_CALL_BOOL( obj, method, ... ) JNI_CALL( CallBooleanMethod, obj, method, ##__VA_ARGS__ )
#define JNI_CALL_VOID( obj, method, ... ) JNI_CALL( CallVoidMethod, obj, method, ##__VA_ARGS__ )
#define JNI_CALL_STATIC_INT( clazz, method, ... ) JNI_CALL( CallStaticIntMethod, clazz, method, ##__VA_ARGS__ )
#define JNI_AT_NEW( ... ) JNI_CALL( NewObject, jfields.AudioTrack.clazz, jfields.AudioTrack.ctor, ##__VA_ARGS__ )
#define JNI_AT_CALL_INT( method, ... ) JNI_CALL_INT( p_sys->p_audiotrack, jfields.AudioTrack.method, ##__VA_ARGS__ )
+#define JNI_AT_CALL_BOOL( method, ... ) JNI_CALL_BOOL( p_sys->p_audiotrack, jfields.AudioTrack.method, ##__VA_ARGS__ )
#define JNI_AT_CALL_VOID( method, ... ) JNI_CALL_VOID( p_sys->p_audiotrack, jfields.AudioTrack.method, ##__VA_ARGS__ )
#define JNI_AT_CALL_STATIC_INT( method, ... ) JNI_CALL( CallStaticIntMethod, jfields.AudioTrack.clazz, jfields.AudioTrack.method, ##__VA_ARGS__ )
-static int
-JNIThread_TimeGet( JNIEnv *env, bool *p_error, audio_output_t *p_aout,
- mtime_t *p_delay )
+#define JNI_AUDIOTIMESTAMP_GET_LONG( field ) JNI_CALL( GetLongField, p_sys->p_audioTimestamp, jfields.AudioTimestamp.field )
+
+static inline mtime_t
+frames_to_us( aout_sys_t *p_sys, uint32_t i_nb_frames )
+{
+ return i_nb_frames * CLOCK_FREQ / p_sys->fmt.i_rate;
+}
+#define FRAMES_TO_US(x) frames_to_us( p_sys, (x) )
+
+static struct thread_cmd *
+ThreadCmd_New( int id )
+{
+ struct thread_cmd *p_cmd = calloc( 1, sizeof(struct thread_cmd) );
+
+ if( p_cmd )
+ p_cmd->id = id;
+
+ return p_cmd;
+}
+
+static void
+ThreadCmd_InsertHead( aout_sys_t *p_sys, struct thread_cmd *p_cmd )
+{
+ TAILQ_INSERT_HEAD( &p_sys->thread_cmd_queue, p_cmd, next);
+ vlc_cond_signal( &p_sys->cond );
+}
+
+static void
+ThreadCmd_InsertTail( aout_sys_t *p_sys, struct thread_cmd *p_cmd )
+{
+ TAILQ_INSERT_TAIL( &p_sys->thread_cmd_queue, p_cmd, next);
+ vlc_cond_signal( &p_sys->cond );
+}
+
+static bool
+ThreadCmd_Wait( aout_sys_t *p_sys, struct thread_cmd *p_cmd )
+{
+ while( p_cmd->id != CMD_DONE )
+ vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
+
+ return p_cmd->id == CMD_DONE;
+}
+
+static void
+ThreadCmd_FlushQueue( aout_sys_t *p_sys )
+{
+ struct thread_cmd *p_cmd, *p_cmd_next;
+
+ for ( p_cmd = TAILQ_FIRST( &p_sys->thread_cmd_queue );
+ p_cmd != NULL; p_cmd = p_cmd_next )
+ {
+ p_cmd_next = TAILQ_NEXT( p_cmd, next );
+ TAILQ_REMOVE( &p_sys->thread_cmd_queue, p_cmd, next );
+ if( p_cmd->pf_destroy )
+ p_cmd->pf_destroy( p_cmd );
+ }
+}
+
+static void
+JNIThread_InitDelay( JNIEnv *env, audio_output_t *p_aout )
+{
+ aout_sys_t *p_sys = p_aout->sys;
+
+ if( p_sys->p_audiotrack )
+ p_sys->i_pos_initial = JNI_AT_CALL_INT( getPlaybackHeadPosition );
+ else
+ p_sys->i_pos_initial = 0;
+
+ /* HACK: On some broken devices, head position is still moving after a
+ * flush or a stop. So, wait for the head position to be stabilized. */
+ if( unlikely( p_sys->i_pos_initial != 0 ) )
+ {
+ uint32_t i_last_pos;
+ do {
+ i_last_pos = p_sys->i_pos_initial;
+ msleep( 50000 );
+ p_sys->i_pos_initial = JNI_AT_CALL_INT( getPlaybackHeadPosition );
+ } while( p_sys->i_pos_initial != i_last_pos );
+ }
+ p_sys->i_samples_written = 0;
+ p_sys->i_samples_queued = 0;
+}
+
+static uint32_t
+JNIThread_GetAudioTrackPos( JNIEnv *env, audio_output_t *p_aout )
{
- VLC_UNUSED( p_error );
aout_sys_t *p_sys = p_aout->sys;
- uint32_t dsp;
/* Android doc:
* getPlaybackHeadPosition: Returns the playback head position expressed in
* zero by flush(), reload(), and stop().
*/
- dsp = (uint32_t )JNI_AT_CALL_INT( getPlaybackHeadPosition );
+ return JNI_AT_CALL_INT( getPlaybackHeadPosition ) - p_sys->i_pos_initial;
+}
+
+static int
+JNIThread_TimeGet( JNIEnv *env, audio_output_t *p_aout, mtime_t *p_delay )
+{
+ aout_sys_t *p_sys = p_aout->sys;
+ jlong i_frame_pos;
+ uint32_t i_audiotrack_delay = 0;
- if( p_sys->i_samples_written == 0 ) {
- p_sys->i_dsp_initial = dsp;
+ if( p_sys->i_samples_queued == 0 )
return -1;
+ if( p_sys->p_audioTimestamp )
+ {
+ mtime_t i_current_time = mdate();
+ /* Android doc:
+ * getTimestamp: Poll for a timestamp on demand.
+ *
+ * If you need to track timestamps during initial warmup or after a
+ * routing or mode change, you should request a new timestamp once per
+ * second until the reported timestamps show that the audio clock is
+ * stable. Thereafter, query for a new timestamp approximately once
+ * every 10 seconds to once per minute. Calling this method more often
+ * is inefficient. It is also counter-productive to call this method
+ * more often than recommended, because the short-term differences
+ * between successive timestamp reports are not meaningful. If you need
+ * a high-resolution mapping between frame position and presentation
+ * time, consider implementing that at application level, based on
+ * low-resolution timestamps.
+ */
+
+ if( JNI_AT_CALL_BOOL( getTimestamp, p_sys->p_audioTimestamp ) )
+ {
+ jlong i_frame_time = JNI_AUDIOTIMESTAMP_GET_LONG( nanoTime ) / 1000;
+ /* frame time should be after last play time
+ * frame time shouldn't be in the future
+ * frame time should be less than 10 seconds old */
+ if( i_frame_time > p_sys->i_play_time
+ && i_current_time > i_frame_time
+ && ( i_current_time - i_frame_time ) <= INT64_C(10000000) )
+ {
+ jlong i_time_diff = i_current_time - i_frame_time;
+ jlong i_frames_diff = i_time_diff * p_sys->fmt.i_rate
+ / CLOCK_FREQ;
+ i_frame_pos = JNI_AUDIOTIMESTAMP_GET_LONG( framePosition )
+ + i_frames_diff;
+ if( p_sys->i_samples_written > i_frame_pos )
+ i_audiotrack_delay = p_sys->i_samples_written - i_frame_pos;
+ }
+ }
+ }
+ if( i_audiotrack_delay == 0 )
+ {
+ uint32_t i_audiotrack_pos = JNIThread_GetAudioTrackPos( env, p_aout );
+
+ if( p_sys->i_samples_written > i_audiotrack_pos )
+ i_audiotrack_delay = p_sys->i_samples_written - i_audiotrack_pos;
}
- dsp -= p_sys->i_dsp_initial;
- if( dsp == 0 )
+ if( i_audiotrack_delay > 0 )
+ {
+ *p_delay = FRAMES_TO_US( p_sys->i_samples_queued + i_audiotrack_delay );
+ return 0;
+ } else
return -1;
+}
+
+static void
+AudioTrack_GetChanOrder( uint16_t i_physical_channels, uint32_t p_chans_out[] )
+{
+#define HAS_CHAN( x ) ( ( i_physical_channels & (x) ) == (x) )
+ /* samples will be in the following order: FL FR FC LFE BL BR BC SL SR */
+ int i = 0;
+
+ if( HAS_CHAN( AOUT_CHAN_LEFT ) )
+ p_chans_out[i++] = AOUT_CHAN_LEFT;
+ if( HAS_CHAN( AOUT_CHAN_RIGHT ) )
+ p_chans_out[i++] = AOUT_CHAN_RIGHT;
+
+ if( HAS_CHAN( AOUT_CHAN_CENTER ) )
+ p_chans_out[i++] = AOUT_CHAN_CENTER;
+
+ if( HAS_CHAN( AOUT_CHAN_LFE ) )
+ p_chans_out[i++] = AOUT_CHAN_LFE;
- if( p_delay )
- *p_delay = ((mtime_t)p_sys->i_samples_written - dsp) *
- CLOCK_FREQ / p_sys->fmt.i_rate;
+ if( HAS_CHAN( AOUT_CHAN_REARLEFT ) )
+ p_chans_out[i++] = AOUT_CHAN_REARLEFT;
+ if( HAS_CHAN( AOUT_CHAN_REARRIGHT ) )
+ p_chans_out[i++] = AOUT_CHAN_REARRIGHT;
- return 0;
+ if( HAS_CHAN( AOUT_CHAN_REARCENTER ) )
+ p_chans_out[i++] = AOUT_CHAN_REARCENTER;
+
+ if( HAS_CHAN( AOUT_CHAN_MIDDLELEFT ) )
+ p_chans_out[i++] = AOUT_CHAN_MIDDLELEFT;
+ if( HAS_CHAN( AOUT_CHAN_MIDDLERIGHT ) )
+ p_chans_out[i++] = AOUT_CHAN_MIDDLERIGHT;
+
+ assert( i <= AOUT_CHAN_MAX );
+#undef HAS_CHAN
}
-static int
-JNIThread_Start( JNIEnv *env, bool *p_error, audio_output_t *p_aout )
+/**
+ * Configure and create an Android AudioTrack.
+ * returns NULL on configuration error
+ */
+static jobject
+JNIThread_NewAudioTrack( JNIEnv *env, audio_output_t *p_aout,
+ unsigned int i_rate,
+ vlc_fourcc_t i_vlc_format,
+ uint16_t i_physical_channels,
+ int *p_audiotrack_size )
{
- struct aout_sys_t *p_sys = p_aout->sys;
- int i_size, i_min_buffer_size, i_channel_config, i_rate, i_format,
- i_format_size, i_nb_channels;
+ int i_size, i_min_buffer_size, i_channel_config, i_format;
jobject p_audiotrack;
- /* 4000 <= frequency <= 48000 */
- i_rate = p_sys->fmt.i_rate;
- if( i_rate < 4000 )
- i_rate = 4000;
- if( i_rate > 48000 )
- i_rate = 48000;
-
- /* We can only accept U8, S16N, and FL32 (depending on Android version) */
- if( p_sys->fmt.i_format != VLC_CODEC_U8
- && p_sys->fmt.i_format != VLC_CODEC_S16N
- && p_sys->fmt.i_format != VLC_CODEC_FL32 )
- p_sys->fmt.i_format = VLC_CODEC_S16N;
-
- if( p_sys->fmt.i_format == VLC_CODEC_FL32
- && !jfields.AudioFormat.has_ENCODING_PCM_FLOAT )
- p_sys->fmt.i_format = VLC_CODEC_S16N;
-
- if( p_sys->fmt.i_format == VLC_CODEC_S16N )
- {
- i_format = jfields.AudioFormat.ENCODING_PCM_16BIT;
- i_format_size = 2;
- } else if( p_sys->fmt.i_format == VLC_CODEC_FL32 )
- {
- i_format = jfields.AudioFormat.ENCODING_PCM_FLOAT;
- i_format_size = 4;
- } else
+ switch( i_vlc_format )
{
- i_format = jfields.AudioFormat.ENCODING_PCM_8BIT;
- i_format_size = 1;
+ case VLC_CODEC_U8:
+ i_format = jfields.AudioFormat.ENCODING_PCM_8BIT;
+ break;
+ case VLC_CODEC_S16N:
+ i_format = jfields.AudioFormat.ENCODING_PCM_16BIT;
+ break;
+ case VLC_CODEC_FL32:
+ i_format = jfields.AudioFormat.ENCODING_PCM_FLOAT;
+ break;
+ default:
+ vlc_assert_unreachable();
}
- p_sys->fmt.i_original_channels = p_sys->fmt.i_physical_channels;
- i_nb_channels = aout_FormatNbChannels( &p_sys->fmt );
- switch( i_nb_channels )
+ switch( i_physical_channels )
{
- case 1:
- i_channel_config = jfields.AudioFormat.CHANNEL_OUT_MONO;
- p_sys->fmt.i_physical_channels = AOUT_CHAN_CENTER;
- break;
- default:
- i_nb_channels = 2; // XXX: AudioTrack handle only stereo for now
- case 2:
- i_channel_config = jfields.AudioFormat.CHANNEL_OUT_STEREO;
- p_sys->fmt.i_physical_channels = AOUT_CHANS_STEREO;
- break;
+ case AOUT_CHANS_7_1:
+ /* bitmask of CHANNEL_OUT_7POINT1 doesn't correspond to 5POINT1 and
+ * SIDES */
+ i_channel_config = jfields.AudioFormat.CHANNEL_OUT_5POINT1 |
+ jfields.AudioFormat.CHANNEL_OUT_SIDE_LEFT |
+ jfields.AudioFormat.CHANNEL_OUT_SIDE_RIGHT;
+ break;
+ case AOUT_CHANS_5_1:
+ i_channel_config = jfields.AudioFormat.CHANNEL_OUT_5POINT1;
+ break;
+ case AOUT_CHAN_LEFT:
+ i_channel_config = jfields.AudioFormat.CHANNEL_OUT_MONO;
+ break;
+ default:
+ case AOUT_CHANS_STEREO:
+ i_channel_config = jfields.AudioFormat.CHANNEL_OUT_STEREO;
+ break;
}
i_min_buffer_size = JNI_AT_CALL_STATIC_INT( getMinBufferSize, i_rate,
if( i_min_buffer_size <= 0 )
{
msg_Warn( p_aout, "getMinBufferSize returned an invalid size" ) ;
- /* use a defaut min buffer size (shouldn't happen) */
- i_min_buffer_size = i_nb_channels * i_format_size * 2024;
+ return NULL;
}
+ i_size = i_min_buffer_size * 4;
- i_size = i_min_buffer_size * 2; // double buffering
-
+ /* create AudioTrack object */
p_audiotrack = JNI_AT_NEW( jfields.AudioManager.STREAM_MUSIC, i_rate,
i_channel_config, i_format, i_size,
jfields.AudioTrack.MODE_STREAM );
- if( CHECK_EXCEPTION( "<init>" ) || !p_audiotrack )
+ if( CHECK_AT_EXCEPTION( "AudioTrack<init>" ) || !p_audiotrack )
+ {
+ msg_Warn( p_aout, "AudioTrack Init failed" ) ;
+ return NULL;
+ }
+ if( JNI_CALL_INT( p_audiotrack, jfields.AudioTrack.getState )
+ != jfields.AudioTrack.STATE_INITIALIZED )
+ {
+ JNI_CALL_VOID( p_audiotrack, jfields.AudioTrack.release );
+ (*env)->DeleteLocalRef( env, p_audiotrack );
+ msg_Err( p_aout, "AudioTrack getState failed" );
+ return NULL;
+ }
+ *p_audiotrack_size = i_size;
+
+ return p_audiotrack;
+}
+
+static int
+JNIThread_Start( JNIEnv *env, audio_output_t *p_aout )
+{
+ aout_sys_t *p_sys = p_aout->sys;
+ jobject p_audiotrack = NULL;
+ int i_nb_channels, i_audiotrack_size;
+ uint32_t p_chans_out[AOUT_CHAN_MAX];
+
+ aout_FormatPrint( p_aout, "VLC is looking for:", &p_sys->fmt );
+
+ p_sys->fmt.i_original_channels = p_sys->fmt.i_physical_channels;
+
+ /* 4000 <= frequency <= 48000 */
+ p_sys->fmt.i_rate = VLC_CLIP( p_sys->fmt.i_rate, 4000, 48000 );
+
+ /* We can only accept U8, S16N, FL32, and AC3 */
+ switch( p_sys->fmt.i_format )
+ {
+ case VLC_CODEC_U8:
+ break;
+ case VLC_CODEC_S16N:
+ break;
+ case VLC_CODEC_FL32:
+ if( !jfields.AudioFormat.has_ENCODING_PCM_FLOAT )
+ p_sys->fmt.i_format = VLC_CODEC_S16N;
+ break;
+ default:
+ p_sys->fmt.i_format = VLC_CODEC_S16N;
+ break;
+ }
+
+ /* Android AudioTrack supports only mono, stereo, 5.1 and 7.1.
+ * Android will downmix to stereo if audio output doesn't handle 5.1 or 7.1
+ */
+ i_nb_channels = aout_FormatNbChannels( &p_sys->fmt );
+ if( i_nb_channels > 5 )
+ {
+ if( i_nb_channels > 7 && jfields.AudioFormat.has_CHANNEL_OUT_SIDE )
+ p_sys->fmt.i_physical_channels = AOUT_CHANS_7_1;
+ else
+ p_sys->fmt.i_physical_channels = AOUT_CHANS_5_1;
+ } else
+ {
+ if( i_nb_channels == 1 )
+ p_sys->fmt.i_physical_channels = AOUT_CHAN_LEFT;
+ else
+ p_sys->fmt.i_physical_channels = AOUT_CHANS_STEREO;
+ }
+ i_nb_channels = aout_FormatNbChannels( &p_sys->fmt );
+
+ do
+ {
+ /* Try to create an AudioTrack with the most advanced channel and
+ * format configuration. If NewAudioTrack fails, try again with a less
+ * advanced format (PCM S16N). If it fails again, try again with Stereo
+ * channels. */
+ p_audiotrack = JNIThread_NewAudioTrack( env, p_aout, p_sys->fmt.i_rate,
+ p_sys->fmt.i_format,
+ p_sys->fmt.i_physical_channels,
+ &i_audiotrack_size );
+ if( !p_audiotrack )
+ {
+ if( p_sys->fmt.i_format == VLC_CODEC_FL32 )
+ {
+ msg_Warn( p_aout, "FL32 configuration failed, "
+ "fallback to S16N PCM" );
+ p_sys->fmt.i_format = VLC_CODEC_S16N;
+ }
+ else if( i_nb_channels > 5 )
+ {
+ msg_Warn( p_aout, "5.1 or 7.1 configuration failed, "
+ "fallback to Stereo" );
+ p_sys->fmt.i_physical_channels = AOUT_CHANS_STEREO;
+ i_nb_channels = aout_FormatNbChannels( &p_sys->fmt );
+ }
+ else
+ break;
+ }
+ } while( !p_audiotrack );
+
+ if( !p_audiotrack )
return VLC_EGENERIC;
+
p_sys->p_audiotrack = (*env)->NewGlobalRef( env, p_audiotrack );
(*env)->DeleteLocalRef( env, p_audiotrack );
if( !p_sys->p_audiotrack )
return VLC_EGENERIC;
- p_sys->fmt.i_rate = i_rate;
- p_sys->i_samples_written = 0;
- p_sys->i_bytes_per_frame = i_nb_channels * i_format_size;
+ memset( p_chans_out, 0, sizeof(p_chans_out) );
+ AudioTrack_GetChanOrder( p_sys->fmt.i_physical_channels, p_chans_out );
+ p_sys->i_chans_to_reorder =
+ aout_CheckChannelReorder( NULL, p_chans_out,
+ p_sys->fmt.i_physical_channels,
+ p_sys->p_chan_table );
+
+ p_sys->i_bytes_per_frame = i_nb_channels *
+ aout_BitsPerSample( p_sys->fmt.i_format ) /
+ 8;
+ p_sys->i_max_audiotrack_samples = i_audiotrack_size /
+ p_sys->i_bytes_per_frame;
+
+#ifdef AUDIOTRACK_USE_TIMESTAMP
+ if( jfields.AudioTimestamp.clazz )
+ {
+ /* create AudioTimestamp object */
+ jobject p_audioTimestamp = JNI_CALL( NewObject,
+ jfields.AudioTimestamp.clazz,
+ jfields.AudioTimestamp.ctor );
+ if( !p_audioTimestamp )
+ {
+ JNIThread_Stop( env, p_aout );
+ return VLC_EGENERIC;
+ }
+ p_sys->p_audioTimestamp = (*env)->NewGlobalRef( env, p_audioTimestamp );
+ (*env)->DeleteLocalRef( env, p_audioTimestamp );
+ if( !p_sys->p_audioTimestamp )
+ {
+ JNIThread_Stop( env, p_aout );
+ return VLC_EGENERIC;
+ }
+ }
+#endif
- /* Gets the initial value of DAC samples counter */
- JNIThread_TimeGet( env, p_error, p_aout, NULL );
+ if( p_sys->fmt.i_format == VLC_CODEC_FL32 )
+ {
+ msg_Dbg( p_aout, "using WRITE_FLOAT");
+ p_sys->i_write_type = WRITE_FLOAT;
+ }
+ else if( jfields.AudioTrack.writeV21 )
+ msg_Dbg( p_aout, "using WRITE_V21");
+ p_sys->i_write_type = WRITE_V21;
+ }
+ else
+ {
+ msg_Dbg( p_aout, "using WRITE");
+ p_sys->i_write_type = WRITE;
+ }
JNI_AT_CALL_VOID( play );
+ CHECK_AT_EXCEPTION( "play" );
+ p_sys->i_play_time = mdate();
+
+ aout_FormatPrint( p_aout, "VLC will output:", &p_sys->fmt );
return VLC_SUCCESS;
}
static void
-JNIThread_Stop( JNIEnv *env, bool *p_error, audio_output_t *p_aout )
+JNIThread_Stop( JNIEnv *env, audio_output_t *p_aout )
{
aout_sys_t *p_sys = p_aout->sys;
- JNI_AT_CALL_VOID( stop );
- CHECK_EXCEPTION( "stop" );
+ if( p_sys->p_audiotrack )
+ {
+ if( !p_sys->b_audiotrack_exception )
+ {
+ JNI_AT_CALL_VOID( stop );
+ if( !CHECK_AT_EXCEPTION( "stop" ) )
+ JNI_AT_CALL_VOID( release );
+ }
+ (*env)->DeleteGlobalRef( env, p_sys->p_audiotrack );
+ p_sys->p_audiotrack = NULL;
+ }
+ p_sys->b_audiotrack_exception = false;
- JNI_AT_CALL_VOID( release );
- (*env)->DeleteGlobalRef( env, p_sys->p_audiotrack );
- p_sys->p_audiotrack = NULL;
+ if( p_sys->p_audioTimestamp )
+ {
+ (*env)->DeleteGlobalRef( env, p_sys->p_audioTimestamp );
+ p_sys->p_audioTimestamp = NULL;
+ }
}
-static void
-JNIThread_Play( JNIEnv *env, bool *p_error, audio_output_t *p_aout,
- block_t *p_buffer )
+/**
+ * Non blocking write function.
+ * Do a calculation between current position and audiotrack position and assure
+ * that we won't wait in AudioTrack.write() method
+ */
+static int
+JNIThread_Write( JNIEnv *env, audio_output_t *p_aout, block_t *p_buffer,
+ size_t i_buffer_offset )
{
aout_sys_t *p_sys = p_aout->sys;
- int i_offset = 0;
+ size_t i_data;
+ uint32_t i_samples;
+ uint32_t i_audiotrack_pos;
+ uint32_t i_samples_pending;
+
+ i_data = p_buffer->i_buffer - i_buffer_offset;
+ i_audiotrack_pos = JNIThread_GetAudioTrackPos( env, p_aout );
+ if( i_audiotrack_pos > p_sys->i_samples_written )
+ {
+ msg_Warn( p_aout, "audiotrack position is ahead. Should NOT happen" );
+ JNIThread_InitDelay( env, p_aout );
+ return 0;
+ }
+ i_samples_pending = p_sys->i_samples_written - i_audiotrack_pos;
- /* check if we need to realloc a ByteArray */
- if( p_buffer->i_buffer > p_sys->i_bytearray_size )
+ /* check if audiotrack buffer is not full before writing on it. */
+ if( i_samples_pending >= p_sys->i_max_audiotrack_samples )
{
- jbyteArray p_bytearray;
- if( p_sys->p_bytearray )
+ /* HACK: AudioFlinger can drop frames without notifying us and there is
+ * no way to know it. It it happens, i_audiotrack_pos won't move and
+ * the current code will be stuck because it'll assume that audiotrack
+ * internal buffer is full when it's not. It can happen only after
+ * Android 4.4.2 if we send frames too quickly. This HACK is just an
+ * other precaution since it shouldn't happen anymore thanks to the
+ * HACK in JNIThread_Play */
+
+ p_sys->i_audiotrack_stuck_count++;
+ if( p_sys->i_audiotrack_stuck_count > 100 )
{
- (*env)->DeleteGlobalRef( env, p_sys->p_bytearray );
- p_sys->p_bytearray = NULL;
+ msg_Warn( p_aout, "AudioFlinger underrun, force write" );
+ i_samples_pending = 0;
+ p_sys->i_audiotrack_stuck_count = 0;
}
+ } else
+ p_sys->i_audiotrack_stuck_count = 0;
+ i_samples = __MIN( p_sys->i_max_audiotrack_samples - i_samples_pending,
+ BYTES_TO_FRAMES( i_data ) );
+
+ i_data = i_samples * p_sys->i_bytes_per_frame;
- p_bytearray = (*env)->NewByteArray( env, p_buffer->i_buffer );
- if( p_bytearray )
+ return JNI_AT_CALL_INT( write, p_sys->p_bytearray,
+ i_buffer_offset, i_data );
+}
+
+/**
+ * Non blocking write function for Lollipop and after.
+ * It calls a new write method with WRITE_NON_BLOCKING flags.
+ */
+static int
+JNIThread_WriteV21( JNIEnv *env, audio_output_t *p_aout, block_t *p_buffer,
+ size_t i_buffer_offset )
+{
+ aout_sys_t *p_sys = p_aout->sys;
+ int i_ret;
+ size_t i_data = p_buffer->i_buffer - i_buffer_offset;
+ uint8_t *p_data = p_buffer->p_buffer + i_buffer_offset;
+
+ if( !p_sys->p_bytebuffer )
+ {
+ jobject p_bytebuffer;
+
+ p_bytebuffer = (*env)->NewDirectByteBuffer( env, p_data, i_data );
+ if( !p_bytebuffer )
+ return jfields.AudioTrack.ERROR_BAD_VALUE;
+
+ p_sys->p_bytebuffer = (*env)->NewGlobalRef( env, p_bytebuffer );
+ (*env)->DeleteLocalRef( env, p_bytebuffer );
+
+ if( !p_sys->p_bytebuffer || (*env)->ExceptionOccurred( env ) )
{
- p_sys->p_bytearray = (*env)->NewGlobalRef( env, p_bytearray );
- (*env)->DeleteLocalRef( env, p_bytearray );
+ p_sys->p_bytebuffer = NULL;
+ (*env)->ExceptionClear( env );
+ return jfields.AudioTrack.ERROR_BAD_VALUE;
}
- p_sys->i_bytearray_size = p_buffer->i_buffer;
}
- if( !p_sys->p_bytearray )
+
+ i_ret = JNI_AT_CALL_INT( writeV21, p_sys->p_bytebuffer, i_data,
+ jfields.AudioTrack.WRITE_NON_BLOCKING );
+ if( i_ret > 0 )
{
- *p_error = true;
- return;
+ /* don't delete the bytebuffer if we wrote nothing, keep it for next
+ * call */
+ (*env)->DeleteGlobalRef( env, p_sys->p_bytebuffer );
+ p_sys->p_bytebuffer = NULL;
}
+ return i_ret;
+}
+
+/**
+ * Non blocking write float function for Lollipop and after.
+ * It calls a new write method with WRITE_NON_BLOCKING flags.
+ */
+static int
+JNIThread_WriteFloat( JNIEnv *env, audio_output_t *p_aout, block_t *p_buffer,
+ size_t i_buffer_offset )
+{
+ aout_sys_t *p_sys = p_aout->sys;
+ int i_ret;
+ size_t i_data;
+
+ i_buffer_offset /= 4;
+ i_data = p_buffer->i_buffer / 4 - i_buffer_offset;
+
+ i_ret = JNI_AT_CALL_INT( writeFloat, p_sys->p_floatarray,
+ i_buffer_offset, i_data,
+ jfields.AudioTrack.WRITE_NON_BLOCKING );
+ if( i_ret < 0 )
+ return i_ret;
+ else
+ return i_ret * 4;
+}
+
+static int
+JNIThread_PreparePlay( JNIEnv *env, audio_output_t *p_aout,
+ block_t *p_buffer )
+{
+ aout_sys_t *p_sys = p_aout->sys;
- /* copy p_buffer in to ByteArray */
- (*env)->SetByteArrayRegion( env, p_sys->p_bytearray, 0,
- p_buffer->i_buffer,
- (jbyte *)p_buffer->p_buffer);
+ if( p_sys->i_chans_to_reorder )
+ aout_ChannelReorder( p_buffer->p_buffer, p_buffer->i_buffer,
+ p_sys->i_chans_to_reorder, p_sys->p_chan_table,
+ p_sys->fmt.i_format );
- while ( p_buffer->i_buffer > (unsigned int) i_offset )
+ switch( p_sys->i_write_type )
{
- int i_ret;
+ case WRITE:
+ /* check if we need to realloc a ByteArray */
+ if( p_buffer->i_buffer > p_sys->i_bytearray_size )
+ {
+ jbyteArray p_bytearray;
- /* write ByteArray */
- i_ret = JNI_AT_CALL_INT( write, p_sys->p_bytearray, i_offset,
- p_buffer->i_buffer - i_offset);
- if( i_ret < 0 ) {
- if( jfields.AudioManager.has_ERROR_DEAD_OBJECT
- && i_ret == jfields.AudioManager.ERROR_DEAD_OBJECT )
+ if( p_sys->p_bytearray )
{
- msg_Warn( p_aout, "ERROR_DEAD_OBJECT: "
- "try recreating AudioTrack" );
- JNIThread_Stop( env, p_error, p_aout );
- i_ret = JNIThread_Start( env, p_error, p_aout );
- if( i_ret == VLC_SUCCESS )
- continue;
- } else
+ (*env)->DeleteGlobalRef( env, p_sys->p_bytearray );
+ p_sys->p_bytearray = NULL;
+ }
+
+ p_bytearray = (*env)->NewByteArray( env, p_buffer->i_buffer );
+ if( p_bytearray )
{
- const char *str;
- if( i_ret == jfields.AudioTrack.ERROR_INVALID_OPERATION )
- str = "ERROR_INVALID_OPERATION";
- else if( i_ret == jfields.AudioTrack.ERROR_BAD_VALUE )
- str = "ERROR_BAD_VALUE";
- else
- str = "ERROR";
- msg_Err( p_aout, "Write failed: %s", str );
+ p_sys->p_bytearray = (*env)->NewGlobalRef( env, p_bytearray );
+ (*env)->DeleteLocalRef( env, p_bytearray );
}
- *p_error = true;
- break;
+ p_sys->i_bytearray_size = p_buffer->i_buffer;
+ }
+ if( !p_sys->p_bytearray )
+ return VLC_EGENERIC;
+
+ /* copy p_buffer in to ByteArray */
+ (*env)->SetByteArrayRegion( env, p_sys->p_bytearray, 0,
+ p_buffer->i_buffer,
+ (jbyte *)p_buffer->p_buffer);
+ break;
+ case WRITE_FLOAT:
+ {
+ size_t i_data = p_buffer->i_buffer / 4;
+
+ /* check if we need to realloc a floatArray */
+ if( i_data > p_sys->i_floatarray_size )
+ {
+ jfloatArray p_floatarray;
+
+ if( p_sys->p_floatarray )
+ {
+ (*env)->DeleteGlobalRef( env, p_sys->p_floatarray );
+ p_sys->p_floatarray = NULL;
+ }
+
+ p_floatarray = (*env)->NewFloatArray( env, i_data );
+ if( p_floatarray )
+ {
+ p_sys->p_floatarray = (*env)->NewGlobalRef( env, p_floatarray );
+ (*env)->DeleteLocalRef( env, p_floatarray );
+ }
+ p_sys->i_floatarray_size = i_data;
+ }
+ if( !p_sys->p_floatarray )
+ return VLC_EGENERIC;
+
+ /* copy p_buffer in to FloatArray */
+ (*env)->SetFloatArrayRegion( env, p_sys->p_floatarray, 0, i_data,
+ (jfloat *)p_buffer->p_buffer);
+
+ break;
+ }
+ case WRITE_V21:
+ break;
+ }
+
+ return VLC_SUCCESS;
+}
+
+static int
+JNIThread_Play( JNIEnv *env, audio_output_t *p_aout,
+ block_t *p_buffer, size_t *p_buffer_offset, mtime_t *p_wait )
+{
+ aout_sys_t *p_sys = p_aout->sys;
+ int i_ret;
+
+ switch( p_sys->i_write_type )
+ {
+ case WRITE_V21:
+ i_ret = JNIThread_WriteV21( env, p_aout, p_buffer, *p_buffer_offset );
+ break;
+ case WRITE:
+ i_ret = JNIThread_Write( env, p_aout, p_buffer, *p_buffer_offset );
+ break;
+ case WRITE_FLOAT:
+ i_ret = JNIThread_WriteFloat( env, p_aout, p_buffer, *p_buffer_offset );
+ break;
+ default:
+ vlc_assert_unreachable();
+ }
+
+ if( i_ret < 0 ) {
+ if( jfields.AudioManager.has_ERROR_DEAD_OBJECT
+ && i_ret == jfields.AudioManager.ERROR_DEAD_OBJECT )
+ {
+ msg_Warn( p_aout, "ERROR_DEAD_OBJECT: "
+ "try recreating AudioTrack" );
+ JNIThread_Stop( env, p_aout );
+ i_ret = JNIThread_Start( env, p_aout );
+ } else
+ {
+ const char *str;
+ if( i_ret == jfields.AudioTrack.ERROR_INVALID_OPERATION )
+ str = "ERROR_INVALID_OPERATION";
+ else if( i_ret == jfields.AudioTrack.ERROR_BAD_VALUE )
+ str = "ERROR_BAD_VALUE";
+ else
+ str = "ERROR";
+ msg_Err( p_aout, "Write failed: %s", str );
}
+ } else if( i_ret == 0 )
+ {
+ /* audiotrack internal buffer is full, wait a little: between 10ms and
+ * 20ms depending on devices or rate */
+ *p_wait = FRAMES_TO_US( p_sys->i_max_audiotrack_samples / 20 );
+ } else
+ {
+ uint32_t i_samples = i_ret / p_sys->i_bytes_per_frame;
+ p_sys->i_samples_queued -= i_samples;
+ p_sys->i_samples_written += i_samples;
- p_sys->i_samples_written += i_ret / p_sys->i_bytes_per_frame;
- i_offset += i_ret;
+ *p_buffer_offset += i_ret;
+
+ /* HACK: There is a known issue in audiotrack, "due to an internal
+ * timeout within the AudioTrackThread". It happens after android
+ * 4.4.2, it's not a problem for Android 5.0 since we use an other way
+ * to write samples. A working hack is to wait a little between each
+ * write. This hack is done only for API 19 (AudioTimestamp was added
+ * in API 19). */
+
+ if( p_sys->i_write_type == WRITE && jfields.AudioTimestamp.clazz )
+ *p_wait = FRAMES_TO_US( i_samples ) / 2;
}
+ return i_ret >= 0 ? VLC_SUCCESS : VLC_EGENERIC;
}
static void
-JNIThread_Pause( JNIEnv *env, bool *p_error, audio_output_t *p_aout,
+JNIThread_Pause( JNIEnv *env, audio_output_t *p_aout,
bool b_pause, mtime_t i_date )
{
VLC_UNUSED( i_date );
if( b_pause )
{
JNI_AT_CALL_VOID( pause );
- CHECK_EXCEPTION( "pause" );
+ CHECK_AT_EXCEPTION( "pause" );
} else
{
JNI_AT_CALL_VOID( play );
- CHECK_EXCEPTION( "play" );
+ CHECK_AT_EXCEPTION( "play" );
+ p_sys->i_play_time = mdate();
}
}
static void
-JNIThread_Flush( JNIEnv *env, bool *p_error, audio_output_t *p_aout,
+JNIThread_Flush( JNIEnv *env, audio_output_t *p_aout,
bool b_wait )
{
aout_sys_t *p_sys = p_aout->sys;
* that has not been played back will be discarded. No-op if not stopped
* or paused, or if the track's creation mode is not MODE_STREAM.
*/
- if( !p_sys->i_samples_written )
- return;
if( b_wait )
{
JNI_AT_CALL_VOID( stop );
- if( CHECK_EXCEPTION( "stop" ) )
+ if( CHECK_AT_EXCEPTION( "stop" ) )
return;
} else
{
-
JNI_AT_CALL_VOID( pause );
- if( CHECK_EXCEPTION( "pause" ) )
+ if( CHECK_AT_EXCEPTION( "pause" ) )
return;
JNI_AT_CALL_VOID( flush );
}
- p_sys->i_samples_written = 0;
JNI_AT_CALL_VOID( play );
- CHECK_EXCEPTION( "play" );
+ CHECK_AT_EXCEPTION( "play" );
+ p_sys->i_play_time = mdate();
+
+ if( p_sys->p_bytebuffer )
+ {
+ (*env)->DeleteGlobalRef( env, p_sys->p_bytebuffer );
+ p_sys->p_bytebuffer = NULL;
+ }
}
static void *
audio_output_t *p_aout = data;
aout_sys_t *p_sys = p_aout->sys;
bool b_error = false;
+ bool b_paused = false;
+ block_t *p_buffer = NULL;
+ size_t i_buffer_offset = 0;
+ mtime_t i_play_deadline = 0;
JNIEnv* env;
jni_attach_thread( &env, THREAD_NAME );
while( p_sys->b_thread_run )
{
+ struct thread_cmd *p_cmd;
+ bool b_remove_cmd = true;
+
/* wait to process a command */
- while( p_sys->b_thread_run && p_sys->p_cmd == NULL )
+ while( ( p_cmd = TAILQ_FIRST( &p_sys->thread_cmd_queue ) ) == NULL
+ && p_sys->b_thread_run )
vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
- if( !p_sys->b_thread_run || p_sys->p_cmd == NULL )
+
+ if( !p_sys->b_thread_run || p_cmd == NULL )
break;
+ if( b_paused && p_cmd->id == CMD_PLAY )
+ {
+ vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
+ continue;
+ }
+
+ if( p_cmd->id == CMD_PLAY && i_play_deadline > 0 )
+ {
+ if( mdate() > i_play_deadline )
+ i_play_deadline = 0;
+ else
+ {
+ int i_ret = 0;
+ while( p_cmd == TAILQ_FIRST( &p_sys->thread_cmd_queue )
+ && i_ret != ETIMEDOUT && p_sys->b_thread_run )
+ i_ret = vlc_cond_timedwait( &p_sys->cond, &p_sys->mutex,
+ i_play_deadline );
+ continue;
+ }
+ }
+
/* process a command */
- switch( p_sys->p_cmd->id )
+ switch( p_cmd->id )
{
case CMD_START:
- p_sys->fmt = *p_sys->p_cmd->in.start.p_fmt;
- p_sys->p_cmd->out.start.i_ret =
- JNIThread_Start( env, &b_error, p_aout );
- p_sys->p_cmd->out.start.p_fmt = &p_sys->fmt;
+ assert( !p_sys->p_audiotrack );
+ if( b_error ) {
+ p_cmd->out.start.i_ret = -1;
+ break;
+ }
+ p_sys->fmt = *p_cmd->in.start.p_fmt;
+ p_cmd->out.start.i_ret =
+ JNIThread_Start( env, p_aout );
+ JNIThread_InitDelay( env, p_aout );
+ p_cmd->out.start.p_fmt = &p_sys->fmt;
+ b_paused = false;
break;
case CMD_STOP:
- JNIThread_Stop( env, &b_error, p_aout );
+ assert( p_sys->p_audiotrack );
+ JNIThread_Stop( env, p_aout );
+ JNIThread_InitDelay( env, p_aout );
+ b_paused = false;
+ b_error = false;
+ p_buffer = NULL;
break;
case CMD_PLAY:
- JNIThread_Play( env, &b_error, p_aout,
- p_sys->p_cmd->in.play.p_buffer );
+ {
+ mtime_t i_play_wait = 0;
+
+ assert( p_sys->p_audiotrack );
+ if( b_error )
+ break;
+ if( p_buffer == NULL )
+ {
+ p_buffer = p_cmd->in.play.p_buffer;
+ b_error = JNIThread_PreparePlay( env, p_aout, p_buffer )
+ != VLC_SUCCESS;
+ }
+ if( b_error )
+ break;
+ b_error = JNIThread_Play( env, p_aout, p_buffer,
+ &i_buffer_offset,
+ &i_play_wait ) != VLC_SUCCESS;
+ if( i_buffer_offset < p_buffer->i_buffer )
+ {
+ /* buffer is not fully processed, try again with the
+ * same cmd and buffer */
+ b_remove_cmd = false;
+ }
+ else
+ {
+ p_buffer = NULL;
+ i_buffer_offset = 0;
+ }
+ if( i_play_wait > 0 )
+ i_play_deadline = mdate() + i_play_wait;
break;
+ }
case CMD_PAUSE:
- JNIThread_Pause( env, &b_error, p_aout,
- p_sys->p_cmd->in.pause.b_pause,
- p_sys->p_cmd->in.pause.i_date );
- break;
- case CMD_FLUSH:
- JNIThread_Flush( env, &b_error, p_aout,
- p_sys->p_cmd->in.flush.b_wait );
+ assert( p_sys->p_audiotrack );
+ if( b_error )
+ break;
+ JNIThread_Pause( env, p_aout,
+ p_cmd->in.pause.b_pause,
+ p_cmd->in.pause.i_date );
+ b_paused = p_cmd->in.pause.b_pause;
break;
case CMD_TIME_GET:
- p_sys->p_cmd->out.time_get.i_ret =
- JNIThread_TimeGet( env, &b_error, p_aout,
- &p_sys->p_cmd->out.time_get.i_delay );
+ assert( p_sys->p_audiotrack );
+ if( b_error )
+ {
+ p_cmd->out.time_get.i_ret = -1;
+ break;
+ }
+ p_cmd->out.time_get.i_ret =
+ JNIThread_TimeGet( env, p_aout,
+ &p_cmd->out.time_get.i_delay );
+ break;
+ case CMD_FLUSH:
+ assert( p_sys->p_audiotrack );
+ if( b_error )
+ break;
+ JNIThread_Flush( env, p_aout,
+ p_cmd->in.flush.b_wait );
+ JNIThread_InitDelay( env, p_aout );
+ p_buffer = NULL;
break;
default:
vlc_assert_unreachable();
}
+ if( p_sys->b_audiotrack_exception )
+ b_error = true;
if( b_error )
- p_sys->b_thread_run = false;
- p_sys->p_cmd->id = CMD_DONE;
- p_sys->p_cmd = NULL;
+ p_sys->i_samples_queued = 0;
+
+ if( b_remove_cmd )
+ {
+ TAILQ_REMOVE( &p_sys->thread_cmd_queue, p_cmd, next );
+ p_cmd->id = CMD_DONE;
+ if( p_cmd->pf_destroy )
+ p_cmd->pf_destroy( p_cmd );
+ }
+
/* signal that command is processed */
vlc_cond_signal( &p_sys->cond );
}
{
if( p_sys->p_bytearray )
(*env)->DeleteGlobalRef( env, p_sys->p_bytearray );
+ if( p_sys->p_floatarray )
+ (*env)->DeleteGlobalRef( env, p_sys->p_floatarray );
+ if( p_sys->p_bytebuffer )
+ (*env)->DeleteGlobalRef( env, p_sys->p_bytebuffer );
jni_detach_thread();
}
- p_sys->b_thread_run = false;
- vlc_cond_signal( &p_sys->cond );
vlc_mutex_unlock( &p_sys->mutex );
return NULL;
}
static int
Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )
{
- int i_ret;
- struct thread_cmd cmd;
+ int i_ret = VLC_EGENERIC;
+ struct thread_cmd *p_cmd;
aout_sys_t *p_sys = p_aout->sys;
vlc_mutex_lock( &p_sys->mutex );
- assert( !p_sys->b_thread_run && p_sys->p_cmd == NULL );
-
- /* create JNIThread */
- p_sys->b_thread_run = true;
- if( vlc_clone( &p_sys->thread,
- JNIThread, p_aout, VLC_THREAD_PRIORITY_AUDIO ) )
+ p_cmd = ThreadCmd_New( CMD_START );
+ if( p_cmd )
{
- msg_Err( p_aout, "JNIThread creation failed" );
- vlc_mutex_unlock( &p_sys->mutex );
- return VLC_EGENERIC;
- }
-
- /* ask the thread to process the Start command */
- cmd.id = CMD_START;
- cmd.in.start.p_fmt = p_fmt;
- p_sys->p_cmd = &cmd;
- vlc_cond_signal( &p_sys->cond );
+ /* ask the thread to process the Start command */
+ p_cmd->in.start.p_fmt = p_fmt;
- /* wait for the thread */
- while( cmd.id != CMD_DONE && p_sys->b_thread_run )
- vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
+ ThreadCmd_InsertHead( p_sys, p_cmd );
+ if( ThreadCmd_Wait( p_sys, p_cmd ) )
+ {
+ i_ret = p_cmd->out.start.i_ret;
+ if( i_ret == VLC_SUCCESS )
+ *p_fmt = *p_cmd->out.start.p_fmt;
+ }
+ free( p_cmd );
+ }
vlc_mutex_unlock( &p_sys->mutex );
- /* retrieve results */
- i_ret = cmd.out.start.i_ret;
if( i_ret == VLC_SUCCESS )
- {
- *p_fmt = *cmd.out.start.p_fmt;
aout_SoftVolumeStart( p_aout );
- }
return i_ret;
}
Stop( audio_output_t *p_aout )
{
aout_sys_t *p_sys = p_aout->sys;
+ struct thread_cmd *p_cmd;
vlc_mutex_lock( &p_sys->mutex );
- assert( p_sys->p_cmd == NULL );
+ ThreadCmd_FlushQueue( p_sys );
- if( p_sys->b_thread_run )
+ p_cmd = ThreadCmd_New( CMD_STOP );
+ if( p_cmd )
{
- struct thread_cmd cmd;
-
/* ask the thread to process the Stop command */
- cmd.id = CMD_STOP;
- p_sys->p_cmd = &cmd;
- vlc_cond_signal( &p_sys->cond );
-
- /* wait for the thread */
- while( cmd.id != CMD_DONE && p_sys->b_thread_run )
- vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
+ ThreadCmd_InsertHead( p_sys, p_cmd );
+ ThreadCmd_Wait( p_sys, p_cmd );
- /* kill the thread */
- p_sys->b_thread_run = false;
- vlc_cond_signal( &p_sys->cond );
+ free( p_cmd );
}
+
vlc_mutex_unlock( &p_sys->mutex );
+}
- vlc_join( p_sys->thread, NULL );
+static void
+PlayCmd_Destroy( struct thread_cmd *p_cmd )
+{
+ block_Release( p_cmd->in.play.p_buffer );
+ free( p_cmd );
}
static void
Play( audio_output_t *p_aout, block_t *p_buffer )
{
aout_sys_t *p_sys = p_aout->sys;
+ struct thread_cmd *p_cmd;
+
vlc_mutex_lock( &p_sys->mutex );
- assert( p_sys->p_cmd == NULL );
+ while( p_sys->i_samples_queued != 0
+ && FRAMES_TO_US( p_sys->i_samples_queued +
+ p_buffer->i_nb_samples ) >= MAX_QUEUE_US )
+ vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
- if( p_sys->b_thread_run )
+ p_cmd = ThreadCmd_New( CMD_PLAY );
+ if( p_cmd )
{
- struct thread_cmd cmd;
-
/* ask the thread to process the Play command */
- cmd.id = CMD_PLAY;
- cmd.in.play.p_buffer = p_buffer;
- p_sys->p_cmd = &cmd;
- vlc_cond_signal( &p_sys->cond );
+ p_cmd->in.play.p_buffer = p_buffer;
+ p_cmd->pf_destroy = PlayCmd_Destroy;
- /* wait for the thread */
- while( cmd.id != CMD_DONE && p_sys->b_thread_run )
- vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
- }
+ ThreadCmd_InsertTail( p_sys, p_cmd );
- vlc_mutex_unlock( &p_sys->mutex );
+ p_sys->i_samples_queued += p_buffer->i_nb_samples;
+ } else
+ block_Release( p_cmd->in.play.p_buffer );
- block_Release( p_buffer );
+ vlc_mutex_unlock( &p_sys->mutex );
}
static void
Pause( audio_output_t *p_aout, bool b_pause, mtime_t i_date )
{
aout_sys_t *p_sys = p_aout->sys;
+ struct thread_cmd *p_cmd;
vlc_mutex_lock( &p_sys->mutex );
- assert( p_sys->p_cmd == NULL );
-
- if( p_sys->b_thread_run )
+ p_cmd = ThreadCmd_New( CMD_PAUSE );
+ if( p_cmd )
{
- struct thread_cmd cmd;
-
/* ask the thread to process the Pause command */
- cmd.id = CMD_PAUSE;
- cmd.in.pause.b_pause = b_pause;
- cmd.in.pause.i_date = i_date;
- p_sys->p_cmd = &cmd;
- vlc_cond_signal( &p_sys->cond );
+ p_cmd->in.pause.b_pause = b_pause;
+ p_cmd->in.pause.i_date = i_date;
- /* wait for the thread */
- while( cmd.id != CMD_DONE && p_sys->b_thread_run )
- vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
+ ThreadCmd_InsertHead( p_sys, p_cmd );
+ ThreadCmd_Wait( p_sys, p_cmd );
+
+ free( p_cmd );
}
vlc_mutex_unlock( &p_sys->mutex );
}
static void
-Flush ( audio_output_t *p_aout, bool b_wait )
+Flush( audio_output_t *p_aout, bool b_wait )
{
aout_sys_t *p_sys = p_aout->sys;
+ struct thread_cmd *p_cmd;
vlc_mutex_lock( &p_sys->mutex );
- assert( p_sys->p_cmd == NULL );
+ ThreadCmd_FlushQueue( p_sys );
- if( p_sys->b_thread_run )
+ p_cmd = ThreadCmd_New( CMD_FLUSH );
+ if( p_cmd)
{
- struct thread_cmd cmd;
-
/* ask the thread to process the Flush command */
- cmd.id = CMD_FLUSH;
- cmd.in.flush.b_wait = b_wait;
- p_sys->p_cmd = &cmd;
- vlc_cond_signal( &p_sys->cond );
+ p_cmd->in.flush.b_wait = b_wait;
- /* wait for the thread */
- while( cmd.id != CMD_DONE && p_sys->b_thread_run )
- vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
+ ThreadCmd_InsertHead( p_sys, p_cmd );
+ ThreadCmd_Wait( p_sys, p_cmd );
+
+ free( p_cmd );
}
vlc_mutex_unlock( &p_sys->mutex );
static int
TimeGet( audio_output_t *p_aout, mtime_t *restrict p_delay )
{
- int i_ret = -1;
aout_sys_t *p_sys = p_aout->sys;
+ struct thread_cmd *p_cmd;
+ int i_ret = -1;
vlc_mutex_lock( &p_sys->mutex );
- assert( p_sys->p_cmd == NULL );
-
- if( p_sys->b_thread_run )
+ p_cmd = ThreadCmd_New( CMD_TIME_GET );
+ if( p_cmd)
{
- struct thread_cmd cmd;
-
- /* ask the thread to process the TimeGet */
- cmd.id = CMD_TIME_GET;
- p_sys->p_cmd = &cmd;
- vlc_cond_signal( &p_sys->cond );
-
- /* wait for the thread */
- while( cmd.id != CMD_DONE && p_sys->b_thread_run )
- vlc_cond_wait( &p_sys->cond, &p_sys->mutex );
+ ThreadCmd_InsertHead( p_sys, p_cmd );
+ ThreadCmd_Wait( p_sys, p_cmd );
- /* retrieve results */
- i_ret = cmd.out.time_get.i_ret;
- *p_delay = cmd.out.time_get.i_delay;
+ i_ret = p_cmd->out.time_get.i_ret;
+ *p_delay = p_cmd->out.time_get.i_delay;
+ free( p_cmd );
}
vlc_mutex_unlock( &p_sys->mutex );
vlc_mutex_init( &p_sys->mutex );
vlc_cond_init( &p_sys->cond );
+ TAILQ_INIT( &p_sys->thread_cmd_queue );
p_aout->sys = p_sys;
p_aout->start = Start;
aout_SoftVolumeInit( p_aout );
+ /* create JNIThread */
+ p_sys->b_thread_run = true;
+ if( vlc_clone( &p_sys->thread,
+ JNIThread, p_aout, VLC_THREAD_PRIORITY_AUDIO ) )
+ {
+ msg_Err( p_aout, "JNIThread creation failed" );
+ p_sys->b_thread_run = false;
+ Close( obj );
+ return VLC_EGENERIC;
+ }
+
return VLC_SUCCESS;
}
audio_output_t *p_aout = (audio_output_t *) obj;
aout_sys_t *p_sys = p_aout->sys;
+ /* kill the thread */
+ vlc_mutex_lock( &p_sys->mutex );
+ if( p_sys->b_thread_run )
+ {
+ p_sys->b_thread_run = false;
+ vlc_cond_signal( &p_sys->cond );
+ vlc_mutex_unlock( &p_sys->mutex );
+ vlc_join( p_sys->thread, NULL );
+ } else
+ vlc_mutex_unlock( &p_sys->mutex );
+
vlc_mutex_destroy( &p_sys->mutex );
vlc_cond_destroy( &p_sys->cond );
projects / vlc / blobdiff