qsv: Improve the log message of when initializing MFX_IMPL_HARDWARE{2, 3, 4}
authorYukinori Yamazoe <drocon11@gmail.com>
Wed, 11 Mar 2015 09:04:30 +0000 (18:04 +0900)
committerAnton Khirnov <anton@khirnov.net>
Wed, 11 Mar 2015 18:48:01 +0000 (19:48 +0100)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/qsv.c

index 3b2a75b..eef0604 100644 (file)
@@ -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",