RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4' 

* commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4':
  qsvenc: print warnings from encode/init

Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Mark Thompson 2017-03-12 15:21:41 +00:00
parent 80fa5a0bcc 8e07c22e50
commit a7434ef195
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/qsv.c
View File

@ -133,6 +133,16 @@ int ff_qsv_print_error(void *log_ctx, mfxStatus err,
return ret; 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) int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc)
{ {
switch (format) { switch (format) {

3
libavcodec/qsv_internal.h
View File

@ -65,6 +65,9 @@ int ff_qsv_map_error(mfxStatus mfx_err, const char **desc);
int ff_qsv_print_error(void *log_ctx, mfxStatus err, int ff_qsv_print_error(void *log_ctx, mfxStatus err,
const char *error_string); 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_codec_id_to_mfx(enum AVCodecID codec_id);
int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile); int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile);

6
libavcodec/qsvenc.c
View File

@ -784,6 +784,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
if (ret < 0) if (ret < 0)
return ff_qsv_print_error(avctx, ret, return ff_qsv_print_error(avctx, ret,
"Error initializing the encoder"); "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); ret = qsv_retrieve_enc_params(avctx, q);
if (ret < 0) { if (ret < 0) {
@ -991,6 +994,9 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q,
av_usleep(500); av_usleep(500);
} while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION); } 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) { if (ret < 0) {
av_packet_unref(&new_pkt); av_packet_unref(&new_pkt);
av_freep(&bs); av_freep(&bs);