[vlc-devel] [PATCH] caopengllayer: do not return an error when crop/zoom/aspect/etc fail

[Steve Lhomme]

On 2019-10-24 11:14, Marvin Scholz wrote:
> 
> 
> On 24 Oct 2019, at 11:10, Steve Lhomme wrote:
> 
>> Otherwise the core will call VOUT_DISPLAY_RESET_PICTURES which we 
>> don't support.
>>
>> This is what is done in macosx.m when vlc_gl_MakeCurrent() fails.
>> ---
>>  modules/video_output/caopengllayer.m | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/modules/video_output/caopengllayer.m 
>> b/modules/video_output/caopengllayer.m
>> index 3b542d1e637..249f7b96d5d 100644
>> --- a/modules/video_output/caopengllayer.m
>> +++ b/modules/video_output/caopengllayer.m
>> @@ -343,8 +343,8 @@ static int Control (vout_display_t *vd, int query, 
>> va_list ap)
>>
>>              vout_display_place_t place;
>>              vout_display_PlacePicture(&place, &vd->source, &cfg_tmp);
>> -            if (OpenglLock(sys->gl))
>> -                return VLC_EGENERIC;
>> +            if (unlikely(OpenglLock(sys->gl)))
>> +                return VLC_SUCCESS;
> 
> Can you add a comment here explaining that? Else the code looks quite
> confusing here without context.

Yes. Pretty much all the display module return VLC_SUCCESS if there's an 
error or if they don't even handle the message. Only the 3 or 4 ones 
that handle VOUT_DISPLAY_RESET_PICTURES actually return some errors.

>>
>>              vout_display_opengl_SetWindowAspectRatio(sys->vgl, 
>> (float)place.width / place.height);
>>              OpenglUnlock(sys->gl);
>> -- 
>> 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