From cd00b6f50ede70a9edef1785dd8c74e1d3ab4dad Mon Sep 17 00:00:00 2001 From: Rodeo Date: Sun, 12 Jan 2014 23:46:44 +0000 Subject: Revert previous commit, sorry. I forgot about capabilities, we can't just swap the preferred implementation like that. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5965 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- libhb/qsv_common.c | 5 ----- libhb/qsv_common.h | 1 - test/test.c | 42 ------------------------------------------ 3 files changed, 48 deletions(-) diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c index 322fabde3..195845200 100644 --- a/libhb/qsv_common.c +++ b/libhb/qsv_common.c @@ -1015,11 +1015,6 @@ uint8_t hb_qsv_frametype_xlat(uint16_t qsv_frametype, uint16_t *out_flags) return frametype; } -void hb_qsv_impl_set_preferred(int impl) -{ - preferred_implementation = impl; -} - mfxIMPL hb_qsv_impl_get_preferred() { return preferred_implementation; diff --git a/libhb/qsv_common.h b/libhb/qsv_common.h index 8803c06ba..c79cd2aa1 100644 --- a/libhb/qsv_common.h +++ b/libhb/qsv_common.h @@ -131,7 +131,6 @@ int hb_qsv_param_parse (hb_qsv_param_t *param, const char *key, const ch const char* hb_qsv_frametype_name(uint16_t qsv_frametype); uint8_t hb_qsv_frametype_xlat(uint16_t qsv_frametype, uint16_t *out_flags); -void hb_qsv_impl_set_preferred(int impl); mfxIMPL hb_qsv_impl_get_preferred(); const char* hb_qsv_impl_get_name(int impl); diff --git a/test/test.c b/test/test.c index 282788abe..6fcc2e404 100644 --- a/test/test.c +++ b/test/test.c @@ -3765,7 +3765,6 @@ static int ParseOptions( int argc, char ** argv ) #define QSV_BASELINE 290 #define QSV_ASYNC_DEPTH 291 #define QSV_PRESET 292 - #define QSV_IMPLEMENTATION 293 for( ;; ) { @@ -3781,7 +3780,6 @@ static int ParseOptions( int argc, char ** argv ) { "qsv-preset", required_argument, NULL, QSV_PRESET, }, { "qsv-baseline", no_argument, NULL, QSV_BASELINE, }, { "qsv-async-depth", required_argument, NULL, QSV_ASYNC_DEPTH, }, - { "qsv-implementation", required_argument, NULL, QSV_IMPLEMENTATION, }, { "disable-qsv-decoding", no_argument, &qsv_decode, 0, }, #endif @@ -4429,46 +4427,6 @@ static int ParseOptions( int argc, char ** argv ) case QSV_PRESET: qsv_preset = strdup(optarg); break; - case QSV_IMPLEMENTATION: - if( optarg != NULL ) - { - if (!strcasecmp(optarg, "auto")) - { - hb_qsv_impl_set_preferred(MFX_IMPL_AUTO_ANY|MFX_IMPL_VIA_ANY); - } - else if (!strcasecmp(optarg, "auto1")) - { - hb_qsv_impl_set_preferred(MFX_IMPL_AUTO|MFX_IMPL_VIA_ANY); - } - else if (!strcasecmp(optarg, "software")) - { - hb_qsv_impl_set_preferred(MFX_IMPL_SOFTWARE); - } - else if (!strcasecmp(optarg, "hardware")) - { - hb_qsv_impl_set_preferred(MFX_IMPL_HARDWARE_ANY|MFX_IMPL_VIA_ANY); - } - else if (!strcasecmp(optarg, "hardware1")) - { - hb_qsv_impl_set_preferred(MFX_IMPL_HARDWARE|MFX_IMPL_VIA_ANY); - } - else if (!strcasecmp(optarg, "hardware2")) - { - hb_qsv_impl_set_preferred(MFX_IMPL_HARDWARE2|MFX_IMPL_VIA_ANY); - } - else if (!strcasecmp(optarg, "hardware3")) - { - hb_qsv_impl_set_preferred(MFX_IMPL_HARDWARE3|MFX_IMPL_VIA_ANY); - } - else if (!strcasecmp(optarg, "hardware4")) - { - hb_qsv_impl_set_preferred(MFX_IMPL_HARDWARE4|MFX_IMPL_VIA_ANY); - } - else - { - hb_qsv_impl_set_preferred(atoi(optarg)); - } - } break; #endif default: fprintf( stderr, "unknown option (%s)\n", argv[cur_optind] ); -- cgit v1.2.3