diff options
| author | Anton Khirnov <anton@khirnov.net> | 2023-04-30 12:26:51 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2023-05-08 10:38:59 +0200 |
| commit | 71d7e9bbeca9574f29b63f3d1ab6b7ad450a8e67 (patch) | |
| tree | b5ec42994155dc462dd12d7a5c55862ac8923c48 /fftools | |
| parent | e8df737cb2305efb137e655e7f6dfd5e4c80bc5c (diff) | |
| download | ffmpeg-71d7e9bbeca9574f29b63f3d1ab6b7ad450a8e67.tar.gz | |
fftools/ffmpeg_filter: move InputFilter.displaymatrix to private data
It is not used outside of ffmpeg_filter.
Diffstat (limited to 'fftools')
| -rw-r--r-- | fftools/ffmpeg.h | 1 | ||||
| -rw-r--r-- | fftools/ffmpeg_filter.c | 15 |
2 files changed, 9 insertions, 7 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index aa7778a58f..af1ba49771 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -288,7 +288,6 @@ typedef struct InputFilter { AVChannelLayout ch_layout; AVBufferRef *hw_frames_ctx; - int32_t *displaymatrix; } InputFilter; typedef struct OutputFilter { diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 5d9242f476..087ef8b894 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -61,6 +61,8 @@ typedef struct InputFilterPriv { AVFifo *frame_queue; + int32_t *displaymatrix; + // fallback parameters to use when no input is ever sent struct { int format; @@ -270,7 +272,7 @@ void fg_free(FilterGraph **pfg) av_frame_free(&frame); av_fifo_freep2(&ifp->frame_queue); } - av_freep(&ifilter->displaymatrix); + av_freep(&ifp->displaymatrix); if (ist->sub2video.sub_queue) { AVSubtitle sub; while (av_fifo_read(ist->sub2video.sub_queue, &sub, 1) >= 0) @@ -1061,7 +1063,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter, // TODO: insert hwaccel enabled filters like transpose_vaapi into the graph if (ist->autorotate && !(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) { - int32_t *displaymatrix = ifilter->displaymatrix; + int32_t *displaymatrix = ifp->displaymatrix; double theta; if (!displaymatrix) @@ -1407,6 +1409,7 @@ int ifilter_parameters_from_dec(InputFilter *ifilter, const AVCodecContext *dec) static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *frame) { + InputFilterPriv *ifp = ifp_from_ifilter(ifilter); AVFrameSideData *sd; int ret; @@ -1423,10 +1426,10 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr if (ret < 0) return ret; - av_freep(&ifilter->displaymatrix); + av_freep(&ifp->displaymatrix); sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX); if (sd) - ifilter->displaymatrix = av_memdup(sd->data, sizeof(int32_t) * 9); + ifp->displaymatrix = av_memdup(sd->data, sizeof(int32_t) * 9); if (frame->hw_frames_ctx) { ifilter->hw_frames_ctx = av_buffer_ref(frame->hw_frames_ctx); @@ -1567,9 +1570,9 @@ int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference) need_reinit = 1; if (sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX)) { - if (!ifilter->displaymatrix || memcmp(sd->data, ifilter->displaymatrix, sizeof(int32_t) * 9)) + if (!ifp->displaymatrix || memcmp(sd->data, ifp->displaymatrix, sizeof(int32_t) * 9)) need_reinit = 1; - } else if (ifilter->displaymatrix) + } else if (ifp->displaymatrix) need_reinit = 1; if (need_reinit) { |