summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRodeo <[email protected]>2014-02-18 17:14:14 +0000
committerRodeo <[email protected]>2014-02-18 17:14:14 +0000
commit681bdf52d5d2a9339c02c7a2b07358dc383681ec (patch)
treec9e8a5b5d5ed3547ec5b5b06e2ca3a807838df0a /test
parentb3e905dde9dacd4129c05440cedbe5a1366d0243 (diff)
QSV: API 1.8 support and related improvements
Optional feature detection now done via MFXVideoENCODE_Query. This should work better with future hardware and encoder implementations. Optional API 1.8 features are not tested (not supported by the software implementation, and no drivers with API 1.8 support available yet). git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6041 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
-rw-r--r--test/test.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/test/test.c b/test/test.c
index cd414e221..a595a9d58 100644
--- a/test/test.c
+++ b/test/test.c
@@ -3687,6 +3687,7 @@ static int ParseOptions( int argc, char ** argv )
#define AUDIO_DITHER 289
#define QSV_BASELINE 290
#define QSV_ASYNC_DEPTH 291
+ #define QSV_IMPLEMENTATION 292
for( ;; )
{
@@ -4339,19 +4340,14 @@ static int ParseOptions( int argc, char ** argv )
break;
#ifdef USE_QSV
case QSV_BASELINE:
- if (hb_qsv_available())
- {
- /* XXX: for testing workarounds */
- hb_qsv_info->capabilities &= ~HB_QSV_CAP_MSDK_API_1_6;
- hb_qsv_info->capabilities &= ~HB_QSV_CAP_OPTION2_MBBRC;
- hb_qsv_info->capabilities &= ~HB_QSV_CAP_OPTION2_EXTBRC;
- hb_qsv_info->capabilities &= ~HB_QSV_CAP_OPTION2_TRELLIS;
- hb_qsv_info->capabilities &= ~HB_QSV_CAP_OPTION2_LOOKAHEAD;
- }
+ hb_qsv_force_workarounds();
break;
case QSV_ASYNC_DEPTH:
qsv_async_depth = atoi(optarg);
break;
+ case QSV_IMPLEMENTATION:
+ hb_qsv_impl_set_preferred(optarg);
+ break;
#endif
default:
fprintf( stderr, "unknown option (%s)\n", argv[cur_optind] );