<html><head></head><body><div class="gmail_quote">Le 1 juillet 2017 18:24:48 GMT+02:00, Victorien Le Couviour--Tuffet <git@videolan.org> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">vlc | branch: master | Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet@gmail.com> | Fri Jun 23 10:24:16 2017 +0200| [40bd2515d996a4b9c47b2199fac61a9fdea310bb] | committer: Thomas Guillem<br /><br />filter_chain: uniform filter_chain_Append{Converter,Filter} return type<br /><br /><blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;"> <a href="http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40bd2515d996a4b9c47b2199fac61a9fdea310bb">http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=40bd2515d996a4b9c47b2199fac61a9fdea310bb</a><br /></blockquote>---<br /><br /> include/vlc_filter.h | 5 ++---<br /> modules/stream_out/transcode/video.c | 2 +-<br /> modules/video_chroma/chain.c | 10 +++++-----<br /> src/misc/filter_chain.c | 4 ++--<br /> src/video_output/display.c | 3 ++-<br /> src/video_output/video_output.c | 4 ++--<br /> 6 files changed, 14 insertions(+), 14 deletions(-)<br /><br />diff --git a/include/vlc_filter.h b/include/vlc_filter.h<br />index a3ecc2c1b3..3db7281671 100644<br />--- a/include/vlc_filter.h<br />+++ b/include/vlc_filter.h<br />@@ -330,10 +330,9 @@ VLC_API filter_t *filter_chain_AppendFilter(filter_chain_t *chain,<br /> * \param chain filter chain to append a filter to<br /> * \param fmt_in filter input format<br /> * \param fmt_out filter output format<br />- * \retval 0 on success<br />- * \retval -1 on failure<br />+ * \return a pointer to the filter or NULL on error<br /> */<br />-VLC_API int filter_chain_AppendConverter(filter_chain_t *chain,<br />+VLC_API filter_t *filter_chain_AppendConverter(filter_chain_t *chain,<br /> const es_format_t *fmt_in, const es_format_t *fmt_out);<br /> <br /> /**<br />diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c<br />index 50b21bc0ff..b4bc000db3 100644<br />--- a/modules/stream_out/transcode/video.c<br />+++ b/modules/stream_out/transcode/video.c<br />@@ -69,7 +69,7 @@ static int video_update_format_decoder( decoder_t *p_dec )<br /> filter_chain_Reset( test_chain, &p_dec->fmt_out, &p_dec->fmt_out );<br /> <br /> int chain_works = filter_chain_AppendConverter( test_chain, &p_dec->fmt_out,<br />- &id->p_encoder->fmt_in );<br />+ &id->p_encoder->fmt_in ) != NULL ? 0 : -1;<br /> filter_chain_Delete( test_chain );<br /> msg_Dbg( stream, "Filter chain testing done, input chroma %4.4s seems to be %s for transcode",<br /> (char *)&p_dec->fmt_<a href="http://out.video">out.video</a>.i_chroma,<br />diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c<br />index be4c26e611..eb20daa817 100644<br />--- a/modules/video_chroma/chain.c<br />+++ b/modules/video_chroma/chain.c<br />@@ -310,7 +310,7 @@ static int BuildFilterChain( filter_t *p_filter )<br /> video_format_FixRgb(&fmt_<a href="http://mid.video">mid.video</a>);<br /> <br /> if( filter_chain_AppendConverter( p_filter->p_sys->p_chain,<br />- NULL, &fmt_mid ) == VLC_SUCCESS )<br />+ NULL, &fmt_mid ) )<br /> {<br /> if( filter_chain_AppendFilter( p_filter->p_sys->p_chain,<br /> p_filter->psz_name, p_filter->p_cfg,<br />@@ -355,8 +355,8 @@ static int CreateChain( filter_t *p_parent, es_format_t *p_fmt_mid )<br /> }<br /> else<br /> {<br />- if( filter_chain_AppendConverter( p_parent->p_sys->p_chain,<br />- NULL, p_fmt_mid ) )<br />+ if( !filter_chain_AppendConverter( p_parent->p_sys->p_chain,<br />+ NULL, p_fmt_mid ) )<br /> return VLC_EGENERIC;<br /> }<br /> <br />@@ -368,8 +368,8 @@ static int CreateChain( filter_t *p_parent, es_format_t *p_fmt_mid )<br /> }<br /> else<br /> {<br />- if( filter_chain_AppendConverter( p_parent->p_sys->p_chain,<br />- p_fmt_mid, NULL ) )<br />+ if( !filter_chain_AppendConverter( p_parent->p_sys->p_chain,<br />+ p_fmt_mid, NULL ) )<br /> goto error;<br /> }<br /> return VLC_SUCCESS;<br />diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c<br />index 741a63c9ad..7e038dbbb8 100644<br />--- a/src/misc/filter_chain.c<br />+++ b/src/misc/filter_chain.c<br />@@ -274,11 +274,11 @@ filter_t *filter_chain_AppendFilter( filter_chain_t *chain,<br /> fmt_in, fmt_out );<br /> }<br /> <br />-int filter_chain_AppendConverter( filter_chain_t *chain,<br />+filter_t *filter_chain_AppendConverter( filter_chain_t *chain,<br /> const es_format_t *fmt_in, const es_format_t *fmt_out )<br /> {<br /> return filter_chain_AppendInner( chain, NULL, chain->conv_cap, NULL,<br />- fmt_in, fmt_out ) != NULL ? 0 : -1;<br />+ fmt_in, fmt_out );<br /> }<br /> <br /> void filter_chain_DeleteFilter( filter_chain_t *chain, filter_t *filter )<br />diff --git a/src/video_output/display.c b/src/video_output/display.c<br />index aaa24b053d..57210df5fd 100644<br />--- a/src/video_output/display.c<br />+++ b/src/video_output/display.c<br />@@ -462,7 +462,8 @@ static int VoutDisplayCreateRender(vout_display_t *vd)<br /> es_format_InitFromVideo(&dst, i == 0 ? &v_dst : &v_dst_cmp);<br /> <br /> filter_chain_Reset(osys->filters, &src, &dst);<br />- ret = filter_chain_AppendConverter(osys->filters, &src, &dst);<br />+ ret = filter_chain_AppendConverter(osys->filters, &src, &dst)<br />+ != NULL ? 0 : -1;<br /> es_format_Clean(&dst);<br /> if (ret == 0)<br /> break;<br />diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c<br />index c1ddc6a4d5..e46859ddd1 100644<br />--- a/src/video_output/video_output.c<br />+++ b/src/video_output/video_output.c<br />@@ -854,8 +854,8 @@ static void ThreadChangeFilters(vout_thread_t *vout,<br /> <br /> if (!es_format_IsSimilar(&fmt_current, &fmt_target)) {<br /> msg_Dbg(vout, "Adding a filter to compensate for format changes");<br />- if (filter_chain_AppendConverter(vout->p->filter.chain_interactive,<br />- &fmt_current, &fmt_target) != 0) {<br />+ if (!filter_chain_AppendConverter(vout->p->filter.chain_interactive,<br />+ &fmt_current, &fmt_target)) {<br /> msg_Err(vout, "Failed to compensate for the format changes, removing all filters");<br /> ThreadDelAllFilterCallbacks(vout);<br /> filter_chain_Reset(vout->p->filter.chain_static, &fmt_target, &fmt_target);<br /><br /><hr /><br />vlc-commits mailing list<br />vlc-commits@videolan.org<br /><a href="https://mailman.videolan.org/listinfo/vlc-commits">https://mailman.videolan.org/listinfo/vlc-commits</a><br /></pre></blockquote></div><br clear="all">Repeating myself but WTF? This is counter-sensical.WTFF will you do with the conversion filter pointer, which can't have variables, and how the heck is this going to work with when the conversion chaining is fixed (like audio already was)?!<br>
-- <br>
Rémi Denis-Courmont<br>
Typed on an inconvenient virtual keyboard</body></html>