[vlc-devel] [PATCH] deinterlace: inherit the deinterlace mode from the upper objects

[Rémi Denis-Courmont]

Le 3 juillet 2017 12:10:14 GMT+03:00, Steve Lhomme <robux4 at gmail.com> a écrit :
>It seems the deinterlace can be used via sout. I don't quite
>understand how the "deinterlace-mode" ends up in the general case in
>"sout-deinterlace-mode" but it's probably not a good idea to remove
>this code.
>
>So discard this patch.
>
>On Mon, Jul 3, 2017 at 11:02 AM, Rémi Denis-Courmont <remi at remlab.net>
>wrote:
>> Le 3 juillet 2017 10:47:29 GMT+03:00, Steve Lhomme
><robux4 at videolabs.io> a
>> écrit :
>>>
>>> We don't need it locally.
>>> ---
>>>  modules/video_filter/deinterlace/deinterlace.c | 11 ++---------
>>>  modules/video_filter/deinterlace/deinterlace.h | 14 --------------
>>>  2 files changed, 2 insertions(+), 23 deletions(-)
>>>
>>> diff --git a/modules/video_filter/deinterlace/deinterlace.c
>>> b/modules/video_filter/deinterlace/deinterlace.c
>>> index d028834998..1784ed6461 100644
>>> --- a/modules/video_filter/deinterlace/deinterlace.c
>>> +++ b/modules/video_filter/deinterlace/deinterlace.c
>>> @@ -53,9 +53,6 @@
>>>
>>>  #define MODE_TEXT N_("Deinterlace mode")
>>>
>>> -#define SOUT_MODE_TEXT N_("Streaming deinterlace mode")
>>> -#define SOUT_MODE_LONGTEXT N_("Deinterlace method to use for
>streaming.")
>>> -
>>>  #define FILTER_CFG_PREFIX "sout-deinterlace-"
>>>
>>>  /* Tooltips drop linefeeds (at least in the Qt GUI);
>>> @@ -100,10 +97,6 @@ vlc_module_begin ()
>>>      set_category( CAT_VIDEO )
>>>      set_subcategory( SUBCAT_VIDEO_VFILTER )
>>>
>>> -    add_string( FILTER_CFG_PREFIX "mode", "blend", SOUT_MODE_TEXT,
>>> -                SOUT_MODE_LONGTEXT, false )
>>> -        change_string_list( mode_list, mode_list_text )
>>> -        change_safe ()
>>>      add_integer( FILTER_CFG_PREFIX "phosphor-chroma", 2,
>>> PHOSPHOR_CHROMA_TEXT,
>>>                  PHOSPHOR_CHROMA_LONGTEXT, true )
>>>          change_integer_list( phosphor_chroma_list,
>>> phosphor_chroma_list_text )
>>> @@ -127,7 +120,7 @@ vlc_module_end ()
>>>   * and reading logic for them implemented in Open().
>>>   */
>>>  static const char *const ppsz_filter_options[] = {
>>> -    "mode", "phosphor-chroma", "phosphor-dimmer",
>>> +    "phosphor-chroma", "phosphor-dimmer",
>>>      NULL
>>>  };
>>>
>>> @@ -320,7 +313,7 @@ notsupp:
>>>
>>>      config_ChainParse( p_filter, FILTER_CFG_PREFIX,
>ppsz_filter_options,
>>>                         p_filter->p_cfg );
>>> -    char *psz_mode = var_InheritString( p_filter, FILTER_CFG_PREFIX
>>> "mode" );
>>> +    char *psz_mode = var_InheritString( p_filter,
>"deinterlace-mode" );
>>>      SetFilterMethod( p_filter, psz_mode, packed );
>>>
>>>      InitDeinterlacingContext( &p_sys->context );
>>> diff --git a/modules/video_filter/deinterlace/deinterlace.h
>>> b/modules/video_filter/deinterlace/deinterlace.h
>>> index ecc26e0d60..8584a072b2 100644
>>> --- a/modules/video_filter/deinterlace/deinterlace.h
>>> +++ b/modules/video_filter/deinterlace/deinterlace.h
>>> @@ -45,20 +45,6 @@ struct vlc_object_t;
>>>  #include "common.h"
>>>
>>>
>>>
>/*****************************************************************************
>>> - * Local data
>>> -
>>>
>*****************************************************************************/
>>> -
>>> -/** Available deinterlace modes. */
>>> -static const char *const mode_list[] = {
>>> -    "discard", "blend", "mean", "bob", "linear", "x",
>>> -    "yadif", "yadif2x", "phosphor", "ivtc" };
>>> -
>>> -/** User labels for the available deinterlace modes. */
>>> -static const char *const mode_list_text[] = {
>>> -    N_("Discard"), N_("Blend"), N_("Mean"), N_("Bob"),
>N_("Linear"), "X",
>>> -    "Yadif", "Yadif (2x)", N_("Phosphor"), N_("Film NTSC (IVTC)")
>};
>>> -
>>>
>>>
>-/*****************************************************************************
>>>   * Data structures
>>>
>>>
>*****************************************************************************/
>>>
>>
>>
>> Removing the setting from prefs does not seem right.
>> --
>> Rémi Denis-Courmont
>> Typed on an inconvenient virtual keyboard
>>
>> _______________________________________________
>> 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

Some old trick in config_chainParse or such IIRC.
-- 
Rémi Denis-Courmont
Typed on an inconvenient virtual keyboard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20170703/a21bf770/attachment.html>