[vlc-devel] [PATCH 1/2] Revert "video output: remove unused vout_IsDisplayFiltered"

Steve Lhomme robux4 at ycbcr.xyz
Mon Oct 28 15:16:16 CET 2019


On 2019-10-28 15:10, Thomas Guillem wrote:
> LGTM for the set,
> 
> Could you mention that it fixes one (or more) issues from #23031 ?

It likely fixes the first one, no idea about the second or third.

> On Mon, Oct 28, 2019, at 15:00, Steve Lhomme wrote:
>> This reverts commit f7f39fcce6a10b06687516dd3433121dffb00185.
>> ---
>>   src/video_output/display.c      | 7 +++++++
>>   src/video_output/vout_wrapper.h | 4 ++++
>>   2 files changed, 11 insertions(+)
>>
>> diff --git a/src/video_output/display.c b/src/video_output/display.c
>> index 2b856ffd378..99843fb2bfe 100644
>> --- a/src/video_output/display.c
>> +++ b/src/video_output/display.c
>> @@ -402,6 +402,13 @@ picture_pool_t *vout_GetPool(vout_display_t *vd,
>> unsigned count)
>>       return osys->pool;
>>   }
>>   
>> +bool vout_IsDisplayFiltered(vout_display_t *vd)
>> +{
>> +    vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
>> +
>> +    return osys->converters == NULL || !filter_chain_IsEmpty(osys->converters);
>> +}
>> +
>>   picture_t *vout_ConvertForDisplay(vout_display_t *vd, picture_t *picture)
>>   {
>>       vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
>> diff --git a/src/video_output/vout_wrapper.h b/src/video_output/vout_wrapper.h
>> index b65f2bdcb56..d95a34359d0 100644
>> --- a/src/video_output/vout_wrapper.h
>> +++ b/src/video_output/vout_wrapper.h
>> @@ -29,6 +29,10 @@
>>   
>>   picture_pool_t *vout_GetPool(vout_display_t *vd, unsigned count);
>>   
>> +/**
>> + * It destroy a vout managed display.
>> + */
>> +bool vout_IsDisplayFiltered(vout_display_t *);
>>   picture_t * vout_ConvertForDisplay(vout_display_t *, picture_t *);
>>   void vout_FilterFlush(vout_display_t *);
>>   
>> -- 
>> 2.17.1
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
> 


More information about the vlc-devel mailing list