[FFmpeg-cvslog] qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}

Yukinori Yamazoe git at videolan.org
Thu Mar 12 00:24:03 CET 2015


ffmpeg | branch: master | Yukinori Yamazoe <drocon11 at gmail.com> | Wed Mar 11 18:04:30 2015 +0900| [212556cd2144659dc6b9d121ddb38cd272bd10ae] | committer: Anton Khirnov

qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=212556cd2144659dc6b9d121ddb38cd272bd10ae
---

 libavcodec/qsv.c |   13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 3b2a75b..eef0604 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",



More information about the ffmpeg-cvslog mailing list