[vlc-commits] demux: add DEMUX_GET_NORMAL_TIME

Thomas Guillem git at videolan.org
Mon Sep 23 13:36:19 CEST 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Sep 10 18:26:49 2019 +0200| [7c961eacad4053b67000fb6abda749bc0c1ca6c7] | committer: Thomas Guillem

demux: add DEMUX_GET_NORMAL_TIME

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

 include/vlc_demux.h | 2 ++
 src/input/demux.c   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index ba06d9162e..5d67813fc0 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -178,6 +178,8 @@ enum demux_query_e
     DEMUX_GET_LENGTH,           /* arg1= vlc_tick_t *   res=    */
     DEMUX_GET_TIME,             /* arg1= vlc_tick_t *   res=    */
     DEMUX_SET_TIME,             /* arg1= vlc_tick_t arg2= bool b_precise   res=can fail    */
+    /* Normal or original time, used mainly by the ts module */
+    DEMUX_GET_NORMAL_TIME,      /* arg1= vlc_tick_t *   res= can fail, in that case VLC_TICK_0 will be used as NORMAL_TIME */
 
     /**
      * \todo Document
diff --git a/src/input/demux.c b/src/input/demux.c
index 02365c847d..db1b46532e 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -338,7 +338,8 @@ int demux_vaControlHelper( stream_t *s,
                 return VLC_SUCCESS;
             }
             return VLC_EGENERIC;
-
+        case DEMUX_GET_NORMAL_TIME:
+            return VLC_EGENERIC;
 
         case DEMUX_SET_POSITION:
             f = va_arg( args, double );



More information about the vlc-commits mailing list