diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-07-14 13:56:35 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-07-22 20:08:13 +0300 |
commit | 8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4 (patch) | |
tree | 1fecbd34359ad66ce31ffb498d1f734ddf3e4302 | |
parent | 0956fd460681e8ccbdae19f135f0d3970bf95c2f (diff) |
qsvenc: print warnings from encode/init
-rw-r--r-- | libavcodec/qsv.c | 10 | ||||
-rw-r--r-- | libavcodec/qsv_internal.h | 3 | ||||
-rw-r--r-- | libavcodec/qsvenc.c | 6 |
3 files changed, 19 insertions, 0 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 14f16bc66d..91195865bc 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -117,6 +117,16 @@ int ff_qsv_print_error(void *log_ctx, mfxStatus err, return ret; } +int ff_qsv_print_warning(void *log_ctx, mfxStatus err, + const char *warning_string) +{ + const char *desc; + int ret; + ret = ff_qsv_map_error(err, &desc); + av_log(log_ctx, AV_LOG_WARNING, "%s: %s (%d)\n", warning_string, desc, err); + return ret; +} + int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc) { switch (format) { diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 03b2f651db..41f4c3ddf6 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -62,6 +62,9 @@ int ff_qsv_map_error(mfxStatus mfx_err, const char **desc); int ff_qsv_print_error(void *log_ctx, mfxStatus err, const char *error_string); +int ff_qsv_print_warning(void *log_ctx, mfxStatus err, + const char *warning_string); + int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id); int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc); diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 4697e1d1d1..ba07db6e99 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -794,6 +794,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) if (ret < 0) return ff_qsv_print_error(avctx, ret, "Error initializing the encoder"); + else if (ret > 0) + ff_qsv_print_warning(avctx, ret, + "Warning in encoder initialization"); ret = qsv_retrieve_enc_params(avctx, q); if (ret < 0) { @@ -974,6 +977,9 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, av_usleep(1); } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION); + if (ret > 0) + ff_qsv_print_warning(avctx, ret, "Warning during encoding"); + if (ret < 0) { av_packet_unref(&new_pkt); av_freep(&bs); |