highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: configure buffersrc with csp/range

Browse Source 
Propagates input metadata to the input filter graph.
This commit is contained in:
Niklas Haas
2023-10-20 17:14:20 +02:00
parent 2d555dc82d
commit 9613ba95c1
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fftools/ffmpeg_filter.c
View File

@@ -129,6 +129,8 @@ typedef struct InputFilterPriv {
int width, height; int width, height;
AVRational sample_aspect_ratio; AVRational sample_aspect_ratio;
enum AVColorSpace color_space;
enum AVColorRange color_range;
int sample_rate; int sample_rate;
AVChannelLayout ch_layout; AVChannelLayout ch_layout;
@@ -149,6 +151,8 @@ typedef struct InputFilterPriv {
int width; int width;
int height; int height;
AVRational sample_aspect_ratio; AVRational sample_aspect_ratio;
enum AVColorSpace color_space;
enum AVColorRange color_range;
int sample_rate; int sample_rate;
AVChannelLayout ch_layout; AVChannelLayout ch_layout;
@@ -260,6 +264,8 @@ static int sub2video_get_blank_frame(InputFilterPriv *ifp)
frame->width = ifp->width; frame->width = ifp->width;
frame->height = ifp->height; frame->height = ifp->height;
frame->format = ifp->format; frame->format = ifp->format;
frame->colorspace = ifp->color_space;
frame->color_range = ifp->color_range;
ret = av_frame_get_buffer(frame, 0); ret = av_frame_get_buffer(frame, 0);
if (ret < 0) if (ret < 0)
@@ -836,6 +842,8 @@ static InputFilter *ifilter_alloc(FilterGraph *fg)
ifp->index = fg->nb_inputs - 1; ifp->index = fg->nb_inputs - 1;
ifp->format = -1; ifp->format = -1;
ifp->fallback.format = -1; ifp->fallback.format = -1;
ifp->color_space = ifp->fallback.color_space = AVCOL_SPC_UNSPECIFIED;
ifp->color_range = ifp->fallback.color_range = AVCOL_RANGE_UNSPECIFIED;
ifp->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW); ifp->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW);
if (!ifp->frame_queue) if (!ifp->frame_queue)
@@ -1489,9 +1497,11 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph,
av_bprint_init(&args, 0, AV_BPRINT_SIZE_AUTOMATIC); av_bprint_init(&args, 0, AV_BPRINT_SIZE_AUTOMATIC);
av_bprintf(&args, av_bprintf(&args,
"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:" "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:"
"pixel_aspect=%d/%d", "pixel_aspect=%d/%d:colorspace=%s:range=%s",
ifp->width, ifp->height, ifp->format, ifp->width, ifp->height, ifp->format,
ifp->time_base.num, ifp->time_base.den, sar.num, sar.den); ifp->time_base.num, ifp->time_base.den, sar.num, sar.den,
av_color_space_name(ifp->color_space),
av_color_range_name(ifp->color_range));
if (fr.num && fr.den) if (fr.num && fr.den)
av_bprintf(&args, ":frame_rate=%d/%d", fr.num, fr.den); av_bprintf(&args, ":frame_rate=%d/%d", fr.num, fr.den);
snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index, snprintf(name, sizeof(name), "graph %d input from stream %d:%d", fg->index,
@@ -1836,6 +1846,8 @@ int ifilter_parameters_from_dec(InputFilter *ifilter, const AVCodecContext *dec)
ifp->fallback.width = dec->width; ifp->fallback.width = dec->width;
ifp->fallback.height = dec->height; ifp->fallback.height = dec->height;
ifp->fallback.sample_aspect_ratio = dec->sample_aspect_ratio; ifp->fallback.sample_aspect_ratio = dec->sample_aspect_ratio;
ifp->fallback.color_space = dec->colorspace;
ifp->fallback.color_range = dec->color_range;
} else if (dec->codec_type == AVMEDIA_TYPE_AUDIO) { } else if (dec->codec_type == AVMEDIA_TYPE_AUDIO) {
int ret; int ret;
@@ -1876,6 +1888,8 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr
ifp->width = frame->width; ifp->width = frame->width;
ifp->height = frame->height; ifp->height = frame->height;
ifp->sample_aspect_ratio = frame->sample_aspect_ratio; ifp->sample_aspect_ratio = frame->sample_aspect_ratio;
ifp->color_space = frame->colorspace;
ifp->color_range = frame->color_range;
ifp->sample_rate = frame->sample_rate; ifp->sample_rate = frame->sample_rate;
ret = av_channel_layout_copy(&ifp->ch_layout, &frame->ch_layout); ret = av_channel_layout_copy(&ifp->ch_layout, &frame->ch_layout);
@@ -2556,6 +2570,8 @@ static int send_eof(FilterGraphThread *fgt, InputFilter *ifilter,
ifp->width = ifp->fallback.width; ifp->width = ifp->fallback.width;
ifp->height = ifp->fallback.height; ifp->height = ifp->fallback.height;
ifp->sample_aspect_ratio = ifp->fallback.sample_aspect_ratio; ifp->sample_aspect_ratio = ifp->fallback.sample_aspect_ratio;
ifp->color_space = ifp->fallback.color_space;
ifp->color_range = ifp->fallback.color_range;
ret = av_channel_layout_copy(&ifp->ch_layout, ret = av_channel_layout_copy(&ifp->ch_layout,
&ifp->fallback.ch_layout); &ifp->fallback.ch_layout);
@@ -2600,7 +2616,9 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt,
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
need_reinit |= ifp->width != frame->width || need_reinit |= ifp->width != frame->width ||
ifp->height != frame->height; ifp->height != frame->height ||
ifp->color_space != frame->colorspace ||
ifp->color_range != frame->color_range;
break; break;
} }