Commit b64992a4 authored by Simon Morlat's avatar Simon Morlat

compile and looks to be working

parent b96e8f74
...@@ -65,8 +65,8 @@ static const MSVideoConfiguration openh264_conf_list[] = { ...@@ -65,8 +65,8 @@ static const MSVideoConfiguration openh264_conf_list[] = {
MSOpenH264Encoder::MSOpenH264Encoder(MSFilter *f) MSOpenH264Encoder::MSOpenH264Encoder(MSFilter *f)
: mFilter(f), mPacker(0), mPacketisationMode(0), mVConfList(openh264_conf_list), mFrameCount(0), mLastIDRFrameCount(0), : mFilter(f), mPacker(0), mPacketisationMode(0), mVConfList(openh264_conf_list), mFrameCount(0),
mInitialized(false), mPacketisationModeSet(false), mAVPFEnabled(false), mLastFIRSeqNr(-1) mInitialized(false), mPacketisationModeSet(false), mAVPFEnabled(false)
{ {
long ret = WelsCreateSVCEncoder(&mEncoder); long ret = WelsCreateSVCEncoder(&mEncoder);
if (ret != 0) { if (ret != 0) {
...@@ -190,7 +190,7 @@ void MSOpenH264Encoder::feed() ...@@ -190,7 +190,7 @@ void MSOpenH264Encoder::feed()
if (ret == cmResultSuccess) { if (ret == cmResultSuccess) {
if ((sFbi.eFrameType != videoFrameTypeSkip) && (sFbi.eFrameType != videoFrameTypeInvalid)) { if ((sFbi.eFrameType != videoFrameTypeSkip) && (sFbi.eFrameType != videoFrameTypeInvalid)) {
if (sFbi.eFrameType == videoFrameTypeIDR) { if (sFbi.eFrameType == videoFrameTypeIDR) {
ms_iframe_requests_limiter_notify_iframe_sent(&mIFrameLimiter); ms_iframe_requests_limiter_notify_iframe_sent(&mIFrameLimiter, mFilter->ticker->time);
ms_message("MSOpenH264Encoder: sending IDR"); ms_message("MSOpenH264Encoder: sending IDR");
} }
mFrameCount++; mFrameCount++;
......
...@@ -21,8 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -21,8 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "mediastreamer2/msfilter.h" #include "mediastreamer2/msfilter.h"
#include "mediastreamer2/msvideo.h" #include "mediastreamer2/msvideo.h"
#include "mediastreamer2/rfc3984.h" #include "mediastreamer2/rfc3984.h"
#include "mediastreamer2/videostarter.h" #include "mediastreamer2/mscodecutils.h"
#include "mediastreamer2/msiframerequestslimiter.h"
#include "wels/codec_api.h" #include "wels/codec_api.h"
#include "msopenh264.h" #include "msopenh264.h"
......
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