modified some display information errors

modified GUI OpenCL/UVD checkbox enable errors
modified compile without enable-opencl work errors

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

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 0340f6c44d85e8289d60a3d3cc01c82ad93f1882..f8bc5f76207ff79d1ff48f48ed43b9c480935cad 100644 (file)
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -18,8 +18,13 @@ FFMPEG.CONFIGURE.extra = \
     --disable-avfilter \
     --disable-muxers \
     --disable-network \
-    --disable-vaapi \
+    --disable-hwaccels \
+    --disable-encoders \
     --enable-dxva2 \
+    --enable-hwaccel=h264_dxva2 \
+    --enable-hwaccel=mpeg2_dxva2 \
+    --enable-hwaccel=vc1_dxva2 \
+    --enable-hwaccel=wmv3_dxva2 \
     --enable-encoder=aac \
     --enable-encoder=ac3 \
     --enable-encoder=flac \

diff --git a/libhb/cropscaleaccl.c b/libhb/cropscaleaccl.c
index 775e71b5c94a5f02472f87b38256069d4920b018..b254acde08340754ea64e78dc59922ed018e910a 100644 (file)
--- a/libhb/cropscaleaccl.c
+++ b/libhb/cropscaleaccl.c
@@ -46,7 +46,7 @@ hb_filter_object_t hb_filter_crop_scale_accl =
 {
     .id            = HB_FILTER_CROP_SCALE_ACCL,
     .enforce_order = 1,
-    .name          = "Hardware Acceleration Crop and Scale",
+    .name          = "Custom Crop and Scale",
     .settings      = NULL,
     .init          = hb_crop_scale_init,
     .work          = hb_crop_scale_work,

diff --git a/libhb/decavcodecaccl.c b/libhb/decavcodecaccl.c
index 5b19ed6883e31ca3c2fbb678f82b378a6e94706e..bab7296f3b6d8b638afb141622002802eb5b1bc6 100644 (file)
--- a/libhb/decavcodecaccl.c
+++ b/libhb/decavcodecaccl.c
@@ -276,7 +276,7 @@ static hb_buffer_t *copy_frame( hb_work_private_t *pv, AVFrame *frame )
     {
         hb_buffer_t *buf;
         int ww, hh;
-        if( (w > pv->job->width || h > pv->job->height) )
+        if( (w > pv->job->width || h > pv->job->height) && (hb_get_gui_info(&hb_gui, 2) == 1) )
         {
             buf = hb_video_buffer_init( pv->job->width, pv->job->height );
             ww = pv->job->width;

diff --git a/libhb/openclwrapper.c b/libhb/openclwrapper.c
index 7e0195a63e6a7395066e2a737eb4b8c670b6e00c..3a0f12f3e3297d704e59833c2d06ff9f77c6153f 100644 (file)
--- a/libhb/openclwrapper.c
+++ b/libhb/openclwrapper.c
@@ -160,14 +160,14 @@ int hb_binary_generated( cl_context context, const char * cl_file_name, FILE **
                                NULL );\r
     if( status != CL_SUCCESS )\r
        {\r
-               hb_log( "ERROR: hb_binary_generated: Get context info failed\n" );\r
+               hb_log( "Notice: Get context info failed\n" );\r
         return 0;\r
     }\r
 \r
     devices = (cl_device_id*)malloc( sizeof(cl_device_id) * numDevices );\r
     if( devices == NULL )\r
        {\r
-               hb_log( "hb_binary_generated: No device found\n" );\r
+               hb_log( "Notice: No device found\n" );\r
         return 0;\r
     }\r
 \r
@@ -243,13 +243,13 @@ int hb_generat_bin_from_kernel_source( cl_program program, const char * cl_file_
                                NULL );\r
     if( status != CL_SUCCESS )\r
        {\r
-               hb_log( "ERROR: hb_generat_bin_from_kernel_source: Get program info failed\n" );\r
+               hb_log( "Notice: Get program info failed, when generate binary file from kernel source\n" );\r
         return 0;\r
     }\r
     devices = (cl_device_id*)malloc( sizeof(cl_device_id) * numDevices );\r
     if( devices == NULL )\r
        {\r
-               hb_log( "ERROR: hb_generat_bin_from_kernel_source: No device found\n" );\r
+               hb_log( "Notice: No device found, when generate binary file from kernel source\n" );\r
         return 0;\r
     }\r
     /* grab the handles to all of the devices in the program. */\r
@@ -260,7 +260,7 @@ int hb_generat_bin_from_kernel_source( cl_program program, const char * cl_file_
                                NULL );\r
     if( status != CL_SUCCESS )\r
        {\r
-               hb_log( "ERROR: hb_generat_bin_from_kernel_source: Get program info failed\n" );\r
+               hb_log( "Notice: Get program info failed, when generate binary file from kernel source\n" );\r
         return 0;\r
     }\r
     /* figure out the sizes of each of the binaries. */\r
@@ -272,14 +272,14 @@ int hb_generat_bin_from_kernel_source( cl_program program, const char * cl_file_
                                binarySizes, NULL );\r
     if( status != CL_SUCCESS )\r
        {\r
-               hb_log( "ERROR: hb_generat_bin_from_kernel_source: Get program info failed\n" );\r
+               hb_log( "Notice: Get program info failed, when generate binary file from kernel source\n" );\r
         return 0;\r
     }\r
     /* copy over all of the generated binaries. */\r
     binaries = (char**)malloc( sizeof(char *) * numDevices );\r
     if( binaries == NULL )\r
        {\r
-               hb_log( "ERROR: hb_generat_bin_from_kernel_source: malloc for binaries failed\n" );\r
+               hb_log( "Notice: malloc for binaries failed, when generate binary file from kernel source\n" );\r
         return 0;\r
     }\r
 \r
@@ -290,7 +290,7 @@ int hb_generat_bin_from_kernel_source( cl_program program, const char * cl_file_
             binaries[i] = (char*)malloc( sizeof(char) * binarySizes[i] );\r
             if( binaries[i] == NULL )\r
                        {\r
-                               hb_log( "ERROR: hb_generat_bin_from_kernel_source: malloc for binary[%d] failed\n", i );\r
+                               hb_log( "Notice: malloc for binary[%d] failed, when generate binary file from kernel source\n", i );\r
                 return 0;\r
                }\r
         }\r
@@ -307,7 +307,7 @@ int hb_generat_bin_from_kernel_source( cl_program program, const char * cl_file_
                                NULL );\r
     if( status != CL_SUCCESS )\r
        {\r
-               hb_log( "ERROR: hb_generat_bin_from_kernel_source: Get program info failed\n" );\r
+               hb_log( "Notice: Get program info failed, when generate binary file from kernel source\n" );\r
         return 0;\r
     }\r
     /* dump out each binary into its own separate file. */\r
@@ -331,7 +331,7 @@ int hb_generat_bin_from_kernel_source( cl_program program, const char * cl_file_
 \r
             if( !hb_write_binary_to_file( fileName, binaries[i], binarySizes[i] ))\r
             {\r
-                       hb_log( "ERROR: hb_generat_bin_from_kernel_source: write binary[%s] failed\n", fileName );\r
+                hb_log( "Notice: Unable to write opencl kernel, writing to tempory directory instead." );\r
                 //printf( "opencl-wrapper: write binary[%s] failds\n", fileName);\r
                 return 0;\r
             } //else\r
@@ -422,7 +422,7 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
         status = clGetPlatformIDs( 0, NULL, &numPlatforms );\r
         if( status != CL_SUCCESS )\r
         {\r
-                       hb_log( "ERROR: OpenCL device platform not found.\n" );\r
+                       hb_log( "Notice: OpenCL device platform not found.\n" );\r
             return(1);\r
         }\r
         gpu_info->platform = NULL;\r
@@ -438,7 +438,7 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
 \r
             if( status != CL_SUCCESS )\r
             {\r
-                               hb_log( "ERROR: Specific opencl platform not found.\n" );\r
+                               hb_log( "Notice: Specific opencl platform not found.\n" );\r
                 return(1);\r
             }\r
 \r
@@ -450,7 +450,7 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
 \r
                 if( status != CL_SUCCESS )\r
                 {\r
-                                       hb_log( "ERROR: No more platform vendor info.\n" );\r
+                                       hb_log( "Notice: No more platform vendor info.\n" );\r
                     return(1);\r
                 }\r
                 gpu_info->platform = platforms[i];\r
@@ -470,7 +470,7 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
 \r
                 if( status != CL_SUCCESS )\r
                                {\r
-                                       hb_log( "ERROR: No available GPU device.\n" );\r
+                                       hb_log( "Notice: No available GPU device.\n" );\r
                         return(1);\r
                                }\r
 \r
@@ -509,7 +509,7 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
         }\r
         if((gpu_info->context == (cl_context)NULL) || (status != CL_SUCCESS))\r
         {\r
-                       hb_log( "ERROR: Create opencl context error.\n" );\r
+                       hb_log( "Notice: Unable to create opencl context.\n" );\r
             return(1);\r
         }\r
         /* Detect OpenCL devices. */\r
@@ -518,7 +518,7 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
                                    0, NULL, &length );\r
         if((status != CL_SUCCESS) || (length == 0))\r
         {\r
-                       hb_log( "ERROR: Get the list of devices in context error.\n" );\r
+                       hb_log( "Notice: Unable to get the list of devices in context.\n" );\r
             return(1);\r
         }\r
         /* Now allocate memory for device list based on the size we got earlier */\r
@@ -532,7 +532,7 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
                                    gpu_info->devices, NULL );\r
         if( status != CL_SUCCESS )\r
         {\r
-                       hb_log( "ERROR: Get the device list data in context error.\n" );\r
+                       hb_log( "Notice: Unable to get the device list data in context.\n" );\r
             return(1);\r
         }\r
 \r
@@ -542,7 +542,7 @@ int hb_init_opencl_env( GPUEnv *gpu_info )
                                                         0, &status );\r
         if( status != CL_SUCCESS )\r
                {\r
-                       hb_log( "ERROR: Create opencl command queue error.\n" );\r
+                       hb_log( "Notice: Unable to create opencl command queue.\n" );\r
             return(1);\r
                }\r
     }\r
@@ -679,7 +679,7 @@ int hb_compile_kernel_file( const char *filename, GPUEnv *gpu_info,
                                    &numDevices,\r
                                    NULL );\r
         if( status != CL_SUCCESS ){\r
-                       hb_log( "ERROR: Get the number of devices in context error.\n" );\r
+                       hb_log( "Notice: Unable to get the number of devices in context.\n" );\r
             return 0;\r
                }\r
 \r
@@ -732,7 +732,7 @@ int hb_compile_kernel_file( const char *filename, GPUEnv *gpu_info,
     }\r
 \r
     if((gpu_info->programs[idx] == (cl_program)NULL) || (status != CL_SUCCESS)){\r
-               hb_log( "ERROR: Get list of devices in context error.\n" );\r
+               hb_log( "Notice: Unable to get list of devices in context.\n" );\r
         return(0);\r
        }\r
 \r
@@ -757,7 +757,7 @@ int hb_compile_kernel_file( const char *filename, GPUEnv *gpu_info,
 \r
         if( status != CL_SUCCESS )\r
         {\r
-                       hb_log( "ERROR: Get GPU build information error.\n" );\r
+                       hb_log( "Notice: Unable to get GPU build information.\n" );\r
             return(0);\r
         }\r
         buildLog = (char*)malloc( length );\r

diff --git a/libhb/stream.c b/libhb/stream.c
index 85d047eceb73937a9d761cdcd008c867db9b2369..46b4cb71ef75230e49aaece72225ce3477e3eed7 100644 (file)
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -610,8 +610,10 @@ static int hb_stream_get_type(hb_stream_t *stream)
 
     if ( fread(buf, 1, sizeof(buf), stream->file_handle) == sizeof(buf) )
     {
+#ifdef USE_OPENCL
         if ( hb_get_gui_info(&hb_gui, 1) || (hb_get_gui_info(&hb_gui, 3) == 0) )
             return 0;
+#endif
         int psize;
         if ( ( psize = hb_stream_check_for_ts(buf) ) != 0 )
         {
@@ -1099,24 +1101,25 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream, hb_title_t * title)
     {
         hb_log( "transport stream missing PCRs - using video DTS instead" );
     }
-    if ( hb_get_gui_info(&hb_gui, 3) == 0 )
-    {
-           hb_va_dxva2_t * dxva2 = NULL;
-           dxva2 = hb_va_create_dxva2( dxva2, title->video_codec_param );
-           if (dxva2)
-           {
-               title->uvd_support = 1;
-               hb_va_close(dxva2);
-               dxva2 = NULL;
-           }
-           else
-               title->uvd_support = 0;
 #ifdef USE_OPENCL
-           title->opencl_support = TestGPU();
+    hb_va_dxva2_t * dxva2 = NULL;
+    dxva2 = hb_va_create_dxva2( dxva2, title->video_codec_param );
+    if (dxva2)
+    {
+        title->uvd_support = 1;
+        hb_va_close(dxva2);
+        dxva2 = NULL;
+    }
+    else
+        title->uvd_support = 0;
+    if (TestGPU() == 0)
+        title->opencl_support = 1;
+    else
+        title->opencl_support = 0;
 #else
-           title->opencl_support = 1;
+    title->uvd_support = 0;
+       title->opencl_support = 0;
 #endif
-    }
     // Height, width, rate and aspect ratio information is filled in
     // when the previews are built
     return title;
@@ -5669,24 +5672,26 @@ static hb_title_t *ffmpeg_title_scan( hb_stream_t *stream, hb_title_t *title )
         hb_list_add( title->list_chapter, chapter );
     }
 
-    if ( hb_get_gui_info(&hb_gui, 3) == 0 )
-    {
-           hb_va_dxva2_t * dxva2 = NULL;
-           dxva2 = hb_va_create_dxva2( dxva2, title->video_codec_param );
-           if (dxva2)
-           {
-               title->uvd_support = 1;
-               hb_va_close(dxva2);
-               dxva2 = NULL;
-           }
-           else
-               title->uvd_support = 0;
 #ifdef USE_OPENCL
-           title->opencl_support = TestGPU();
+    hb_va_dxva2_t * dxva2 = NULL;
+    dxva2 = hb_va_create_dxva2( dxva2, title->video_codec_param );
+    if (dxva2)
+    {
+        title->uvd_support = 1;
+        hb_va_close(dxva2);
+        dxva2 = NULL;
+    }
+    else
+        title->uvd_support = 0;
+    if (TestGPU() == 0)
+        title->opencl_support = 1;
+    else
+        title->opencl_support = 0;
 #else
-           title->opencl_support = 1;
+    title->uvd_support = 0;
+    title->opencl_support = 0;
 #endif
-    }
+
     return title;
 }
 

diff --git a/libhb/vadxva2.c b/libhb/vadxva2.c
index e31105f7f852aff896dd21d1a8ed0afa238880c3..a810cc5af5edfb1baa8a22289aa9c59c5d5ad278 100644 (file)
--- a/libhb/vadxva2.c
+++ b/libhb/vadxva2.c
@@ -372,7 +372,7 @@ static int hb_d3d_create_device_manager( hb_va_dxva2_t *dxva2 )
         hb_log( "dxva2:cannot load function\n" );
         return HB_WORK_ERROR;
     }
-    hb_log( "dxva2:OurDirect3DCreateDeviceManager9 Success!\n" );
+    //hb_log( "dxva2:OurDirect3DCreateDeviceManager9 Success!\n" );
 
     UINT token;
     IDirect3DDeviceManager9 *devmng;
@@ -383,7 +383,7 @@ static int hb_d3d_create_device_manager( hb_va_dxva2_t *dxva2 )
     }
     dxva2->token  = token;
     dxva2->devmng = devmng;
-    hb_log( "dxva2:obtained IDirect3DDeviceManager9\n" );
+    //hb_log( "dxva2:obtained IDirect3DDeviceManager9\n" );
 
     long hr = IDirect3DDeviceManager9_ResetDevice( devmng, dxva2->d3ddev, token );
     if( FAILED( hr ))
@@ -406,7 +406,7 @@ static int hb_dx_create_video_service( hb_va_dxva2_t *dxva2 )
         hb_log( "dxva2:cannot load function\n" );
         return HB_WORK_ERROR;
     }
-    hb_log( "dxva2:DXVA2CreateVideoService Success!\n" );
+    //hb_log( "dxva2:DXVA2CreateVideoService Success!\n" );
 
     HRESULT hr;
 
@@ -449,7 +449,7 @@ static int hb_dx_find_video_service_conversion( hb_va_dxva2_t *dxva2, GUID *inpu
         const hb_dx_mode_t *mode = hb_dx_find_mode( g );
         if( mode )
         {
-            hb_log( "dxva2:'%s' is supported by hardware\n", mode->name );
+            //hb_log( "dxva2:'%s' is supported by hardware\n", mode->name );
         }
         else
         {
@@ -472,7 +472,7 @@ static int hb_dx_find_video_service_conversion( hb_va_dxva2_t *dxva2, GUID *inpu
         if( !is_suported )
             continue;
 
-        hb_log( "dxva2: Trying to use '%s' as input\n", mode->name );
+        //hb_log( "dxva2: Trying to use '%s' as input\n", mode->name );
         unsigned int output_count = 0;
         D3DFORMAT *output_list = NULL;
         if( FAILED( IDirectXVideoDecoderService_GetDecoderRenderTargets( dxva2->vs, mode->guid, &output_count, &output_list )))
@@ -486,7 +486,7 @@ static int hb_dx_find_video_service_conversion( hb_va_dxva2_t *dxva2, GUID *inpu
             const hb_d3d_format_t *format = hb_d3d_find_format( f );
             if( format )
             {
-                hb_log( "dxva2:%s is supported for output\n", format->name );
+                //hb_log( "dxva2:%s is supported for output\n", format->name );
             }
             else
             {
@@ -505,7 +505,7 @@ static int hb_dx_find_video_service_conversion( hb_va_dxva2_t *dxva2, GUID *inpu
             }
             if( !is_suported )
                 continue;
-            hb_log( "dxva2:Using '%s' to decode to '%s'\n", mode->name, format->name );
+            //hb_log( "dxva2:Using '%s' to decode to '%s'\n", mode->name, format->name );
             *input  = *mode->guid;
             *output = format->format;
             return HB_WORK_OK;
@@ -669,7 +669,7 @@ int hb_va_extract( hb_va_dxva2_t *dxva2, uint8_t *dst, AVFrame *frame, int job_w
             lock.Pitch,
         };
 #ifdef USE_OPENCL
-        if( ( dxva2->width > job_w || dxva2->height > job_h ) && (TestGPU() == 0) )
+        if( ( dxva2->width > job_w || dxva2->height > job_h ) && (TestGPU() == 0) && (hb_get_gui_info(&hb_gui, 2) == 1))
         {
 /*          int i;
             uint8_t *tmp = (uint8_t*)malloc( dxva2->width*dxva2->height*3/2 );
@@ -731,7 +731,7 @@ hb_va_dxva2_t * hb_va_create_dxva2( hb_va_dxva2_t *dxva2, int codec_id )
         goto error;
     }
 
-    hb_log( "dxva2:hb_d3d_create_device succeed" );
+    //hb_log( "dxva2:hb_d3d_create_device succeed" );
     if( hb_d3d_create_device_manager( dxva )== HB_WORK_ERROR )
     {
         hb_log( "dxva2:D3dCreateDeviceManager failed" );

diff --git a/libhb/work.c b/libhb/work.c
index db7dfe7889b094a18461e6dea5029d499726af5f..c8057f0e426495133aa3435ea28c8f41eca5581f 100644 (file)
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -555,7 +555,7 @@ static void do_job( hb_job_t * job )
 
     hb_log( "starting job" );
 #ifdef USE_OPENCL
-    if ( job->use_opencl )
+    if ( job->use_opencl || job->use_uvd)
     {
            /* init opencl environment */
         hb_log( "Using GPU : Yes.\n" );
@@ -1022,7 +1022,7 @@ static void do_job( hb_job_t * job )
     }
 #endif
 #ifdef USE_OPENCL  
-    if ( job->use_opencl && hb_use_dxva( title ) && (TestGPU() == 0) && job->use_uvd )
+    if ( /*job->use_opencl &&*/ hb_use_dxva( title ) && (TestGPU() == 0) && job->use_uvd )
     {        
         vcodec = WORK_DECAVCODECVACCL;
     }

diff --git a/test/test.c b/test/test.c
index f541229181d062ba79919bab8f471e2c59d43bb7..8bca6bd66b62355150a14faf1a88f5ac60f5ffb2 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -424,10 +424,14 @@ static void PrintTitleInfo( hb_title_t * title, int feature )
              (float) title->rate / title->rate_base );
     fprintf( stderr, "  + autocrop: %d/%d/%d/%d\n", title->crop[0],
              title->crop[1], title->crop[2], title->crop[3] );
-
-    fprintf( stderr, "  + support opencl: %d \n", title->opencl_support);
-    fprintf( stderr, "  + support uvd: %d\n", title->uvd_support);
-
+    if (title->opencl_support)
+        fprintf( stderr, "  + support opencl: yes\n");
+    else
+        fprintf( stderr, "  + support opencl: no\n");
+    if (title->uvd_support)
+        fprintf( stderr, "  + support uvd: yes\n");
+    else
+        fprintf( stderr, "  + support uvd: no\n");
     fprintf( stderr, "  + chapters:\n" );
     for( i = 0; i < hb_list_count( title->list_chapter ); i++ )
     {

diff --git a/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs b/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
index d6e6e57aa4c5e7482dfce8646cffd1d82555af44..466a33aa17f18e311eab60e9d07e3f2c1d988935 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
+++ b/win/CS/HandBrake.ApplicationServices/Parsing/Title.cs
@@ -142,6 +142,7 @@ namespace HandBrake.ApplicationServices.Parsing
         {\r
             var thisTitle = new Title();\r
             string nextLine = output.ReadLine();\r
+            string temp;\r
 \r
             // Get the Title Number\r
             Match m = Regex.Match(nextLine, @"^\+ title ([0-9]*):");\r
@@ -223,12 +224,27 @@ namespace HandBrake.ApplicationServices.Parsing
                     };\r
             }\r
 \r
-            m = Regex.Match(output.ReadLine(), @"^  \+ support opencl: ([0-9]*)");\r
+            nextLine = output.ReadLine();\r
+            m = Regex.Match(nextLine, @"^  \+ support opencl:");\r
             if (m.Success)\r
-                thisTitle.OpenCLSupport = int.Parse(m.Groups[1].Value.Trim());\r
-            m = Regex.Match(output.ReadLine(), @"  \+ support uvd: ([0-9]*)");\r
+            {\r
+                temp = nextLine.Replace("+ support opencl:", string.Empty).Trim();\r
+                if (string.Compare(temp, "yes") == 0)\r
+                    thisTitle.OpenCLSupport = 1;\r
+                else\r
+                    thisTitle.OpenCLSupport = 0;\r
+            }\r
+\r
+            nextLine = output.ReadLine();\r
+            m = Regex.Match(nextLine, @"^  \+ support uvd:");\r
             if (m.Success)\r
-                thisTitle.UVDSupport = int.Parse(m.Groups[1].Value.Trim());\r
+            {\r
+                temp = nextLine.Replace("+ support uvd:", string.Empty).Trim();\r
+                if (string.Compare(temp, "yes") == 0)\r
+                    thisTitle.UVDSupport = 1;\r
+                else\r
+                    thisTitle.UVDSupport = 0;\r
+            }\r
             thisTitle.Chapters.AddRange(Chapter.ParseList(output));\r
 \r
             thisTitle.AudioTracks.AddRange(AudioHelper.ParseList(output));\r

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
index ca23b3c66e97c2c7ca279450b49e2ce9ae7e0cb5..69cbfc2583f2a654c7b78e36a71a93a0459cfb83 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryGeneratorUtility.cs
@@ -245,10 +245,10 @@ namespace HandBrake.ApplicationServices.Utilities
 \r
             if (task.OpenCLSupport)\r
                 query += " -P ";\r
-            if (task.UVDSupport && task.OpenCLSupport)\r
+\r
+            if (task.UVDSupport)\r
                 query += " -U ";\r
-            else if (task.UVDSupport && !task.OpenCLSupport)\r
-                query += " -P -U";\r
+\r
             return query;\r
         }\r
 \r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 0a0cfe02d69ca42cef17cabb889120f88218f1a1..6d2e736a3657c3e9b0c64ddbb6e4f77416864727 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1721,11 +1721,11 @@ namespace HandBrakeWPF.ViewModels
                     {\r
                         if (this.selectedTitle.OpenCLSupport == 0)\r
                         {\r
-                            this.SupportOpenCL = false;\r
+                            this.SupportOpenCL = true;\r
                         }\r
                         else\r
                         {\r
-                            this.SupportOpenCL = true;\r
+                            this.SupportOpenCL = false;\r
                         }\r
                         if (this.selectedTitle.UVDSupport == 0)\r
                         {\r