[vlc-commits] aout: fix time reporting for packet-based outputs

Rémi Denis-Courmont git at videolan.org
Thu Aug 11 22:32:44 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug 11 23:14:13 2011 +0300| [d219a21c341171048730ea54e0689cb4739c78f9] | committer: Rémi Denis-Courmont

aout: fix time reporting for packet-based outputs

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

 src/audio_output/output.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 3cdf969..65a641a 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -414,7 +414,7 @@ void aout_PacketPlay (audio_output_t *aout, block_t *block)
     vlc_mutex_unlock (&p->lock);
 
     if (time_report != VLC_TS_INVALID)
-        aout_TimeReport (aout, mdate () + time_report);
+        aout_TimeReport (aout, mdate () - time_report);
 }
 
 void aout_PacketPause (audio_output_t *aout, bool pause, mtime_t date)
@@ -621,7 +621,7 @@ block_t *aout_PacketNext (audio_output_t *p_aout, mtime_t start_date)
     const bool b_can_sleek = !AOUT_FMT_LINEAR(&p_aout->format);
     const mtime_t now = mdate ();
     const mtime_t threshold =
-        (b_can_sleek ? now : start_date) - AOUT_MAX_PTS_DELAY;
+        (b_can_sleek ? start_date : now) - AOUT_MAX_PTS_DELAY;
 
     vlc_mutex_lock( &p->lock );
     if( p->pause_date != VLC_TS_INVALID )



More information about the vlc-commits mailing list