[FFmpeg-devel] [PATCH 08/10] lavfi: move AVFilterLink.{frame, sample}_count_{in, out} to FilterLink

[Michael Niedermayer]

On Sun, Aug 11, 2024 at 04:42:09PM +0200, Anton Khirnov wrote:
> ---
>  libavfilter/af_adrc.c         |  3 ++-
>  libavfilter/af_afftdn.c       |  3 ++-
>  libavfilter/af_ashowinfo.c    |  4 +++-
>  libavfilter/af_dynaudnorm.c   |  3 ++-
>  libavfilter/af_volume.c       |  4 +++-
>  libavfilter/asrc_sine.c       |  3 ++-
>  libavfilter/avf_showfreqs.c   |  5 +++--
>  libavfilter/avfilter.c        | 16 +++++++++-------
>  libavfilter/avfilter.h        | 10 ----------
>  libavfilter/avfiltergraph.c   |  4 ++--
>  libavfilter/f_graphmonitor.c  | 24 ++++++++++++------------
>  libavfilter/f_latency.c       |  6 ++++--
>  libavfilter/f_loop.c          |  6 ++++--
>  libavfilter/f_metadata.c      |  6 ++++--
>  libavfilter/f_segment.c       | 10 ++++++----
>  libavfilter/f_select.c        |  4 +++-
>  libavfilter/f_sendcmd.c       |  4 +++-
>  libavfilter/f_streamselect.c  |  3 ++-
>  libavfilter/filters.h         | 10 ++++++++++
>  libavfilter/qrencode.c        |  3 ++-
>  libavfilter/vf_bbox.c         |  4 +++-
>  libavfilter/vf_blackdetect.c  |  4 +++-
>  libavfilter/vf_blend.c        |  3 ++-
>  libavfilter/vf_blockdetect.c  |  5 ++++-
>  libavfilter/vf_blurdetect.c   |  5 ++++-
>  libavfilter/vf_crop.c         |  4 +++-
>  libavfilter/vf_datascope.c    |  4 +++-
>  libavfilter/vf_delogo.c       |  4 +++-
>  libavfilter/vf_detelecine.c   |  3 ++-
>  libavfilter/vf_drawtext.c     |  8 +++++---
>  libavfilter/vf_eq.c           |  3 ++-
>  libavfilter/vf_fade.c         | 10 ++++++----
>  libavfilter/vf_fftfilt.c      |  4 +++-
>  libavfilter/vf_fieldhint.c    | 17 ++++++++++-------
>  libavfilter/vf_fieldmatch.c   |  7 ++++---
>  libavfilter/vf_find_rect.c    |  5 ++++-
>  libavfilter/vf_framestep.c    |  3 ++-
>  libavfilter/vf_freezeframes.c |  8 +++++---
>  libavfilter/vf_geq.c          |  5 ++++-
>  libavfilter/vf_hue.c          |  3 ++-
>  libavfilter/vf_libplacebo.c   |  6 ++++--
>  libavfilter/vf_overlay.c      |  4 +++-
>  libavfilter/vf_overlay_cuda.c |  3 ++-
>  libavfilter/vf_perspective.c  |  7 +++++--
>  libavfilter/vf_quirc.c        |  3 ++-
>  libavfilter/vf_rotate.c       |  4 +++-
>  libavfilter/vf_scale.c        | 12 ++++++++----
>  libavfilter/vf_scale_npp.c    |  8 +++++---
>  libavfilter/vf_showinfo.c     |  3 ++-
>  libavfilter/vf_swaprect.c     |  4 +++-
>  libavfilter/vf_telecine.c     |  3 ++-
>  libavfilter/vf_tinterlace.c   |  7 ++++---
>  libavfilter/vf_vignette.c     |  3 ++-
>  libavfilter/vf_weave.c        |  3 ++-
>  libavfilter/vf_zoompan.c      |  9 ++++++---
>  libavfilter/vsrc_mptestsrc.c  |  5 +++--
>  56 files changed, 208 insertions(+), 116 deletions(-)

this seems to break build here:

libavfilter/vf_drawtext.c: In function ‘draw_text’:
libavfilter/vf_drawtext.c:1556:5: error: unknown type name ‘FilterLink’; did you mean ‘AVFilterLink’?
 1556 |     FilterLink *inl = ff_filter_link(inlink);
      |     ^~~~~~~~~~
      |     AVFilterLink
libavfilter/vf_drawtext.c:1556:23: error: implicit declaration of function ‘ff_filter_link’; did you mean ‘avfilter_link’? [-Werror=implicit-function-declaration]
 1556 |     FilterLink *inl = ff_filter_link(inlink);
      |                       ^~~~~~~~~~~~~~
      |                       avfilter_link
libavfilter/vf_drawtext.c:1556:23: warning: initialization of ‘int *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
libavfilter/vf_drawtext.c:1600:51: error: request for member ‘frame_count_out’ in something not a structure or union
 1600 |         av_timecode_make_string(&s->tc, tcbuf, inl->frame_count_out);
      |                                                   ^~
libavfilter/vf_drawtext.c: In function ‘filter_frame’:
libavfilter/vf_drawtext.c:1832:5: error: unknown type name ‘FilterLink’; did you mean ‘AVFilterLink’?
 1832 |     FilterLink *inl = ff_filter_link(inlink);
      |     ^~~~~~~~~~
      |     AVFilterLink
libavfilter/vf_drawtext.c:1832:23: warning: initialization of ‘int *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
 1832 |     FilterLink *inl = ff_filter_link(inlink);
      |                       ^~~~~~~~~~~~~~
libavfilter/vf_drawtext.c:1853:27: error: request for member ‘frame_count_out’ in something not a structure or union
 1853 |     if (s->reload && !(inl->frame_count_out % s->reload)) {
      |                           ^~
libavfilter/vf_drawtext.c:1867:31: error: request for member ‘frame_count_out’ in something not a structure or union
 1867 |     s->var_values[VAR_N] = inl->frame_count_out + s->start_number;
      |                               ^~
cc1: some warnings being treated as errors
make: *** [ffbuild/common.mak:81: libavfilter/vf_drawtext.o] Error 1
make: *** Waiting for unfinished jobs....

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Never trust a computer, one day, it may think you are the virus. -- Compn
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20240812/b98e6ae0/attachment.sig>