Skip to content

V
vlc
Commit 9cd3560b authored by Thomas Guillem's avatar Thomas Guillem
Browse files
Options

audiotrack: always try to fetch AudioTimestamp clazz

parent e54be6c1
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/audio_output/audiotrack.c
View file @ 9cd3560b
...@@ -268,10 +268,8 @@ InitJNIFields( audio_output_t *p_aout, JNIEnv* env ) ...@@ -268,10 +268,8 @@ InitJNIFields( audio_output_t *p_aout, JNIEnv* env )
} else } else
GET_ID( GetMethodID, AudioTrack.write, "write", "([BII)I", true ); GET_ID( GetMethodID, AudioTrack.write, "write", "([BII)I", true );
#ifdef AUDIOTRACK_HW_LATENCY
GET_ID( GetMethodID, AudioTrack.getTimestamp, GET_ID( GetMethodID, AudioTrack.getTimestamp,
"getTimestamp", "(Landroid/media/AudioTimestamp;)Z", false ); "getTimestamp", "(Landroid/media/AudioTimestamp;)Z", false );
#endif
GET_ID( GetMethodID, AudioTrack.getPlaybackHeadPosition, GET_ID( GetMethodID, AudioTrack.getPlaybackHeadPosition,
"getPlaybackHeadPosition", "()I", true ); "getPlaybackHeadPosition", "()I", true );
...@@ -984,6 +982,7 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt ) ...@@ -984,6 +982,7 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )
} }
p_sys->i_max_audiotrack_samples = BYTES_TO_FRAMES( i_audiotrack_size ); p_sys->i_max_audiotrack_samples = BYTES_TO_FRAMES( i_audiotrack_size );
#ifdef AUDIOTRACK_HW_LATENCY
if( jfields.AudioTimestamp.clazz ) if( jfields.AudioTimestamp.clazz )
{ {
/* create AudioTimestamp object */ /* create AudioTimestamp object */
...@@ -1000,6 +999,7 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt ) ...@@ -1000,6 +999,7 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
#endif
if( p_sys->fmt.i_format == VLC_CODEC_FL32 ) if( p_sys->fmt.i_format == VLC_CODEC_FL32 )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment