diff options
| author | John Stebbins <[email protected]> | 2016-05-17 08:12:33 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2016-05-17 08:12:33 -0700 |
| commit | 141579c628e4d74fd6c7d00da0de388bdca7eabd (patch) | |
| tree | 5c6d365cb58945bba799c5c891487541d739f3b5 /test | |
| parent | 17433d4f622a561f1cc4fdef71ced517f9b997b5 (diff) | |
remove dxva hw decode (#189)
* remove dxva hw decode
It provides practically no speed increase even on a slow CPU and results
in a speed decrease on fast CPUs. And the code is exceptionally fugly.
* cli: remove USE_HWD
Diffstat (limited to 'test')
| -rw-r--r-- | test/module.defs | 3 | ||||
| -rw-r--r-- | test/test.c | 18 |
2 files changed, 0 insertions, 21 deletions
diff --git a/test/module.defs b/test/module.defs index 396b4b070..1154b9bb6 100644 --- a/test/module.defs +++ b/test/module.defs @@ -60,9 +60,6 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) ifeq ($(HAS.dlfcn),1) TEST.GCC.l += dl endif -ifeq (1,$(FEATURE.hwd)) - TEST.GCC.D += USE_HWD -endif ifeq (1,$(HAS.pthread)) TEST.GCC.l += pthread else diff --git a/test/test.c b/test/test.c index 8e58fa9e3..9e1dc9b01 100644 --- a/test/test.c +++ b/test/test.c @@ -164,7 +164,6 @@ static int64_t stop_at_pts = 0; static int stop_at_frame = 0; static uint64_t min_title_duration = 10; static int use_opencl = -1; -static int use_hwd = -1; #ifdef USE_QSV static int qsv_async_depth = -1; static int qsv_decode = -1; @@ -516,12 +515,6 @@ int main( int argc, char ** argv ) hb_system_sleep_prevent(h); - // FIXME: When hardware decode is enabled, the scan must be performed - // with hardware decode enabled because the decoder context used during - // encoding phase comes from the context used during scan. This is - // broken by design and I would very much like to fix this someday. - hb_hwd_set_enable(h, hb_value_get_bool( - hb_dict_get(preset_dict, "VideoHWDecode"))); hb_scan(h, input, titleindex, preview_count, store_previews, min_title_duration * 90000LL); @@ -1219,8 +1212,6 @@ static void ShowHelp() " -I, --ipod-atom Mark mp4 files so 5.5G iPods will accept them\n" " --no-ipod-atom Disable 5.5G iPod tag\n" " -P, --use-opencl Use OpenCL where applicable\n" -" -U, --use-hwd Use DXVA2 hardware decoding\n" -" --no-hwd Disable DXVA2 hardware decoding\n" "\n" @@ -1914,8 +1905,6 @@ static int ParseOptions( int argc, char ** argv ) { "ipod-atom", no_argument, NULL, 'I' }, { "no-ipod-atom",no_argument, &ipod_atom, 0 }, { "use-opencl", no_argument, NULL, 'P' }, - { "use-hwd", no_argument, NULL, 'U' }, - { "no-hwd", no_argument, &use_hwd, 0 }, { "title", required_argument, NULL, 't' }, { "min-duration",required_argument, NULL, MIN_DURATION }, @@ -2159,9 +2148,6 @@ static int ParseOptions( int argc, char ** argv ) case 'P': use_opencl = 1; break; - case 'U': - use_hwd = 1; - break; case 't': titleindex = atoi( optarg ); break; @@ -3556,10 +3542,6 @@ static hb_dict_t * PreparePreset(const char *preset_name) hb_dict_set(preset, "VideoQSVDecode", hb_value_int(qsv_decode)); } #endif - if (use_hwd != -1) - { - hb_dict_set(preset, "VideoHWDecode", hb_value_bool(use_hwd)); - } if (use_opencl != -1) { hb_dict_set(preset, "VideoScaler", |