Introduce DEMUX_CAN_CONTROL_RATE and DEMUX_SET_RATE (for future rtsp trickplay)

[vlc] / src / input / input_internal.h

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 7c8d366faced4d56f5e2c42977712bdd37ac4034..d2a64131f5f0b7472bdf3c805bdd838206395477 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__)
+# error This header file can only be included from LibVLC.
+#endif
+
 #ifndef _INPUT_INTERNAL_H
 #define _INPUT_INTERNAL_H 1
 
@@ -59,6 +63,7 @@ typedef struct
     vlc_bool_t b_can_pace_control;
     vlc_bool_t b_can_pause;
     vlc_bool_t b_eof;   /* eof of demuxer */
+    double     f_fps;
 
     /* Clock average variation */
     int     i_cr_average;
@@ -215,6 +220,7 @@ typedef struct playlist_album_t
 {
     char *psz_artist;
     char *psz_album;
+    char *psz_arturl;
     vlc_bool_t b_found;
 } playlist_album_t;
 
@@ -257,14 +263,18 @@ void stream_AccessUpdate( stream_t *s );
 /* decoder.c */
 void       input_DecoderDiscontinuity( decoder_t * p_dec, vlc_bool_t b_flush );
 vlc_bool_t input_DecoderEmpty( decoder_t * p_dec );
+int        input_DecoderSetCcState( decoder_t *, vlc_bool_t b_decode, int i_channel );
+int        input_DecoderGetCcState( decoder_t *, vlc_bool_t *pb_decode, int i_channel );
+void       input_DecoderIsCcPresent( decoder_t *, vlc_bool_t pb_present[4] );
 
 /* es_out.c */
 es_out_t  *input_EsOutNew( input_thread_t * );
 void       input_EsOutDelete( es_out_t * );
 es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id );
-void       input_EsOutDiscontinuity( es_out_t *, vlc_bool_t b_flush, vlc_bool_t b_audio );
 void       input_EsOutSetDelay( es_out_t *, int i_cat, int64_t );
-void       input_EsOutSetRate( es_out_t * );
+void       input_EsOutChangeRate( es_out_t * );
+void       input_EsOutChangeState( es_out_t * );
+void       input_EsOutChangePosition( es_out_t * );
 vlc_bool_t input_EsOutDecodersEmpty( es_out_t * );
 
 /* clock.c */
@@ -298,6 +308,7 @@ typedef struct
 
 void    input_ClockInit( input_thread_t *, input_clock_t *, vlc_bool_t b_master, int i_cr_average );
 void    input_ClockSetPCR( input_thread_t *, input_clock_t *, mtime_t );
+void    input_ClockResetPCR( input_thread_t *, input_clock_t * );
 mtime_t input_ClockGetTS( input_thread_t *, input_clock_t *, mtime_t );
 void    input_ClockSetRate( input_thread_t *, input_clock_t *cl );
 
@@ -309,9 +320,7 @@ void MRLSplit( vlc_object_t *, char *, const char **, const char **, char ** );
 
 static inline void input_ChangeState( input_thread_t *p_input, int state )
 {
-    vlc_value_t val;
-    val.i_int = p_input->i_state = state;
-    var_Change( p_input, "state", VLC_VAR_SETVALUE, &val, NULL );
+    var_SetInteger( p_input, "state", p_input->i_state = state );
 }
 
 /* Access */
@@ -352,9 +361,6 @@ static inline int demux2_Control( demux_t *p_demux, int i_query, ... )
     return i_result;
 }
 
-#if defined(__PLUGIN__) || defined(__BUILTIN__)
-# warning This is an internal header, please don't rely on it.
-#else
 /* Stream */
 /**
  * stream_t definition
@@ -363,7 +369,7 @@ struct stream_t
 {
     VLC_COMMON_MEMBERS
 
-    block_t *(*pf_block)  ( stream_t *, int i_size );
+    /*block_t *(*pf_block)  ( stream_t *, int i_size );*/
     int      (*pf_read)   ( stream_t *, void *p_read, int i_read );
     int      (*pf_peek)   ( stream_t *, const uint8_t **pp_peek, int i_peek );
     int      (*pf_control)( stream_t *, int i_query, va_list );
@@ -384,6 +390,5 @@ static inline stream_t *vlc_stream_create( vlc_object_t *obj )
     return (stream_t *)vlc_custom_create( obj, sizeof(stream_t),
                                           VLC_OBJECT_STREAM, "stream" );
 }
-#endif
 
 #endif