LAV
/
FFmpeg
1
0
Fork 0
Code

all: use av_channel_layout_describe_bprint instead of av_channel_layout_describe in a few places 

Where an AVBPrint buffer is used later anyway.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2023-12-29 13:41:42 +01:00
parent e4c96dc96c
commit 363b3ec98a
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/avcodec.c
View File

@ -656,12 +656,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
if (enc->sample_rate) {
av_bprintf(&bprint, "%d Hz, ", enc->sample_rate);
}
{
char buf[512];
int ret = av_channel_layout_describe(&enc->ch_layout, buf, sizeof(buf));
if (ret >= 0)
av_bprintf(&bprint, "%s", buf);
}
av_channel_layout_describe_bprint(&enc->ch_layout, &bprint);
if (enc->sample_fmt != AV_SAMPLE_FMT_NONE &&
(str = av_get_sample_fmt_name(enc->sample_fmt))) {
av_bprintf(&bprint, ", %s", str);

7
libavfilter/af_amerge.c
View File

@ -153,7 +153,6 @@ static int config_output(AVFilterLink *outlink)
AVFilterContext *ctx = outlink->src;
AMergeContext *s = ctx->priv;
AVBPrint bp;
char buf[128];
int i;
s->bps = av_get_bytes_per_sample(outlink->format);
@ -162,12 +161,10 @@ static int config_output(AVFilterLink *outlink)
av_bprint_init(&bp, 0, AV_BPRINT_SIZE_AUTOMATIC);
for (i = 0; i < s->nb_inputs; i++) {
av_bprintf(&bp, "%sin%d:", i ? " + " : "", i);
av_channel_layout_describe(&ctx->inputs[i]->ch_layout, buf, sizeof(buf));
av_bprintf(&bp, "%s", buf);
av_channel_layout_describe_bprint(&ctx->inputs[i]->ch_layout, &bp);
}
av_bprintf(&bp, " -> out:");
av_channel_layout_describe(&outlink->ch_layout, buf, sizeof(buf));
av_bprintf(&bp, "%s", buf);
av_channel_layout_describe_bprint(&outlink->ch_layout, &bp);
av_log(ctx, AV_LOG_VERBOSE, "%s\n", bp.str);
return 0;

4
libavfilter/graphdump.c
View File

@ -30,7 +30,6 @@
static int print_link_prop(AVBPrint *buf, AVFilterLink *link)
{
const char *format;
char layout[128];
AVBPrint dummy_buffer;
if (!buf) {
@ -50,8 +49,7 @@ static int print_link_prop(AVBPrint *buf, AVFilterLink *link)
format = av_x_if_null(av_get_sample_fmt_name(link->format), "?");
av_bprintf(buf, "[%dHz %s:",
(int)link->sample_rate, format);
av_channel_layout_describe(&link->ch_layout, layout, sizeof(layout));
av_bprintf(buf, "%s", layout);
av_channel_layout_describe_bprint(&link->ch_layout, buf);
av_bprint_chars(buf, ']', 1);
break;