Skip to content

Commit

Permalink
mfxh264enc: disable multiframe encode option when building on Windows
Browse files Browse the repository at this point in the history
Fixes intel#169
  • Loading branch information
ishmael1985 committed Jul 26, 2019
1 parent d5fbd1f commit 1836842
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions gst-libs/mfx/gstmfxencoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -562,17 +562,19 @@ 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);
priv->extmfp.MFMode = priv->multiframe_mode;
priv->extparam_internal[priv->params.NumExtParam++] =
(mfxExtBuffer *) & priv->extmfp;
}
#endif
}
#endif
#endif

/* Write colorimetry information to bitstream */
gst_mfx_encoder_extsig_from_colorimetry (encoder,
Expand Down Expand Up @@ -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)
Expand All @@ -1751,6 +1754,7 @@ gst_mfx_encoder_multiframe_get_type (void)
return g_type;
}
#endif
#endif

GType
gst_mfx_encoder_trellis_get_type (void)
Expand Down

0 comments on commit 1836842

Please sign in to comment.