virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

Merge commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68'

Browse Source 
* commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68':
  hwcontext_qsv: do not fail when download/upload VPP session creation fails

Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Mark Thompson 2017-03-30 21:16:58 +01:00
commit 7cb082ac2f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavutil/hwcontext_qsv.c
View File

@ -450,8 +450,10 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx,
err = MFXVideoVPP_Init(*session, &par); err = MFXVideoVPP_Init(*session, &par);
if (err != MFX_ERR_NONE) { if (err != MFX_ERR_NONE) {
av_log(ctx, AV_LOG_ERROR, "Error opening the internal VPP session\n"); av_log(ctx, AV_LOG_VERBOSE, "Error opening the internal VPP session."
return AVERROR_UNKNOWN; "Surface upload/download will not be possible\n");
MFXClose(*session);
*session = NULL;
} }
return 0; return 0;
@ -567,6 +569,11 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
mfxSyncPoint sync = NULL; mfxSyncPoint sync = NULL;
mfxStatus err; 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.Info = in->Info;
out.Data.PitchLow = dst->linesize[0]; out.Data.PitchLow = dst->linesize[0];
out.Data.Y = dst->data[0]; out.Data.Y = dst->data[0];
@ -606,6 +613,11 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
mfxSyncPoint sync = NULL; mfxSyncPoint sync = NULL;
mfxStatus err; 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.Info = out->Info;
in.Data.PitchLow = src->linesize[0]; in.Data.PitchLow = src->linesize[0];
in.Data.Y = src->data[0]; in.Data.Y = src->data[0];