virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

avcodec/encode: switch to avcodec_get_supported_config()

Browse Source
This commit is contained in:
Niklas Haas 2024-04-05 18:48:03 +02:00
parent 3305767560
commit 13cec7bb5f
1 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
libavcodec/encode.c
View File

@ -563,7 +563,8 @@ static int encode_preinit_video(AVCodecContext *avctx)
{ {
const AVCodec *c = avctx->codec; const AVCodec *c = avctx->codec;
const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->pix_fmt); const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->pix_fmt);
int i; const enum AVPixelFormat *pix_fmts;
int ret, i, num_pix_fmts;
if (!av_get_pix_fmt_name(avctx->pix_fmt)) { if (!av_get_pix_fmt_name(avctx->pix_fmt)) {
av_log(avctx, AV_LOG_ERROR, "Invalid video pixel format: %d\n", av_log(avctx, AV_LOG_ERROR, "Invalid video pixel format: %d\n",
@ -571,28 +572,33 @@ static int encode_preinit_video(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (c->pix_fmts) { ret = avcodec_get_supported_config(avctx, NULL, AV_CODEC_CONFIG_PIX_FORMAT,
for (i = 0; c->pix_fmts[i] != AV_PIX_FMT_NONE; i++) 0, (const void **) &pix_fmts, &num_pix_fmts);
if (avctx->pix_fmt == c->pix_fmts[i]) if (ret < 0)
return ret;
if (pix_fmts) {
for (i = 0; i < num_pix_fmts; i++)
if (avctx->pix_fmt == pix_fmts[i])
break; break;
if (c->pix_fmts[i] == AV_PIX_FMT_NONE) { if (i == num_pix_fmts) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Specified pixel format %s is not supported by the %s encoder.\n", "Specified pixel format %s is not supported by the %s encoder.\n",
av_get_pix_fmt_name(avctx->pix_fmt), c->name); av_get_pix_fmt_name(avctx->pix_fmt), c->name);
av_log(avctx, AV_LOG_ERROR, "Supported pixel formats:\n"); av_log(avctx, AV_LOG_ERROR, "Supported pixel formats:\n");
for (int p = 0; c->pix_fmts[p] != AV_PIX_FMT_NONE; p++) { for (int p = 0; pix_fmts[p] != AV_PIX_FMT_NONE; p++) {
av_log(avctx, AV_LOG_ERROR, " %s\n", av_log(avctx, AV_LOG_ERROR, " %s\n",
av_get_pix_fmt_name(c->pix_fmts[p])); av_get_pix_fmt_name(pix_fmts[p]));
} }
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (c->pix_fmts[i] == AV_PIX_FMT_YUVJ420P || if (pix_fmts[i] == AV_PIX_FMT_YUVJ420P ||
c->pix_fmts[i] == AV_PIX_FMT_YUVJ411P || pix_fmts[i] == AV_PIX_FMT_YUVJ411P ||
c->pix_fmts[i] == AV_PIX_FMT_YUVJ422P || pix_fmts[i] == AV_PIX_FMT_YUVJ422P ||
c->pix_fmts[i] == AV_PIX_FMT_YUVJ440P || pix_fmts[i] == AV_PIX_FMT_YUVJ440P ||
c->pix_fmts[i] == AV_PIX_FMT_YUVJ444P) pix_fmts[i] == AV_PIX_FMT_YUVJ444P)
avctx->color_range = AVCOL_RANGE_JPEG; avctx->color_range = AVCOL_RANGE_JPEG;
} }
@ -646,7 +652,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
static int encode_preinit_audio(AVCodecContext *avctx) static int encode_preinit_audio(AVCodecContext *avctx)
{ {
const AVCodec *c = avctx->codec; const AVCodec *c = avctx->codec;
int i; const enum AVSampleFormat *sample_fmts;
const int *supported_samplerates;
const AVChannelLayout *ch_layouts;
int ret, i, num_sample_fmts, num_samplerates, num_ch_layouts;
if (!av_get_sample_fmt_name(avctx->sample_fmt)) { if (!av_get_sample_fmt_name(avctx->sample_fmt)) {
av_log(avctx, AV_LOG_ERROR, "Invalid audio sample format: %d\n", av_log(avctx, AV_LOG_ERROR, "Invalid audio sample format: %d\n",
@ -659,53 +668,68 @@ static int encode_preinit_audio(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (c->sample_fmts) { ret = avcodec_get_supported_config(avctx, NULL, AV_CODEC_CONFIG_SAMPLE_FORMAT,
for (i = 0; c->sample_fmts[i] != AV_SAMPLE_FMT_NONE; i++) { 0, (const void **) &sample_fmts,
if (avctx->sample_fmt == c->sample_fmts[i]) &num_sample_fmts);
if (ret < 0)
return ret;
if (sample_fmts) {
for (i = 0; i < num_sample_fmts; i++) {
if (avctx->sample_fmt == sample_fmts[i])
break; break;
if (avctx->ch_layout.nb_channels == 1 && if (avctx->ch_layout.nb_channels == 1 &&
av_get_planar_sample_fmt(avctx->sample_fmt) == av_get_planar_sample_fmt(avctx->sample_fmt) ==
av_get_planar_sample_fmt(c->sample_fmts[i])) { av_get_planar_sample_fmt(sample_fmts[i])) {
avctx->sample_fmt = c->sample_fmts[i]; avctx->sample_fmt = sample_fmts[i];
break; break;
} }
} }
if (c->sample_fmts[i] == AV_SAMPLE_FMT_NONE) { if (i == num_sample_fmts) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Specified sample format %s is not supported by the %s encoder\n", "Specified sample format %s is not supported by the %s encoder\n",
av_get_sample_fmt_name(avctx->sample_fmt), c->name); av_get_sample_fmt_name(avctx->sample_fmt), c->name);
av_log(avctx, AV_LOG_ERROR, "Supported sample formats:\n"); av_log(avctx, AV_LOG_ERROR, "Supported sample formats:\n");
for (int p = 0; c->sample_fmts[p] != AV_SAMPLE_FMT_NONE; p++) { for (int p = 0; sample_fmts[p] != AV_SAMPLE_FMT_NONE; p++) {
av_log(avctx, AV_LOG_ERROR, " %s\n", av_log(avctx, AV_LOG_ERROR, " %s\n",
av_get_sample_fmt_name(c->sample_fmts[p])); av_get_sample_fmt_name(sample_fmts[p]));
} }
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
} }
if (c->supported_samplerates) {
for (i = 0; c->supported_samplerates[i] != 0; i++) ret = avcodec_get_supported_config(avctx, NULL, AV_CODEC_CONFIG_SAMPLE_RATE,
if (avctx->sample_rate == c->supported_samplerates[i]) 0, (const void **) &supported_samplerates,
&num_samplerates);
if (ret < 0)
return ret;
if (supported_samplerates) {
for (i = 0; i < num_samplerates; i++)
if (avctx->sample_rate == supported_samplerates[i])
break; break;
if (c->supported_samplerates[i] == 0) { if (i == num_samplerates) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Specified sample rate %d is not supported by the %s encoder\n", "Specified sample rate %d is not supported by the %s encoder\n",
avctx->sample_rate, c->name); avctx->sample_rate, c->name);
av_log(avctx, AV_LOG_ERROR, "Supported sample rates:\n"); av_log(avctx, AV_LOG_ERROR, "Supported sample rates:\n");
for (int p = 0; c->supported_samplerates[p]; p++) for (int p = 0; supported_samplerates[p]; p++)
av_log(avctx, AV_LOG_ERROR, " %d\n", c->supported_samplerates[p]); av_log(avctx, AV_LOG_ERROR, " %d\n", supported_samplerates[p]);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
} }
if (c->ch_layouts) { ret = avcodec_get_supported_config(avctx, NULL, AV_CODEC_CONFIG_CHANNEL_LAYOUT,
for (i = 0; c->ch_layouts[i].nb_channels; i++) { 0, (const void **) &ch_layouts, &num_ch_layouts);
if (!av_channel_layout_compare(&avctx->ch_layout, &c->ch_layouts[i])) if (ret < 0)
return ret;
if (ch_layouts) {
for (i = 0; i < num_ch_layouts; i++) {
if (!av_channel_layout_compare(&avctx->ch_layout, &ch_layouts[i]))
break; break;
} }
if (!c->ch_layouts[i].nb_channels) { if (i == num_ch_layouts) {
char buf[512]; char buf[512];
int ret = av_channel_layout_describe(&avctx->ch_layout, buf, sizeof(buf)); int ret = av_channel_layout_describe(&avctx->ch_layout, buf, sizeof(buf));
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
@ -713,8 +737,8 @@ static int encode_preinit_audio(AVCodecContext *avctx)
ret > 0 ? buf : "?", c->name); ret > 0 ? buf : "?", c->name);
av_log(avctx, AV_LOG_ERROR, "Supported channel layouts:\n"); av_log(avctx, AV_LOG_ERROR, "Supported channel layouts:\n");
for (int p = 0; c->ch_layouts[p].nb_channels; p++) { for (int p = 0; ch_layouts[p].nb_channels; p++) {
ret = av_channel_layout_describe(&c->ch_layouts[p], buf, sizeof(buf)); ret = av_channel_layout_describe(&ch_layouts[p], buf, sizeof(buf));
av_log(avctx, AV_LOG_ERROR, " %s\n", ret > 0 ? buf : "?"); av_log(avctx, AV_LOG_ERROR, " %s\n", ret > 0 ? buf : "?");
} }
return AVERROR(EINVAL); return AVERROR(EINVAL);