videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

sout: remove sout_instance_t for real 

(also sout_cfg_t)
This commit is contained in:
Rémi Denis-Courmont 2021-07-13 19:00:50 +03:00
parent 3e55700963
commit a2476d06e2
10 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extras/analyser/vlc.vim
View File

@ -66,7 +66,6 @@ function VlcSyntax()
" Images " Images
syn keyword cType image_handler_t syn keyword cType image_handler_t
" Sout " Sout
syn keyword cType sout_instance_t sout_cfg_t
syn keyword cType sout_input_t sout_packetizer_input_t syn keyword cType sout_input_t sout_packetizer_input_t
syn keyword cType sout_access_out_t sout_access_out_sys_t syn keyword cType sout_access_out_t sout_access_out_sys_t
syn keyword cType sout_mux_t sout_mux_sys_t syn keyword cType sout_mux_t sout_mux_sys_t

2
include/vlc_common.h
View File

@ -395,8 +395,6 @@ typedef struct subpicture_region_t subpicture_region_t;
typedef struct image_handler_t image_handler_t; typedef struct image_handler_t image_handler_t;
/* Stream output */ /* Stream output */
typedef struct sout_stream_t sout_instance_t;
typedef struct sout_input_t sout_input_t; typedef struct sout_input_t sout_input_t;
typedef struct sout_packetizer_input_t sout_packetizer_input_t; typedef struct sout_packetizer_input_t sout_packetizer_input_t;

8
src/input/decoder.c
View File

@ -75,7 +75,7 @@ struct vlc_input_decoder_t
ssize_t i_spu_channel; ssize_t i_spu_channel;
int64_t i_spu_order; int64_t i_spu_order;
sout_instance_t *p_sout; sout_stream_t *p_sout;
sout_packetizer_input_t *p_sout_input; sout_packetizer_input_t *p_sout_input;
vlc_thread_t thread; vlc_thread_t thread;
@ -1771,7 +1771,7 @@ static const struct decoder_owner_callbacks dec_spu_cbs =
static vlc_input_decoder_t * static vlc_input_decoder_t *
CreateDecoder( vlc_object_t *p_parent, CreateDecoder( vlc_object_t *p_parent,
const es_format_t *fmt, vlc_clock_t *p_clock, const es_format_t *fmt, vlc_clock_t *p_clock,
input_resource_t *p_resource, sout_instance_t *p_sout, input_resource_t *p_resource, sout_stream_t *p_sout,
bool b_thumbnailing, const struct vlc_input_decoder_callbacks *cbs, bool b_thumbnailing, const struct vlc_input_decoder_callbacks *cbs,
void *cbs_userdata ) void *cbs_userdata )
{ {
@ -2030,7 +2030,7 @@ static void DecoderUnsupportedCodec( decoder_t *p_dec, const es_format_t *fmt, b
static vlc_input_decoder_t * static vlc_input_decoder_t *
decoder_New( vlc_object_t *p_parent, const es_format_t *fmt, decoder_New( vlc_object_t *p_parent, const es_format_t *fmt,
vlc_clock_t *p_clock, input_resource_t *p_resource, vlc_clock_t *p_clock, input_resource_t *p_resource,
sout_instance_t *p_sout, bool thumbnailing, sout_stream_t *p_sout, bool thumbnailing,
const struct vlc_input_decoder_callbacks *cbs, void *userdata) const struct vlc_input_decoder_callbacks *cbs, void *userdata)
{ {
const char *psz_type = p_sout ? N_("packetizer") : N_("decoder"); const char *psz_type = p_sout ? N_("packetizer") : N_("decoder");
@ -2103,7 +2103,7 @@ decoder_New( vlc_object_t *p_parent, const es_format_t *fmt,
vlc_input_decoder_t * vlc_input_decoder_t *
vlc_input_decoder_New( vlc_object_t *parent, es_format_t *fmt, vlc_input_decoder_New( vlc_object_t *parent, es_format_t *fmt,
vlc_clock_t *p_clock, input_resource_t *resource, vlc_clock_t *p_clock, input_resource_t *resource,
sout_instance_t *p_sout, bool thumbnailing, sout_stream_t *p_sout, bool thumbnailing,
const struct vlc_input_decoder_callbacks *cbs, const struct vlc_input_decoder_callbacks *cbs,
void *cbs_userdata) void *cbs_userdata)
{ {

2
src/input/decoder.h
View File

@ -52,7 +52,7 @@ struct vlc_input_decoder_callbacks {
vlc_input_decoder_t * vlc_input_decoder_t *
vlc_input_decoder_New( vlc_object_t *parent, es_format_t *, vlc_clock_t *, vlc_input_decoder_New( vlc_object_t *parent, es_format_t *, vlc_clock_t *,
input_resource_t *, sout_instance_t *, bool thumbnailing, input_resource_t *, sout_stream_t *, bool thumbnailing,
const struct vlc_input_decoder_callbacks *cbs, const struct vlc_input_decoder_callbacks *cbs,
void *userdata ) VLC_USED; void *userdata ) VLC_USED;

2
src/input/es_out.c
View File

@ -223,7 +223,7 @@ typedef struct
vlc_tick_t i_buffering_extra_system; vlc_tick_t i_buffering_extra_system;
/* Record */ /* Record */
sout_instance_t *p_sout_record; sout_stream_t *p_sout_record;
/* Used only to limit debugging output */ /* Used only to limit debugging output */
int i_prev_stream_level; int i_prev_stream_level;

2
src/input/input_internal.h
View File

@ -491,7 +491,7 @@ typedef struct input_thread_private_t
/* Output */ /* Output */
bool b_out_pace_control; /* XXX Move it ot es_sout ? */ bool b_out_pace_control; /* XXX Move it ot es_sout ? */
sout_instance_t *p_sout; /* Idem ? */ sout_stream_t *p_sout; /* Idem ? */
es_out_t *p_es_out; es_out_t *p_es_out;
es_out_t *p_es_out_display; es_out_t *p_es_out_display;
vlc_viewpoint_t viewpoint; vlc_viewpoint_t viewpoint;

8
src/input/resource.c
View File

@ -66,7 +66,7 @@ struct input_resource_t
/* */ /* */
input_thread_t *p_input; input_thread_t *p_input;
sout_instance_t *p_sout; sout_stream_t *p_sout;
char *psz_sout; char *psz_sout;
vout_thread_t *p_vout_dummy; vout_thread_t *p_vout_dummy;
struct vout_resource *vout_rsc_free; struct vout_resource *vout_rsc_free;
@ -573,9 +573,9 @@ void input_resource_StopFreeVout(input_resource_t *p_resource)
} }
/* */ /* */
sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, const char *psz_sout ) sout_stream_t *input_resource_RequestSout( input_resource_t *p_resource, const char *psz_sout )
{ {
sout_instance_t *sout; sout_stream_t *sout;
assert(psz_sout != NULL); assert(psz_sout != NULL);
vlc_mutex_lock( &p_resource->lock ); vlc_mutex_lock( &p_resource->lock );
@ -612,7 +612,7 @@ sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, const
return sout; return sout;
} }
void input_resource_PutSout(input_resource_t *resource, sout_instance_t *sout) void input_resource_PutSout(input_resource_t *resource, sout_stream_t *sout)
{ {
if (sout == NULL) if (sout == NULL)
{ {

4
src/input/resource.h
View File

@ -35,8 +35,8 @@ void input_resource_SetInput( input_resource_t *, input_thread_t * );
/** /**
* This function handles sout request. * This function handles sout request.
*/ */
sout_instance_t *input_resource_RequestSout( input_resource_t *, const char * ); sout_stream_t *input_resource_RequestSout( input_resource_t *, const char * );
void input_resource_PutSout(input_resource_t *, sout_instance_t *); void input_resource_PutSout(input_resource_t *, sout_stream_t *);
vout_thread_t *input_resource_RequestVout(input_resource_t *, vlc_video_context *, vout_thread_t *input_resource_RequestVout(input_resource_t *, vlc_video_context *,
const vout_configuration_t *, const vout_configuration_t *,

20
src/stream_output/stream_output.c
View File

@ -77,9 +77,9 @@ static void mrl_Clean( mrl_t *p_mrl );
/***************************************************************************** /*****************************************************************************
* sout_NewInstance: creates a new stream output instance * sout_NewInstance: creates a new stream output instance
*****************************************************************************/ *****************************************************************************/
sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest ) sout_stream_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest )
{ {
sout_instance_t *p_sout; sout_stream_t *p_sout;
char *psz_chain; char *psz_chain;
assert( psz_dest != NULL ); assert( psz_dest != NULL );
@ -109,12 +109,12 @@ sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest
/***************************************************************************** /*****************************************************************************
* sout_DeleteInstance: delete a previously allocated instance * sout_DeleteInstance: delete a previously allocated instance
*****************************************************************************/ *****************************************************************************/
void sout_DeleteInstance( sout_instance_t * p_sout ) void sout_DeleteInstance( sout_stream_t * p_sout )
{ {
sout_StreamChainDelete( p_sout, NULL ); sout_StreamChainDelete( p_sout, NULL );
} }
bool sout_instance_ControlsPace( sout_instance_t *sout ) bool sout_instance_ControlsPace( sout_stream_t *sout )
{ {
return !sout_StreamIsSynchronous(sout); return !sout_StreamIsSynchronous(sout);
} }
@ -129,7 +129,7 @@ struct sout_packetizer_input_t
bool b_flushed; bool b_flushed;
}; };
sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout, sout_packetizer_input_t *sout_InputNew( sout_stream_t *p_sout,
const es_format_t *p_fmt ) const es_format_t *p_fmt )
{ {
sout_packetizer_input_t *p_input; sout_packetizer_input_t *p_input;
@ -159,7 +159,7 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout,
/***************************************************************************** /*****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
int sout_InputDelete( sout_instance_t *p_sout, int sout_InputDelete( sout_stream_t *p_sout,
sout_packetizer_input_t *p_input ) sout_packetizer_input_t *p_input )
{ {
@ -171,7 +171,7 @@ int sout_InputDelete( sout_instance_t *p_sout,
return( VLC_SUCCESS); return( VLC_SUCCESS);
} }
static int sout_InputControlVa( sout_instance_t *p_sout, static int sout_InputControlVa( sout_stream_t *p_sout,
sout_packetizer_input_t *p_input, sout_packetizer_input_t *p_input,
int i_query, va_list args ) int i_query, va_list args )
{ {
@ -183,7 +183,7 @@ static int sout_InputControlVa( sout_instance_t *p_sout,
return VLC_EGENERIC; return VLC_EGENERIC;
} }
int sout_InputControl( sout_instance_t *p_sout, int sout_InputControl( sout_stream_t *p_sout,
sout_packetizer_input_t *p_input, int i_query, ... ) sout_packetizer_input_t *p_input, int i_query, ... )
{ {
va_list args; va_list args;
@ -195,7 +195,7 @@ int sout_InputControl( sout_instance_t *p_sout,
return i_result; return i_result;
} }
void sout_InputFlush( sout_instance_t *p_sout, void sout_InputFlush( sout_stream_t *p_sout,
sout_packetizer_input_t *p_input ) sout_packetizer_input_t *p_input )
{ {
sout_StreamFlush( p_sout, p_input->id ); sout_StreamFlush( p_sout, p_input->id );
@ -205,7 +205,7 @@ void sout_InputFlush( sout_instance_t *p_sout,
/***************************************************************************** /*****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
int sout_InputSendBuffer( sout_instance_t *p_sout, int sout_InputSendBuffer( sout_stream_t *p_sout,
sout_packetizer_input_t *p_input, sout_packetizer_input_t *p_input,
block_t *p_buffer ) block_t *p_buffer )
{ {

16
src/stream_output/stream_output.h
View File

@ -30,23 +30,23 @@
# include <vlc_network.h> # include <vlc_network.h>
/** Stream output instance */ /** Stream output instance */
sout_instance_t *sout_NewInstance( vlc_object_t *, const char * ); sout_stream_t *sout_NewInstance( vlc_object_t *, const char * );
#define sout_NewInstance(a,b) sout_NewInstance(VLC_OBJECT(a),b) #define sout_NewInstance(a,b) sout_NewInstance(VLC_OBJECT(a),b)
void sout_DeleteInstance( sout_instance_t * ); void sout_DeleteInstance( sout_stream_t * );
bool sout_instance_ControlsPace( sout_instance_t *sout ); bool sout_instance_ControlsPace( sout_stream_t *sout );
sout_packetizer_input_t *sout_InputNew( sout_instance_t *, const es_format_t * ); sout_packetizer_input_t *sout_InputNew( sout_stream_t *, const es_format_t * );
int sout_InputDelete( sout_instance_t *, sout_packetizer_input_t * ); int sout_InputDelete( sout_stream_t *, sout_packetizer_input_t * );
int sout_InputSendBuffer( sout_instance_t *, sout_packetizer_input_t *, int sout_InputSendBuffer( sout_stream_t *, sout_packetizer_input_t *,
block_t * ); block_t * );
enum sout_input_query_e enum sout_input_query_e
{ {
SOUT_INPUT_SET_SPU_HIGHLIGHT, /* arg1=const vlc_spu_highlight_t *, can fail */ SOUT_INPUT_SET_SPU_HIGHLIGHT, /* arg1=const vlc_spu_highlight_t *, can fail */
}; };
int sout_InputControl( sout_instance_t *, sout_packetizer_input_t *, int sout_InputControl( sout_stream_t *, sout_packetizer_input_t *,
int i_query, ... ); int i_query, ... );
void sout_InputFlush( sout_instance_t *, sout_packetizer_input_t * ); void sout_InputFlush( sout_stream_t *, sout_packetizer_input_t * );
#endif #endif