diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 00:14:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 00:15:58 +0100 |
| commit | e197dc04bbc21e0be0b5d92829d4d65d7b62ca63 (patch) | |
| tree | 958722fb0ceb87e4ed9e0a07e6f768a1f3a817ef /libavcodec | |
| parent | 2ba0ef4b15ccfeb1b7dcdca7dcbcc0a3f77f18b8 (diff) | |
| parent | 212556cd2144659dc6b9d121ddb38cd272bd10ae (diff) | |
| download | ffmpeg-e197dc04bbc21e0be0b5d92829d4d65d7b62ca63.tar.gz | |
Merge commit '212556cd2144659dc6b9d121ddb38cd272bd10ae'
* commit '212556cd2144659dc6b9d121ddb38cd272bd10ae':
qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qsv.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 2070d9986a..1e34c5f2a6 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -117,12 +117,19 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses MFXQueryIMPL(q->internal_session, &impl); - if (impl & MFX_IMPL_SOFTWARE) + switch (MFX_IMPL_BASETYPE(impl)) { + case MFX_IMPL_SOFTWARE: desc = "software"; - else if (impl & MFX_IMPL_HARDWARE) + break; + case MFX_IMPL_HARDWARE: + case MFX_IMPL_HARDWARE2: + case MFX_IMPL_HARDWARE3: + case MFX_IMPL_HARDWARE4: desc = "hardware accelerated"; - else + break; + default: desc = "unknown"; + } av_log(avctx, AV_LOG_VERBOSE, "Initialized an internal MFX session using %s implementation\n", |