History

Merge commit '136e7cf64ce9e78de7158d6720539d51cb96b743'

* commit '136e7cf64ce9e78de7158d6720539d51cb96b743': qsv/hevcdec: Load hw plugin by default on non-windows os

Mark Thompson committed 8 years ago

Commit b26dd5a2 parents 7d4fe0c 136e7cf1 file · +7 −1Browse files

Unified · Split

libavcodec/qsvdec_h2645.c+7−1
@@ -171,6 +171,12 @@ static void qsv_decode_flush(AVCodecContext *avctx) · 170 unmodified lines
171171 ff_qsv_decode_flush(avctx, &s->qsv);
172172 }
173173
174+#if defined(_WIN32)
175+#define LOAD_PLUGIN_DEFAULT LOAD_PLUGIN_HEVC_SW
176+#else
177+#define LOAD_PLUGIN_DEFAULT LOAD_PLUGIN_HEVC_HW
178+#endif
179+
174180 #define OFFSET(x) offsetof(QSVH2645Context, x)
175181 #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
176182
@@ -187,7 +193,7 @@ AVHWAccel ff_hevc_qsv_hwaccel = { · 10 unmodified lines
187193 static const AVOption hevc_options[] = {
188194 { "async_depth", "Internal parallelization depth, the higher the value the higher the latency.", OFFSET(qsv.async_depth), AV_OPT_TYPE_INT, { .i64 = ASYNC_DEPTH_DEFAULT }, 0, INT_MAX, VD },
189195
190− { "load_plugin", "A user plugin to load in an internal session", OFFSET(load_plugin), AV_OPT_TYPE_INT, { .i64 = LOAD_PLUGIN_HEVC_SW }, LOAD_PLUGIN_NONE, LOAD_PLUGIN_HEVC_HW, VD, "load_plugin" },
196+ { "load_plugin", "A user plugin to load in an internal session", OFFSET(load_plugin), AV_OPT_TYPE_INT, { .i64 = LOAD_PLUGIN_DEFAULT }, LOAD_PLUGIN_NONE, LOAD_PLUGIN_HEVC_HW, VD, "load_plugin" },
191197 { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = LOAD_PLUGIN_NONE }, 0, 0, VD, "load_plugin" },
192198 { "hevc_sw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = LOAD_PLUGIN_HEVC_SW }, 0, 0, VD, "load_plugin" },
193199 { "hevc_hw", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = LOAD_PLUGIN_HEVC_HW }, 0, 0, VD, "load_plugin" },

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t