From d01ac185b80c77fbc74f1284289082a383e75a1f Mon Sep 17 00:00:00 2001 From: Ishmael Sameen Date: Fri, 26 Jul 2019 17:26:18 +0200 Subject: [PATCH] mfxh264enc: disable multiframe encode option when building on Windows Fixes intel/gstreamer-media-SDK#169 --- gst-libs/mfx/gstmfxencoder.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gst-libs/mfx/gstmfxencoder.c b/gst-libs/mfx/gstmfxencoder.c index ce7491ea..e1aaf74b 100644 --- a/gst-libs/mfx/gstmfxencoder.c +++ b/gst-libs/mfx/gstmfxencoder.c @@ -562,8 +562,9 @@ gst_mfx_encoder_finalize_params (GstMfxEncoder * encoder) /* Encoder expects progressive frames as input */ priv->params.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE; - if (MFX_CODEC_AVC == priv->profile.codec) { +#ifdef WITH_LIBVA_BACKEND #if MSDK_CHECK_VERSION(1,25) + if (MFX_CODEC_AVC == priv->profile.codec) { if (GST_MFX_CHECK_RUNTIME_VERSION (priv->aggregator, 1, 25)) { priv->extmfp.Header.BufferId = MFX_EXTBUFF_MULTI_FRAME_PARAM; priv->extmfp.Header.BufferSz = sizeof (priv->extmfp); @@ -571,8 +572,9 @@ gst_mfx_encoder_finalize_params (GstMfxEncoder * encoder) priv->extparam_internal[priv->params.NumExtParam++] = (mfxExtBuffer *) & priv->extmfp; } -#endif } +#endif +#endif /* Write colorimetry information to bitstream */ gst_mfx_encoder_extsig_from_colorimetry (encoder, @@ -1727,6 +1729,7 @@ gst_mfx_encoder_preset_get_type (void) return g_type; } +#ifdef WITH_LIBVA_BACKEND #if MSDK_CHECK_VERSION(1,25) GType gst_mfx_encoder_multiframe_get_type (void) @@ -1751,6 +1754,7 @@ gst_mfx_encoder_multiframe_get_type (void) return g_type; } #endif +#endif GType gst_mfx_encoder_trellis_get_type (void)