virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

dnxhd: Make the encoder message friendlier

Browse Source
This commit is contained in:
Luca Barbato 2016-02-08 10:17:00 +01:00
parent 34c9eba982
commit 99214d42a9
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/dnxhddata.c
View File

@ -1203,3 +1203,26 @@ int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth)
}
return 0;
}
void ff_dnxhd_list_cid(AVCodecContext *avctx)
{
int i, j;
for (i = 0; i < FF_ARRAY_ELEMS(ff_dnxhd_cid_table); i++) {
const CIDEntry *cid = &ff_dnxhd_cid_table[i];
av_log(avctx, AV_LOG_INFO,
"cid %d %ux%u %dbits %s bit rates",
cid->cid,
cid->width, cid->height,
cid->bit_depth,
cid->interlaced ? "interlaced " :
"progressive");
for (j = 0; j < FF_ARRAY_ELEMS(cid->bit_rates); j++) {
if (!cid->bit_rates[j])
break;
av_log(avctx, AV_LOG_INFO, " %dM",
cid->bit_rates[j]);
}
av_log(avctx, AV_LOG_INFO, "\n");
}
}

1
libavcodec/dnxhddata.h
View File

@ -47,5 +47,6 @@ extern const CIDEntry ff_dnxhd_cid_table[];
int ff_dnxhd_get_cid_table(int cid);
int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth);
void ff_dnxhd_list_cid(AVCodecContext *avctx);
#endif /* AVCODEC_DNXHDDATA_H */

5
libavcodec/dnxhdenc.c
View File

@ -289,14 +289,15 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
break;
default:
av_log(avctx, AV_LOG_ERROR,
"pixel format is incompatible with DNxHD\n");
"Pixel format is incompatible with DNxHD, use yuv422p or yuv422p10.\n");
return AVERROR(EINVAL);
}
ctx->cid = ff_dnxhd_find_cid(avctx, bit_depth);
if (!ctx->cid) {
av_log(avctx, AV_LOG_ERROR,
"video parameters incompatible with DNxHD\n");
"Video parameters incompatible with DNxHD, available CIDs:\n");
ff_dnxhd_list_cid(avctx);
return AVERROR(EINVAL);
}
av_log(avctx, AV_LOG_DEBUG, "cid %d\n", ctx->cid);