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

filter_chain: pass the ES category to use 

This will avoid creating ES with UNKNOWN_ES

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
This commit is contained in:
Steve Lhomme 2017-07-05 15:34:18 +02:00 committed by Jean-Baptiste Kempf
parent 9348a3e6dd
commit 0c2508b0a0
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vlc_filter.h
View File

@ -298,9 +298,9 @@ typedef struct filter_chain_t filter_chain_t;
* \param psz_capability vlc capability of filters in filter chain
* \return pointer to a filter chain
*/
filter_chain_t * filter_chain_New( vlc_object_t *, const char * )
filter_chain_t * filter_chain_New( vlc_object_t *, const char *, enum es_format_category_e )
VLC_USED;
#define filter_chain_New( a, b ) filter_chain_New( VLC_OBJECT( a ), b )
#define filter_chain_New( a, b, c ) filter_chain_New( VLC_OBJECT( a ), b, c )
/**
* Creates a new video filter chain.

13
src/misc/filter_chain.c
View File

@ -71,7 +71,7 @@ static void FilterDeletePictures( picture_t * );
static filter_chain_t *filter_chain_NewInner( const filter_owner_t *callbacks,
const char *cap, const char *conv_cap, bool fmt_out_change,
const filter_owner_t *owner )
const filter_owner_t *owner, enum es_format_category_e cat )
{
assert( callbacks != NULL && callbacks->sys != NULL );
assert( cap != NULL );
@ -85,8 +85,8 @@ static filter_chain_t *filter_chain_NewInner( const filter_owner_t *callbacks,
chain->owner = *owner;
chain->first = NULL;
chain->last = NULL;
es_format_Init( &chain->fmt_in, UNKNOWN_ES, 0 );
es_format_Init( &chain->fmt_out, UNKNOWN_ES, 0 );
es_format_Init( &chain->fmt_in, cat, 0 );
es_format_Init( &chain->fmt_out, cat, 0 );
chain->length = 0;
chain->b_allow_fmt_out_change = fmt_out_change;
chain->filter_cap = cap;
@ -98,13 +98,14 @@ static filter_chain_t *filter_chain_NewInner( const filter_owner_t *callbacks,
/**
* Filter chain initialisation
*/
filter_chain_t *filter_chain_New( vlc_object_t *obj, const char *cap )
filter_chain_t *filter_chain_New( vlc_object_t *obj, const char *cap,
enum es_format_category_e cat )
{
filter_owner_t callbacks = {
.sys = obj,
};
return filter_chain_NewInner( &callbacks, cap, NULL, false, NULL );
return filter_chain_NewInner( &callbacks, cap, NULL, false, NULL, cat );
}
/** Chained filter picture allocator function */
@ -141,7 +142,7 @@ filter_chain_t *filter_chain_NewVideo( vlc_object_t *obj, bool allow_change,
};
return filter_chain_NewInner( &callbacks, "video filter",
"video converter", allow_change, owner );
"video converter", allow_change, owner, VIDEO_ES );
}
/**

4
src/video_output/vout_subpictures.c
View File

@ -1286,8 +1286,8 @@ spu_t *spu_Create(vlc_object_t *object, vout_thread_t *vout)
sys->filter_chain_update = NULL;
vlc_mutex_init(&sys->source_chain_lock);
vlc_mutex_init(&sys->filter_chain_lock);
sys->source_chain = filter_chain_New(spu, "sub source");
sys->filter_chain = filter_chain_New(spu, "sub filter");
sys->source_chain = filter_chain_New(spu, "sub source", SPU_ES);
sys->filter_chain = filter_chain_New(spu, "sub filter", SPU_ES);
/* Load text and scale module */
sys->text = SpuRenderCreateAndLoadText(spu);