Skip to content

Commit 214c6e6

Browse files
committed
Remove QSV workaround
1 parent 5127b0a commit 214c6e6

4 files changed

Lines changed: 1 addition & 143 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,6 @@ if (BUILD_AVS_PLUGIN OR BUILD_VS_PLUGIN)
150150
"${CMAKE_CURRENT_SOURCE_DIR}/common/osdep.c"
151151
"${CMAKE_CURRENT_SOURCE_DIR}/common/osdep.h"
152152
"${CMAKE_CURRENT_SOURCE_DIR}/common/progress.h"
153-
"${CMAKE_CURRENT_SOURCE_DIR}/common/qsv.c"
154-
"${CMAKE_CURRENT_SOURCE_DIR}/common/qsv.h"
155153
"${CMAKE_CURRENT_SOURCE_DIR}/common/utils.c"
156154
"${CMAKE_CURRENT_SOURCE_DIR}/common/utils.h"
157155
"${CMAKE_CURRENT_SOURCE_DIR}/common/video_output.c"

common/decode.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ extern "C" {
3030
#endif /* __cplusplus */
3131

3232
#include "decode.h"
33-
#include "qsv.h"
3433
#include "utils.h"
3534

3635
static const enum AVHWDeviceType hw_device_types[] = { [1] = AV_HWDEVICE_TYPE_CUDA, [2] = AV_HWDEVICE_TYPE_QSV };
@@ -175,7 +174,7 @@ int open_decoder(AVCodecContext** ctx, const AVCodecParameters* codecpar, const
175174
goto fail;
176175
else if (!strcmp(codec->name, "vp9") && (thread_count > 4 || !thread_count))
177176
c->thread_count = MIN(4, (!thread_count) ? av_cpu_count() : thread_count);
178-
if (codec->wrapper_name && !strcmp(codec->wrapper_name, "cuvid"))
177+
if (codec->wrapper_name && (!strcmp(codec->wrapper_name, "cuvid") || !strcmp(codec->wrapper_name, "qsv")))
179178
c->has_b_frames = 16; /* the maximum decoder latency for AVC and HEVC frame */
180179
AVDictionary* ff_d = NULL;
181180
if (codec->id == AV_CODEC_ID_AC3 && drc > -1) {
@@ -239,9 +238,6 @@ int open_decoder(AVCodecContext** ctx, const AVCodecParameters* codecpar, const
239238
av_dict_free(&ff_d);
240239
if (ret < 0)
241240
goto fail;
242-
if (is_qsv_decoder(c->codec))
243-
if ((ret = do_qsv_decoder_workaround(c)) < 0)
244-
goto fail;
245241
*ctx = c;
246242
return ret;
247243
fail:

common/qsv.c

Lines changed: 0 additions & 110 deletions
This file was deleted.

common/qsv.h

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)