mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-22 09:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

avfilter/formats: add support for special mergers

Browse Source
This commit is contained in:
Paul B Mahol 2024-10-04 16:54:53 +02:00
parent 5c212cffd8
commit f8e2cb96dd
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavfilter/avfiltergraph.c
View File

@ -473,8 +473,7 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx)
for (j = 0; j < filter->nb_inputs; j++) {
AVFilterLink *link = filter->inputs[j];
const AVFilterNegotiation *neg;
unsigned neg_step;
int convert_needed = 0;
unsigned neg_step, convert_needed = 0;
if (!link)
continue;
@ -486,7 +485,7 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx)
void *a = FF_FIELD_AT(void *, m->offset, link->incfg);
void *b = FF_FIELD_AT(void *, m->offset, link->outcfg);
if (a && b && a != b && !m->can_merge(a, b)) {
convert_needed = 1;
convert_needed |= 1U << neg_step;
break;
}
}
@ -504,11 +503,11 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx)
if (ret < 0)
return ret;
if (!ret)
convert_needed = 1;
convert_needed |= 1U << neg_step;
}
}
if (convert_needed) {
if (av_popcount(convert_needed) > 0) {
AVFilterContext *convert;
const AVFilter *filter;
AVFilterLink *inlink, *outlink;
@ -524,7 +523,14 @@ static int query_formats(AVFilterGraph *graph, void *log_ctx)
}
/* couldn't merge format lists. auto-insert conversion filter */
if (!(filter = avfilter_get_by_name(neg->conversion_filter))) {
if (av_popcount(convert_needed) == 1) {
const AVFilterFormatsMerger *m = &neg->mergers[av_log2(convert_needed)];
filter = avfilter_get_by_name(m->conversion_filter);
} else {
filter = avfilter_get_by_name(neg->conversion_filter);
}
if (!filter) {
av_log(log_ctx, AV_LOG_ERROR,
"'%s' filter not present, cannot convert formats.\n",
neg->conversion_filter);

6
libavfilter/formats.c
View File

@ -376,16 +376,19 @@ static const AVFilterFormatsMerger mergers_video[] = {
.offset = offsetof(AVFilterFormatsConfig, formats),
.merge = merge_pix_fmts,
.can_merge = can_merge_pix_fmts,
.conversion_filter = "scale",
},
{
.offset = offsetof(AVFilterFormatsConfig, color_spaces),
.merge = merge_generic,
.can_merge = can_merge_generic,
.conversion_filter = "scale",
},
{
.offset = offsetof(AVFilterFormatsConfig, color_ranges),
.merge = merge_generic,
.can_merge = can_merge_generic,
.conversion_filter = "scale",
},
};
@ -394,16 +397,19 @@ static const AVFilterFormatsMerger mergers_audio[] = {
.offset = offsetof(AVFilterFormatsConfig, channel_layouts),
.merge = merge_channel_layouts,
.can_merge = can_merge_channel_layouts,
.conversion_filter = "aresample",
},
{
.offset = offsetof(AVFilterFormatsConfig, samplerates),
.merge = merge_samplerates,
.can_merge = can_merge_samplerates,
.conversion_filter = "aresample",
},
{
.offset = offsetof(AVFilterFormatsConfig, formats),
.merge = merge_sample_fmts,
.can_merge = can_merge_sample_fmts,
.conversion_filter = "asf2sf",
},
};

1
libavfilter/formats.h
View File

@ -479,6 +479,7 @@ typedef struct AVFilterFormatMerger {
unsigned offset;
int (*merge)(void *a, void *b);
int (*can_merge)(const void *a, const void *b);
const char *conversion_filter;
} AVFilterFormatsMerger;
/**