[vlc-commits] audiotrack: always try to fetch AudioTimestamp clazz

Thomas Guillem git at videolan.org
Fri Jul 3 10:43:22 CEST 2015


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jul  3 09:38:13 2015 +0200| [9cd3560bdd978f1a971b2e253807248a6d7bc13d] | committer: Thomas Guillem

audiotrack: always try to fetch AudioTimestamp clazz

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9cd3560bdd978f1a971b2e253807248a6d7bc13d
---

 modules/audio_output/audiotrack.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
index 7689330..29c77dd 100644
--- a/modules/audio_output/audiotrack.c
+++ b/modules/audio_output/audiotrack.c
@@ -268,10 +268,8 @@ InitJNIFields( audio_output_t *p_aout, JNIEnv* env )
     } else
         GET_ID( GetMethodID, AudioTrack.write, "write", "([BII)I", true );
 
-#ifdef AUDIOTRACK_HW_LATENCY
     GET_ID( GetMethodID, AudioTrack.getTimestamp,
             "getTimestamp", "(Landroid/media/AudioTimestamp;)Z", false );
-#endif
     GET_ID( GetMethodID, AudioTrack.getPlaybackHeadPosition,
             "getPlaybackHeadPosition", "()I", true );
 
@@ -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 );
 
+#ifdef AUDIOTRACK_HW_LATENCY
     if( jfields.AudioTimestamp.clazz )
     {
         /* create AudioTimestamp object */
@@ -1000,6 +999,7 @@ Start( audio_output_t *p_aout, audio_sample_format_t *restrict p_fmt )
             return VLC_EGENERIC;
         }
     }
+#endif
 
     if( p_sys->fmt.i_format == VLC_CODEC_FL32 )
     {



More information about the vlc-commits mailing list