X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmodules_export.h;h=a695099b8a7852c438196d5487cdca6451413f32;hb=b6fcfff5ba308997a2d379f6dbe504ede54135b1;hp=29da3ba63fb6c143ec7b5db83d7243e0ffa84354;hpb=47723362cca97b9e55f232ab72be816bed63329b;p=vlc diff --git a/include/modules_export.h b/include/modules_export.h index 29da3ba63f..a695099b8a 100644 --- a/include/modules_export.h +++ b/include/modules_export.h @@ -38,10 +38,14 @@ typedef struct module_symbols_s int ( * intf_ProcessKey ) ( struct intf_thread_s *, int ); void ( * intf_AssignKey ) ( struct intf_thread_s *, int, int, int ); - void ( * intf_Msg ) ( char *, ... ); - void ( * intf_ErrMsg ) ( char *, ... ); - void ( * intf_WarnMsg ) ( int, char *, ... ); - void ( * intf_FlushMsg )( void ); + void ( * intf_Msg ) ( char *, ... ); + void ( * intf_ErrMsg ) ( char *, ... ); + void ( * intf_WarnMsg ) ( int, char *, ... ); + void ( * intf_WarnMsgImm ) ( int, char *, ... ); +#ifdef TRACE + void ( * intf_DbgMsg ) ( char *, char *, int, char *, ... ); + void ( * intf_DbgMsgImm ) ( char *, char *, int, char *, ... ); +#endif int ( * intf_PlaylistAdd ) ( struct playlist_s *, int, const char* ); int ( * intf_PlaylistDelete ) ( struct playlist_s *, int ); @@ -58,7 +62,6 @@ typedef struct module_symbols_s int ( * network_ChannelJoin ) ( int ); void ( * input_SetStatus ) ( struct input_thread_s *, int ); - void ( * input_SetRate ) ( struct input_thread_s *, int ); void ( * input_Seek ) ( struct input_thread_s *, off_t ); void ( * input_DumpStream ) ( struct input_thread_s * ); char * ( * input_OffsetToTime ) ( struct input_thread_s *, char *, off_t ); @@ -86,6 +89,11 @@ typedef struct module_symbols_s void ( * input_DelArea ) ( struct input_thread_s *, struct input_area_s * ); + void ( * InitBitstream ) ( struct bit_stream_s *, + struct decoder_fifo_s *, + void ( * ) ( struct bit_stream_s *, + boolean_t ), + void * ); int ( * input_InitStream ) ( struct input_thread_s *, size_t ); void ( * input_EndStream ) ( struct input_thread_s * ); @@ -95,6 +103,8 @@ typedef struct module_symbols_s struct data_packet_s *, struct es_descriptor_s *, boolean_t, boolean_t ); + void ( * input_DecodePES ) ( struct decoder_fifo_s *, + struct pes_packet_s * ); struct es_descriptor_s * ( * input_ParsePS ) ( struct input_thread_s *, struct data_packet_s * ); void ( * input_DemuxPS ) ( struct input_thread_s *, @@ -106,6 +116,10 @@ typedef struct module_symbols_s struct es_descriptor_s *, boolean_t, boolean_t ); + int ( * input_ClockManageControl ) ( struct input_thread_s *, + struct pgrm_descriptor_s *, + mtime_t ); + int ( * input_NetlistInit ) ( struct input_thread_s *, int, int, size_t, int ); struct iovec * ( * input_NetlistGetiovec ) ( void * p_method_data ); @@ -135,7 +149,7 @@ typedef struct module_symbols_s (p_symbols)->intf_Msg = intf_Msg; \ (p_symbols)->intf_ErrMsg = intf_ErrMsg; \ (p_symbols)->intf_WarnMsg = intf_WarnMsg; \ - (p_symbols)->intf_FlushMsg = intf_FlushMsg; \ + (p_symbols)->intf_WarnMsgImm = intf_WarnMsgImm; \ (p_symbols)->intf_PlaylistAdd = intf_PlaylistAdd; \ (p_symbols)->intf_PlaylistDelete = intf_PlaylistDelete; \ (p_symbols)->intf_PlaylistNext = intf_PlaylistNext; \ @@ -148,7 +162,6 @@ typedef struct module_symbols_s (p_symbols)->network_ChannelCreate = network_ChannelCreate; \ (p_symbols)->network_ChannelJoin = network_ChannelJoin; \ (p_symbols)->input_SetStatus = input_SetStatus; \ - (p_symbols)->input_SetRate = input_SetRate; \ (p_symbols)->input_Seek = input_Seek; \ (p_symbols)->input_DumpStream = input_DumpStream; \ (p_symbols)->input_OffsetToTime = input_OffsetToTime; \ @@ -164,14 +177,17 @@ typedef struct module_symbols_s (p_symbols)->input_DelProgram = input_DelProgram; \ (p_symbols)->input_AddArea = input_AddArea; \ (p_symbols)->input_DelArea = input_DelArea; \ + (p_symbols)->InitBitstream = InitBitstream; \ (p_symbols)->input_InitStream = input_InitStream; \ (p_symbols)->input_EndStream = input_EndStream; \ (p_symbols)->input_ParsePES = input_ParsePES; \ (p_symbols)->input_GatherPES = input_GatherPES; \ + (p_symbols)->input_DecodePES = input_DecodePES; \ (p_symbols)->input_ParsePS = input_ParsePS; \ (p_symbols)->input_DemuxPS = input_DemuxPS; \ (p_symbols)->input_DemuxTS = input_DemuxTS; \ (p_symbols)->input_DemuxPSI = input_DemuxPSI; \ + (p_symbols)->input_ClockManageControl = input_ClockManageControl; \ (p_symbols)->input_NetlistInit = input_NetlistInit; \ (p_symbols)->input_NetlistGetiovec = input_NetlistGetiovec; \ (p_symbols)->input_NetlistMviovec = input_NetlistMviovec; \ @@ -181,6 +197,10 @@ typedef struct module_symbols_s (p_symbols)->input_NetlistDeletePES = input_NetlistDeletePES; \ (p_symbols)->input_NetlistEnd = input_NetlistEnd; +#define STORE_TRACE_SYMBOLS( p_symbols ) \ + (p_symbols)->intf_DbgMsg = _intf_DbgMsg; \ + (p_symbols)->intf_DbgMsgImm = _intf_DbgMsgImm; + #ifdef PLUGIN extern module_symbols_t* p_symbols; @@ -203,7 +223,17 @@ extern module_symbols_t* p_symbols; # define intf_Msg p_symbols->intf_Msg # define intf_ErrMsg p_symbols->intf_ErrMsg # define intf_WarnMsg p_symbols->intf_WarnMsg -# define intf_FlushMsg p_symbols->intf_FlushMsg +# define intf_WarnMsgImm p_symbols->intf_WarnMsgImm +#ifdef TRACE +# undef intf_DbgMsg +# undef intf_DbgMsgImm +# define intf_DbgMsg( format, args... ) \ + p_symbols->intf_DbgMsg( __FILE__, __FUNCTION__, \ + __LINE__, format, ## args ) +# define intf_DbgMsgImm( format, args... ) \ + p_symbols->intf_DbgMsgImm( __FILE__, __FUNCTION__, \ + __LINE__, format, ## args ) +#endif # define intf_PlaylistAdd(a,b,c) p_symbols->intf_PlaylistAdd(a,b,c) # define intf_PlaylistDelete(a,b) p_symbols->intf_PlaylistDelete(a,b) @@ -220,7 +250,6 @@ extern module_symbols_t* p_symbols; # define network_ChannelJoin(a) p_symbols->network_ChannelJoin(a) # define input_SetStatus(a,b) p_symbols->input_SetStatus(a,b) -# define input_SetRate(a,b) p_symbols->input_SetRate(a,b) # define input_Seek(a,b) p_symbols->input_Seek(a,b) # define input_DumpStream(a) p_symbols->input_DumpStream(a) # define input_OffsetToTime(a,b,c) p_symbols->input_OffsetToTime(a,b,c) @@ -237,16 +266,20 @@ extern module_symbols_t* p_symbols; # define input_AddArea p_symbols->input_AddArea # define input_DelArea p_symbols->input_DelArea +# define InitBitstream p_symbols->InitBitstream # define input_InitStream p_symbols->input_InitStream # define input_EndStream p_symbols->input_EndStream # define input_ParsePES p_symbols->input_ParsePES # define input_GatherPES p_symbols->input_GatherPES +# define input_DecodePES p_symbols->input_DecodePES # define input_ParsePS p_symbols->input_ParsePS # define input_DemuxPS p_symbols->input_DemuxPS # define input_DemuxTS p_symbols->input_DemuxTS # define input_DemuxPSI p_symbols->input_DemuxPSI +# define input_ClockManageControl p_symbols->input_ClockManageControl + # define input_NetlistInit p_symbols->input_NetlistInit # define input_NetlistGetiovec p_symbols->input_NetlistGetiovec # define input_NetlistMviovec p_symbols->input_NetlistMviovec