cleanup for implementation path

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

diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index 9001183ecb346ad7b49bd7526d294adf668580a6..a557770fccc356b3e62ee725081d3e38c9314190 100644 (file)
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -1044,21 +1044,13 @@ static int decavcodecvInit( hb_work_object_t * w, hb_job_t * job )
 
 #ifdef USE_QSV
         if(job && job->vcodec == HB_VCODEC_QSV_H264 ){
-            pv->context->hwaccel_context              = &pv->qsv_config;
+            pv->context->hwaccel_context          = &pv->qsv_config;
             pv->qsv_config.io_pattern             = MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
             pv->qsv_config.additional_buffers     = 32; // FIFO_LARGE for now
             // decode is async, sync only at encode
             pv->qsv_config.sync_need              = 0;
             pv->qsv_config.usage_threaded         = 1;
-
-//#define QSV_IMPL_HARDWARE
-        #ifdef QSV_IMPL_HARDWARE
-            pv->qsv_config.impl_requested = MFX_IMPL_HARDWARE;
-        #elif QSV_IMPL_SOFTWARE
-            pv->qsv_config.impl_requested = MFX_IMPL_SOFTWARE;
-        #else
-            pv->qsv_config.impl_requested = MFX_IMPL_AUTO;
-        #endif
+            pv->qsv_config.impl_requested         = MFX_IMPL_AUTO;
         }
 #endif
 
@@ -1104,15 +1096,7 @@ static int decavcodecvInit( hb_work_object_t * w, hb_job_t * job )
             // decode is async, sync only at encode
             pv->qsv_config.sync_need              = 0;
             pv->qsv_config.usage_threaded         = 1;
-
-//#define QSV_IMPL_HARDWARE
-        #ifdef QSV_IMPL_HARDWARE
-            pv->qsv_config.impl_requested = MFX_IMPL_HARDWARE;
-        #elif QSV_IMPL_SOFTWARE
-            pv->qsv_config.impl_requested = MFX_IMPL_SOFTWARE;
-        #else
-            pv->qsv_config.impl_requested = MFX_IMPL_AUTO;
-        #endif
+            pv->qsv_config.impl_requested         = MFX_IMPL_AUTO;
         }
 #endif
 

diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index 8eeaab8cb16c9156279cd34afdc816d44aa0c7f4..ec84fc8382bb3d84d9cd384a2115844cd04e7078 100644 (file)
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -168,9 +168,10 @@ int qsv_enc_init( av_qsv_context* qsv, hb_work_private_t * pv ){
                             SWS_LANCZOS|SWS_ACCURATE_RND);
     }
 
-    MFXQueryIMPL(qsv->mfx_session,&qsv->impl);
+    sts = MFXQueryIMPL(qsv->mfx_session,&qsv->impl);
+    AV_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
-    char* impl_name = (MFX_IMPL_HARDWARE == qsv->impl) ? "hardware" : "software";
+    char* impl_name = (MFX_IMPL_SOFTWARE == qsv->impl) ? "software" : "hardware";
     hb_log("qsv: Intel QSV/MediaSDK uses %s implementation", impl_name);
 
     if(pv->is_sys_mem)
@@ -490,14 +491,7 @@ int encqsvInit( hb_work_object_t * w, hb_job_t * job )
         // no need to use additional sync as encode only -> single thread
         av_qsv_add_context_usage(qsv,0);
 
-//#define QSV_IMPL_HARDWARE
-        #ifdef QSV_IMPL_HARDWARE
-            qsv->impl = MFX_IMPL_HARDWARE;
-        #elif QSV_IMPL_SOFTWARE
-            qsv->impl = MFX_IMPL_SOFTWARE;
-        #else
-            qsv->impl = MFX_IMPL_AUTO;
-        #endif
+        qsv->impl = MFX_IMPL_AUTO;
 
         memset(&qsv->mfx_session, 0, sizeof(mfxSession));
         qsv->ver.Major = AV_QSV_MSDK_VERSION_MAJOR;