diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2013-01-26 12:46:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-27 18:44:16 +0100 |
| commit | 9d602a0b0e955ac8553b16fc1b98731d66fdde2b (patch) | |
| tree | e78db148e64e338c99512e5dbd478a1f41d3c350 | |
| parent | 5b83b2da08b4be31fc421a698ea649799e0848c7 (diff) | |
| download | ffmpeg-9d602a0b0e955ac8553b16fc1b98731d66fdde2b.tar.gz | |
lavc/dnxhdenc: print valid profiles when codec parameters are invalid
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dnxhddata.c | 16 | ||||
| -rw-r--r-- | libavcodec/dnxhddata.h | 1 | ||||
| -rw-r--r-- | libavcodec/dnxhdenc.c | 3 |
3 files changed, 19 insertions, 1 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 71cb333822..669b8067e9 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -1064,3 +1064,19 @@ int ff_dnxhd_find_cid(AVCodecContext *avctx, int bit_depth) } return 0; } + +void ff_dnxhd_print_profiles(AVCodecContext *avctx, int loglevel) +{ + int i, j; + for (i = 0; i < FF_ARRAY_ELEMS(ff_dnxhd_cid_table); i++) { + const CIDEntry *cid = &ff_dnxhd_cid_table[i]; + for (j = 0; j < FF_ARRAY_ELEMS(cid->bit_rates); j++) { + if (!cid->bit_rates[j]) + break; + + av_log(avctx, loglevel, "Frame size: %dx%d%c; bitrate: %dMbps; pixel format: %s; framerate: %d/%d\n", + cid->width, cid->height, cid->interlaced ? 'i' : 'p', cid->bit_rates[j], + cid->bit_depth == 10 ? "yuv422p10" : "yuv422p", cid->frame_rates[j].num, cid->frame_rates[j].den); + } + } +} diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index 7055e1ecc1..b8bcb21d8e 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -50,6 +50,7 @@ extern av_export 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_print_profiles(AVCodecContext *avctx, int loglevel); int avpriv_dnxhd_get_frame_size(int cid); diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 5ad6164e8f..51f2af062a 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -266,7 +266,8 @@ static int dnxhd_encode_init(AVCodecContext *avctx) ctx->cid = ff_dnxhd_find_cid(avctx, bit_depth); if (!ctx->cid) { - av_log(avctx, AV_LOG_ERROR, "video parameters incompatible with DNxHD\n"); + av_log(avctx, AV_LOG_ERROR, "video parameters incompatible with DNxHD. Valid DNxHD profiles:\n"); + ff_dnxhd_print_profiles(avctx, AV_LOG_ERROR); return -1; } av_log(avctx, AV_LOG_DEBUG, "cid %d\n", ctx->cid); |