[vlc-devel] [PATCH] Backport to v2.1: kva: support ZOOM

[KO Myung-Hun]

Ping ?

KO Myung-Hun wrote:
> Backport please...
> 
> KO Myung-Hun wrote:
>>
>>
>> Rémi Denis-Courmont wrote:
>>> Le dimanche 6 avril 2014, 12:02:07 KO Myung-Hun a écrit :
>>>> ---
>>>>  modules/video_output/kva.c |    5 +++--
>>>>  1 files changed, 3 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
>>>> index 801ef7d..3bc58c6 100644
>>>> --- a/modules/video_output/kva.c
>>>> +++ b/modules/video_output/kva.c
>>>> @@ -495,9 +495,11 @@ static int Control( vout_display_t *vd, int query,
>>>> va_list args ) }
>>>>
>>>>      case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
>>>> +    case VOUT_DISPLAY_CHANGE_ZOOM:
>>>>      {
>>>>          const vout_display_cfg_t *cfg = va_arg(args, const
>>>> vout_display_cfg_t *);
>>>> -        bool  is_forced = va_arg(args, int);
>>>> +        bool  is_forced = va_arg(args, int) ||
>>>> +                          query == VOUT_DISPLAY_CHANGE_ZOOM;
>>>
>>> There is no second variable argument for this control.
>>>
>>
>> Fixed.
>>
>>
>>
>> 0001-kva-support-ZOOM.patch
>>
>>
>> From 5fe0337b08b3af7c2f086f312f06362022639757 Mon Sep 17 00:00:00 2001
>> From: KO Myung-Hun <komh at chollian.net>
>> Date: Sun, 6 Apr 2014 12:00:06 +0900
>> Subject: [PATCH] kva: support ZOOM
>>
>> ---
>>  modules/video_output/kva.c |    5 +++--
>>  1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
>> index 801ef7d..f03d020 100644
>> --- a/modules/video_output/kva.c
>> +++ b/modules/video_output/kva.c
>> @@ -495,9 +495,11 @@ static int Control( vout_display_t *vd, int query, va_list args )
>>      }
>>  
>>      case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
>> +    case VOUT_DISPLAY_CHANGE_ZOOM:
>>      {
>>          const vout_display_cfg_t *cfg = va_arg(args, const vout_display_cfg_t *);
>> -        bool  is_forced = va_arg(args, int);
>> +        bool  is_forced = query == VOUT_DISPLAY_CHANGE_ZOOM ||
>> +                          va_arg(args, int);
>>  
>>          if( is_forced )
>>          {
>> @@ -548,7 +550,6 @@ static int Control( vout_display_t *vd, int query, va_list args )
>>  
>>      case VOUT_DISPLAY_RESET_PICTURES:
>>      case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
>> -    case VOUT_DISPLAY_CHANGE_ZOOM:
>>      case VOUT_DISPLAY_GET_OPENGL:
>>          /* TODO */
>>          break;
>>
>>
>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
> 
> 
> 0001-kva-support-ZOOM.patch
> 
> 
> From 4f6e4abd366f638683d3357de0fc1a9a438b50e6 Mon Sep 17 00:00:00 2001
> From: KO Myung-Hun <komh78 at gmail.com>
> Date: Sun, 6 Apr 2014 11:53:26 +0000
> Subject: [PATCH] kva: support ZOOM
> 
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> (cherry picked from commit 2eada01e3db17b930bc27c57c4aa8987e4400a4e)
> 
> Signed-off-by: KO Myung-Hun <komh at chollian.net>
> ---
>  modules/video_output/kva.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
> index df45eca..ad1c3de 100644
> --- a/modules/video_output/kva.c
> +++ b/modules/video_output/kva.c
> @@ -495,9 +495,11 @@ static int Control( vout_display_t *vd, int query, va_list args )
>      }
>  
>      case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
> +    case VOUT_DISPLAY_CHANGE_ZOOM:
>      {
>          const vout_display_cfg_t *cfg = va_arg(args, const vout_display_cfg_t *);
> -        bool  is_forced = va_arg(args, int);
> +        bool  is_forced = query == VOUT_DISPLAY_CHANGE_ZOOM ||
> +                          va_arg(args, int);
>  
>          if( is_forced )
>          {
> @@ -543,7 +545,6 @@ static int Control( vout_display_t *vd, int query, va_list args )
>  
>      case VOUT_DISPLAY_RESET_PICTURES:
>      case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
> -    case VOUT_DISPLAY_CHANGE_ZOOM:
>      case VOUT_DISPLAY_GET_OPENGL:
>          /* TODO */
>          break;
> 
> 
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel

-- 
KO Myung-Hun

Using Mozilla SeaMonkey 2.7.2
Under OS/2 Warp 4 for Korean with FixPak #15
In VirtualBox v4.1.28 on Intel Core i7-3615QM 2.30GHz with 8GB RAM

Korean OS/2 User Community : http://www.ecomstation.co.kr