eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-11 17:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: embed displaymatrix into private context

Browse Source 
It has a small fixed size, so it is better to embed it rather than deal
with dynamic allocation.
This commit is contained in:
Anton Khirnov
2023-05-13 13:36:40 +02:00
parent dcfbfb417c
commit 9effea016c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fftools/ffmpeg_filter.c
View File

@@ -83,7 +83,8 @@ typedef struct InputFilterPriv {
AVBufferRef *hw_frames_ctx; AVBufferRef *hw_frames_ctx;
int32_t *displaymatrix; int displaymatrix_present;
int32_t displaymatrix[9];
// fallback parameters to use when no input is ever sent // fallback parameters to use when no input is ever sent
struct { struct {
@@ -302,7 +303,6 @@ void fg_free(FilterGraph **pfg)
av_frame_free(&frame); av_frame_free(&frame);
av_fifo_freep2(&ifp->frame_queue); av_fifo_freep2(&ifp->frame_queue);
} }
av_freep(&ifp->displaymatrix);
if (ist->sub2video.sub_queue) { if (ist->sub2video.sub_queue) {
AVSubtitle sub; AVSubtitle sub;
while (av_fifo_read(ist->sub2video.sub_queue, &sub, 1) >= 0) while (av_fifo_read(ist->sub2video.sub_queue, &sub, 1) >= 0)
@@ -1094,7 +1094,7 @@ static int configure_input_video_filter(FilterGraph *fg, InputFilter *ifilter,
int32_t *displaymatrix = ifp->displaymatrix; int32_t *displaymatrix = ifp->displaymatrix;
double theta; double theta;
if (!displaymatrix) if (!ifp->displaymatrix_present)
displaymatrix = (int32_t *)av_stream_get_side_data(ist->st, AV_PKT_DATA_DISPLAYMATRIX, NULL); displaymatrix = (int32_t *)av_stream_get_side_data(ist->st, AV_PKT_DATA_DISPLAYMATRIX, NULL);
theta = get_rotation(displaymatrix); theta = get_rotation(displaymatrix);
@@ -1450,10 +1450,10 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr
if (ret < 0) if (ret < 0)
return ret; return ret;
av_freep(&ifp->displaymatrix);
sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX); sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX);
if (sd) if (sd)
ifp->displaymatrix = av_memdup(sd->data, sizeof(int32_t) * 9); memcpy(ifp->displaymatrix, sd->data, sizeof(ifp->displaymatrix));
ifp->displaymatrix_present = !!sd;
return 0; return 0;
} }
@@ -1611,9 +1611,10 @@ int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference)
need_reinit = 1; need_reinit = 1;
if (sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX)) { if (sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DISPLAYMATRIX)) {
if (!ifp->displaymatrix || memcmp(sd->data, ifp->displaymatrix, sizeof(int32_t) * 9)) if (!ifp->displaymatrix_present ||
memcmp(sd->data, ifp->displaymatrix, sizeof(ifp->displaymatrix)))
need_reinit = 1; need_reinit = 1;
} else if (ifp->displaymatrix) } else if (ifp->displaymatrix_present)
need_reinit = 1; need_reinit = 1;
if (need_reinit) { if (need_reinit) {