virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

fftools/ffmpeg_filter: reinitialize the filterchain if downmix metadata changed between frames

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2024-12-27 12:03:41 -03:00
parent 6a282cdf7e
commit 4f9afbb1b2
1 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
fftools/ffmpeg_filter.c
View File

@@ -30,6 +30,7 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/bprint.h" #include "libavutil/bprint.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/downmix_info.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
@@ -150,6 +151,9 @@ typedef struct InputFilterPriv {
int displaymatrix_applied; int displaymatrix_applied;
int32_t displaymatrix[9]; int32_t displaymatrix[9];
int downmixinfo_present;
AVDownmixInfo downmixinfo;
struct { struct {
AVFrame *frame; AVFrame *frame;
@@ -2119,6 +2123,19 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr
memcpy(ifp->displaymatrix, sd->data, sizeof(ifp->displaymatrix)); memcpy(ifp->displaymatrix, sd->data, sizeof(ifp->displaymatrix));
ifp->displaymatrix_present = !!sd; ifp->displaymatrix_present = !!sd;
/* Copy downmix related side data to InputFilterPriv so it may be propagated
* to the filter chain even though it's not "global", as filters like aresample
* require this information during init and not when remixing a frame */
sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DOWNMIX_INFO);
if (sd) {
ret = av_frame_side_data_clone(&ifp->side_data,
&ifp->nb_side_data, sd, 0);
if (ret < 0)
return ret;
memcpy(&ifp->downmixinfo, sd->data, sizeof(ifp->downmixinfo));
}
ifp->downmixinfo_present = !!sd;
return 0; return 0;
} }
@@ -2832,7 +2849,8 @@ enum ReinitReason {
VIDEO_CHANGED = (1 << 0), VIDEO_CHANGED = (1 << 0),
AUDIO_CHANGED = (1 << 1), AUDIO_CHANGED = (1 << 1),
MATRIX_CHANGED = (1 << 2), MATRIX_CHANGED = (1 << 2),
HWACCEL_CHANGED = (1 << 3) DOWNMIX_CHANGED = (1 << 3),
HWACCEL_CHANGED = (1 << 4)
}; };
static const char *unknown_if_null(const char *str) static const char *unknown_if_null(const char *str)
@@ -2873,6 +2891,13 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt,
} else if (ifp->displaymatrix_present) } else if (ifp->displaymatrix_present)
need_reinit |= MATRIX_CHANGED; need_reinit |= MATRIX_CHANGED;
if (sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DOWNMIX_INFO)) {
if (!ifp->downmixinfo_present ||
memcmp(sd->data, &ifp->downmixinfo, sizeof(ifp->downmixinfo)))
need_reinit |= DOWNMIX_CHANGED;
} else if (ifp->downmixinfo_present)
need_reinit |= DOWNMIX_CHANGED;
if (!(ifp->opts.flags & IFILTER_FLAG_REINIT) && fgt->graph) if (!(ifp->opts.flags & IFILTER_FLAG_REINIT) && fgt->graph)
need_reinit = 0; need_reinit = 0;
@@ -2927,6 +2952,8 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt,
} }
if (need_reinit & MATRIX_CHANGED) if (need_reinit & MATRIX_CHANGED)
av_bprintf(&reason, "display matrix changed, "); av_bprintf(&reason, "display matrix changed, ");
if (need_reinit & DOWNMIX_CHANGED)
av_bprintf(&reason, "downmix medatata changed, ");
if (need_reinit & HWACCEL_CHANGED) if (need_reinit & HWACCEL_CHANGED)
av_bprintf(&reason, "hwaccel changed, "); av_bprintf(&reason, "hwaccel changed, ");
if (reason.len > 1) if (reason.len > 1)