ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Wed Aug 10 12:54:31 2016 +0200| [b91ce4860054430d3712deb0d9487cac2fcb7d68] | committer: Anton Khirnov
hwcontext_qsv: do not fail when download/upload VPP session creation fails Certain pixel formats (e.g. P8) might not be supported for download/upload through VPP operations, but can still be used otherwise. Signed-off-by: Maxym Dmytrychenko <maxym.dmytryche...@intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b91ce4860054430d3712deb0d9487cac2fcb7d68 --- libavutil/hwcontext_qsv.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 3679dc0..ae4b427 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -450,8 +450,10 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx, err = MFXVideoVPP_Init(*session, &par); if (err != MFX_ERR_NONE) { - av_log(ctx, AV_LOG_ERROR, "Error opening the internal VPP session\n"); - return AVERROR_UNKNOWN; + av_log(ctx, AV_LOG_VERBOSE, "Error opening the internal VPP session." + "Surface upload/download will not be possible\n"); + MFXClose(*session); + *session = NULL; } return 0; @@ -567,6 +569,11 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, mfxSyncPoint sync = NULL; mfxStatus err; + if (!s->session_download) { + av_log(ctx, AV_LOG_ERROR, "Surface download not possible\n"); + return AVERROR(ENOSYS); + } + out.Info = in->Info; out.Data.PitchLow = dst->linesize[0]; out.Data.Y = dst->data[0]; @@ -606,6 +613,11 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, mfxSyncPoint sync = NULL; mfxStatus err; + if (!s->session_upload) { + av_log(ctx, AV_LOG_ERROR, "Surface upload not possible\n"); + return AVERROR(ENOSYS); + } + in.Info = out->Info; in.Data.PitchLow = src->linesize[0]; in.Data.Y = src->data[0]; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
