QSV: use MFX_IMPL_AUTO_ANY.

This is the recommended usage.

Also, it may fix cases where Quick Sync Video is detected as available but fails to initialize when encoding.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/qsv@5643 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index 621cf59d0b48c37c478c09f55c0fa0c55e4aa12e..34babca1bc41eb0955434256a08234cc93f14a36 100644 (file)
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -824,7 +824,7 @@ static int decodeFrame( hb_work_object_t *w, uint8_t *data, int size, int sequen
             // decode is async, sync only at encode
             pv->qsv_config.sync_need              = 0;
             pv->qsv_config.usage_threaded         = 1;
-            pv->qsv_config.impl_requested         = MFX_IMPL_AUTO | MFX_IMPL_VIA_ANY; // practically means : Hardware acceleration via any supported OS supported OS infrastructure
+            pv->qsv_config.impl_requested         = MFX_IMPL_AUTO_ANY|MFX_IMPL_VIA_ANY;
             qsv_from_first_frame = 1;
         }
 #endif
@@ -1159,7 +1159,7 @@ static int decavcodecvInit( hb_work_object_t * w, hb_job_t * job )
             pv->qsv_config.additional_buffers     = 64;
             pv->qsv_config.sync_need              = 0;
             pv->qsv_config.usage_threaded         = 1;
-            pv->qsv_config.impl_requested         = MFX_IMPL_AUTO | MFX_IMPL_VIA_ANY;
+            pv->qsv_config.impl_requested         = MFX_IMPL_AUTO_ANY|MFX_IMPL_VIA_ANY;
         }
 #endif
 
@@ -1204,7 +1204,7 @@ static int decavcodecvInit( hb_work_object_t * w, hb_job_t * job )
             pv->qsv_config.additional_buffers     = 64;
             pv->qsv_config.sync_need              = 0;
             pv->qsv_config.usage_threaded         = 1;
-            pv->qsv_config.impl_requested         = MFX_IMPL_AUTO | MFX_IMPL_VIA_ANY;
+            pv->qsv_config.impl_requested         = MFX_IMPL_AUTO_ANY|MFX_IMPL_VIA_ANY;
         }
 #endif
     }

diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index afa274fe298ddc3aa72d97bf275c3af9c99d1f50..72688fba5535a84b81dddfbd440412a5b09b6702 100644 (file)
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -205,7 +205,7 @@ int qsv_enc_init( av_qsv_context* qsv, hb_work_private_t * pv ){
             // no need to use additional sync as encode only -> single thread
             av_qsv_add_context_usage(qsv,0);
 
-            qsv->impl = MFX_IMPL_AUTO;
+            qsv->impl = MFX_IMPL_AUTO_ANY;
 
             memset(&qsv->mfx_session, 0, sizeof(mfxSession));
             qsv->ver.Major = AV_QSV_MSDK_VERSION_MAJOR;