[vlc-devel] [PATCH 04/14] videotoolbox: rename pf_get_extradata callback

[Thomas Guillem]

Maybe, merge it with 03/14 ?

On Fri, Jul 3, 2020, at 04:27, Marvin Scholz wrote:
> To be consistent with the now changed function names, rename the
> callback name as well.
> ---
>  modules/codec/videotoolbox.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/modules/codec/videotoolbox.c b/modules/codec/videotoolbox.c
> index eda831cd6c..75229ad722 100644
> --- a/modules/codec/videotoolbox.c
> +++ b/modules/codec/videotoolbox.c
> @@ -140,7 +140,7 @@ typedef struct decoder_sys_t
>      bool                        (*pf_need_restart)(decoder_t *,
>                                                     
> VTDecompressionSessionRef);
>      bool                        (*pf_configure_vout)(decoder_t *);
> -    CFDictionaryRef             (*pf_get_extradata)(decoder_t *);
> +    CFDictionaryRef             (*pf_copy_extradata)(decoder_t *);
>      bool                        (*pf_fill_reorder_info)(decoder_t *, 
> const block_t *,
>                                                          frame_info_t 
> *);
>      /* !Codec specific callbacks */
> @@ -1071,8 +1071,8 @@ static CFMutableDictionaryRef 
> CreateSessionDescriptionFormat(decoder_t *p_dec,
>      if (decoderConfiguration == NULL)
>          return NULL;
>  
> -    CFDictionaryRef extradata = p_sys->pf_get_extradata
> -                                ? p_sys->pf_get_extradata(p_dec) : NULL;
> +    CFDictionaryRef extradata = p_sys->pf_copy_extradata
> +                                ? p_sys->pf_copy_extradata(p_dec) : NULL;
>      if(extradata)
>      {
>          /* then decoder will also fail if required, no need to handle it */
> @@ -1430,7 +1430,7 @@ static int OpenDecoder(vlc_object_t *p_this)
>              p_sys->pf_process_block = ProcessBlockH264;
>              p_sys->pf_need_restart = VideoToolboxNeedsToRestartH264;
>              p_sys->pf_configure_vout = ConfigureVoutH264;
> -            p_sys->pf_get_extradata = CopyDecoderExtradataH264;
> +            p_sys->pf_copy_extradata = CopyDecoderExtradataH264;
>              p_sys->pf_fill_reorder_info = FillReorderInfoH264;
>              p_sys->b_poc_based_reorder = true;
>              p_sys->b_vt_need_keyframe = true;
> @@ -1444,18 +1444,18 @@ static int OpenDecoder(vlc_object_t *p_this)
>              p_sys->pf_process_block = ProcessBlockHEVC;
>              p_sys->pf_need_restart = VideoToolboxNeedsToRestartHEVC;
>              p_sys->pf_configure_vout = ConfigureVoutHEVC;
> -            p_sys->pf_get_extradata = CopyDecoderExtradataHEVC;
> +            p_sys->pf_copy_extradata = CopyDecoderExtradataHEVC;
>              p_sys->pf_fill_reorder_info = FillReorderInfoHEVC;
>              p_sys->b_poc_based_reorder = true;
>              p_sys->b_vt_need_keyframe = true;
>              break;
>  
>          case kCMVideoCodecType_MPEG4Video:
> -            p_sys->pf_get_extradata = CopyDecoderExtradataMPEG4;
> +            p_sys->pf_copy_extradata = CopyDecoderExtradataMPEG4;
>              break;
>  
>          default:
> -            p_sys->pf_get_extradata = CopyDecoderExtradataDefault;
> +            p_sys->pf_copy_extradata = CopyDecoderExtradataDefault;
>              break;
>      }
>  
> -- 
> 2.24.3 (Apple Git-128)
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel