mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
nvenc: Fix MSVC build error C2121
This commit is contained in:
parent
6bf5ba993d
commit
3cd1d0c7bc
2 changed files with 25 additions and 15 deletions
|
@ -40,6 +40,18 @@ GST_DEBUG_CATEGORY_STATIC (gst_nv_h264_enc_debug);
|
|||
#define parent_class gst_nv_h264_enc_parent_class
|
||||
G_DEFINE_TYPE (GstNvH264Enc, gst_nv_h264_enc, GST_TYPE_NV_BASE_ENC);
|
||||
|
||||
#if HAVE_NVENC_GST_GL
|
||||
#define GL_CAPS_STR \
|
||||
";" \
|
||||
"video/x-raw(memory:GLMemory), " \
|
||||
"format = (string) { NV12, Y444 }, " \
|
||||
"width = (int) [ 16, 4096 ], height = (int) [ 16, 2160 ], " \
|
||||
"framerate = (fraction) [0, MAX]," \
|
||||
"interlace-mode = { progressive, mixed, interleaved } "
|
||||
#else
|
||||
#define GL_CAPS_STR ""
|
||||
#endif
|
||||
|
||||
/* *INDENT-OFF* */
|
||||
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_PAD_SINK,
|
||||
|
@ -48,14 +60,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
"width = (int) [ 16, 4096 ], height = (int) [ 16, 2160 ], "
|
||||
"framerate = (fraction) [0, MAX],"
|
||||
"interlace-mode = { progressive, mixed, interleaved } "
|
||||
#if HAVE_NVENC_GST_GL
|
||||
";"
|
||||
"video/x-raw(memory:GLMemory), "
|
||||
"format = (string) { NV12, Y444 }, "
|
||||
"width = (int) [ 16, 4096 ], height = (int) [ 16, 2160 ], "
|
||||
"framerate = (fraction) [0, MAX],"
|
||||
"interlace-mode = { progressive, mixed, interleaved } "
|
||||
#endif
|
||||
GL_CAPS_STR
|
||||
));
|
||||
|
||||
static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
|
||||
|
|
|
@ -41,6 +41,17 @@ GST_DEBUG_CATEGORY_STATIC (gst_nv_h265_enc_debug);
|
|||
#define parent_class gst_nv_h265_enc_parent_class
|
||||
G_DEFINE_TYPE (GstNvH265Enc, gst_nv_h265_enc, GST_TYPE_NV_BASE_ENC);
|
||||
|
||||
#if HAVE_NVENC_GST_GL
|
||||
#define GL_CAPS_STR \
|
||||
";" \
|
||||
"video/x-raw(memory:GLMemory), " \
|
||||
"format = (string) { NV12, Y444 }, " \
|
||||
"width = (int) [ 16, 4096 ], height = (int) [ 16, 2160 ], " \
|
||||
"framerate = (fraction) [0, MAX] "
|
||||
#else
|
||||
#define GL_CAPS_STR ""
|
||||
#endif
|
||||
|
||||
/* *INDENT-OFF* */
|
||||
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
|
||||
GST_PAD_SINK,
|
||||
|
@ -48,13 +59,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
|
|||
GST_STATIC_CAPS ("video/x-raw, " "format = (string) { NV12, I420 }, " // TODO: YV12, Y444 support
|
||||
"width = (int) [ 16, 4096 ], height = (int) [ 16, 2160 ], "
|
||||
"framerate = (fraction) [0, MAX] "
|
||||
#if HAVE_NVENC_GST_GL
|
||||
";"
|
||||
"video/x-raw(memory:GLMemory), "
|
||||
"format = (string) { NV12, Y444 }, "
|
||||
"width = (int) [ 16, 4096 ], height = (int) [ 16, 2160 ], "
|
||||
"framerate = (fraction) [0, MAX] "
|
||||
#endif
|
||||
GL_CAPS_STR
|
||||
));
|
||||
|
||||
static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
|
||||
|
|
Loading…
Reference in a new issue