diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 14f16bc66d834a6834775d4ef3cd950bfa4bc92b..91195865bcb2c4fdcb5e0e033cb73f0bf4bcd45a 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 03b2f651db72a4804084fa480e0803ec415b05a2..41f4c3ddf6048f7eb5ab549e73aaea16ab246739 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 4697e1d1d1524394ec175d6bf5a9b9eef8733747..ba07db6e99122d780b1ec8c77dd34ff42b21f76f 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);