Commit 3312c8e5 authored by Simon Morlat's avatar Simon Morlat

fix compilation errors on linux and send i-frames every 10 seconds at most

parent 13ba2fb4
......@@ -58,6 +58,11 @@ if test $GCC = yes && test $wall_werror = yes; then
CFLAGS="$CFLAGS -Werror "
fi
if test $GCC = yes ; then
CFLAGS="$CFLAGS -pthread"
LDFLAGS="$LDFLAGS -pthread"
fi
PKG_CHECK_MODULES(MEDIASTREAMER, mediastreamer >= 2.7.0)
found_openh264=no
......
......@@ -105,7 +105,7 @@ static MSFilterMethod msopenh264_dec_methods[] = {
#define MSOPENH264_DEC_NOUTPUTS 1
#define MSOPENH264_DEC_FLAGS 0
#ifndef _MSC_VER
#if 0
MSFilterDesc msopenh264_dec_desc = {
.id = MS_FILTER_PLUGIN_ID,
......@@ -285,7 +285,7 @@ static MSFilterMethod msopenh264_enc_methods[] = {
#define MSOPENH264_ENC_NOUTPUTS 1
#define MSOPENH264_ENC_FLAGS 0
#ifndef _MSC_VER
#if 0
MSFilterDesc msopenh264_enc_desc = {
.id = MS_FILTER_PLUGIN_ID,
......
......@@ -112,7 +112,7 @@ MSOpenH264Encoder::MSOpenH264Encoder(MSFilter *f)
long ret = WelsCreateSVCEncoder(&mEncoder);
if (ret != 0) {
ms_error("OpenH264 encoder: Failed to create encoder: %l", ret);
ms_error("OpenH264 encoder: Failed to create encoder: %li", ret);
}
}
......@@ -145,7 +145,8 @@ void MSOpenH264Encoder::initialize()
params.iMaxBitrate = maxBitrate;
params.iRCMode = RC_LOW_BW_MODE;
params.fMaxFrameRate = mVConf.fps;
params.bEnableRc = true;
params.uiIntraPeriod=mVConf.fps*10;
//params.bEnableRc = true;
params.bEnableFrameSkip = true;
params.bPrefixNalAddingCtrl = false;
params.uiMaxNalSize = ms_get_payload_max_size();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment