diff options
author | Mark Thompson <sw@jkqxz.net> | 2017-03-12 15:19:05 +0000 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2017-03-12 15:19:05 +0000 |
commit | 15887a410c5ae271c59e5bc6d60ae443e6c40ac7 (patch) | |
tree | cddbd09e9d7c18e9b87e9302a53e9bbe9cf3ca00 /libavcodec/qsvenc.c | |
parent | 723a542d6c67de2946dbb7f782393c8c2bee8e0b (diff) | |
parent | 95414eb2dc63a6f934275b4ed33dedd4369f2c49 (diff) |
Merge commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49'
* commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49':
qsv: print more complete error messages
Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/qsvenc.c')
-rw-r--r-- | libavcodec/qsvenc.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 6e67a24212..a0ea965161 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -591,7 +591,8 @@ static int qsv_retrieve_enc_params(AVCodecContext *avctx, QSVEncContext *q) ret = MFXVideoENCODE_GetVideoParam(q->session, &q->param); if (ret < 0) - return ff_qsv_error(ret); + return ff_qsv_print_error(avctx, ret, + "Error calling GetVideoParam"); q->packet_size = q->param.mfx.BufferSizeInKB * 1000; @@ -740,10 +741,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) return ret; ret = MFXVideoENCODE_QueryIOSurf(q->session, &q->param, &q->req); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Error querying the encoding parameters\n"); - return ff_qsv_error(ret); - } + if (ret < 0) + return ff_qsv_print_error(avctx, ret, + "Error querying the encoding parameters"); if (opaque_alloc) { ret = qsv_init_opaque_alloc(avctx, q); @@ -781,12 +781,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) } ret = MFXVideoENCODE_Init(q->session, &q->param); - if (ret == MFX_WRN_PARTIAL_ACCELERATION) { - av_log(avctx, AV_LOG_WARNING, "Encoder will work with partial HW acceleration\n"); - } else if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Error initializing the encoder\n"); - return ff_qsv_error(ret); - } + if (ret < 0) + return ff_qsv_print_error(avctx, ret, + "Error initializing the encoder"); ret = qsv_retrieve_enc_params(avctx, q); if (ret < 0) { @@ -998,7 +995,8 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, av_packet_unref(&new_pkt); av_freep(&bs); av_freep(&sync); - return (ret == MFX_ERR_MORE_DATA) ? 0 : ff_qsv_error(ret); + return (ret == MFX_ERR_MORE_DATA) ? + 0 : ff_qsv_print_error(avctx, ret, "Error during encoding"); } if (ret == MFX_WRN_INCOMPATIBLE_VIDEO_PARAM && frame->interlaced_frame) |