lib/DllAvCodec.h | 18 ------------- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 22 ++++++++-------- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h | 2 +- .../dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp | 6 ++-- .../dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h | 2 +- xbmc/pvrclients/tvheadend/HTSPDemux.cpp | 22 ++++++++-------- xbmc/pvrclients/vdr-vnsi/VNSIDemux.cpp | 26 ++++++++++---------- 7 files changed, 40 insertions(+), 58 deletions(-) diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index acfbb49..72e819b 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -45,13 +45,11 @@ extern "C" { #if (defined USE_EXTERNAL_FFMPEG) #if (defined HAVE_LIBAVCODEC_AVCODEC_H) #include - #include #if (defined AVPACKET_IN_AVFORMAT) #include #endif #elif (defined HAVE_FFMPEG_AVCODEC_H) #include - #include #if (defined AVPACKET_IN_AVFORMAT) #include #endif @@ -84,18 +82,6 @@ extern "C" { CH_FRONT_LEFT_OF_CENTER|CH_FRONT_RIGHT_OF_CENTER) #endif -#if LIBAVCORE_VERSION_INT < AV_VERSION_INT(52,64,0) -// API added on: 2010-03-31 -#define AVMediaType CodecType -#define AVMEDIA_TYPE_UNKNOWN CODEC_TYPE_UNKNOWN -#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO -#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO -#define AVMEDIA_TYPE_DATA CODEC_TYPE_DATA -#define AVMEDIA_TYPE_SUBTITLE CODEC_TYPE_SUBTITLE -#define AVMEDIA_TYPE_ATTACHMENT CODEC_TYPE_ATTACHMENT -#define AVMEDIA_TYPE_NB CODEC_TYPE_NB -#endif - #include "threads/SingleLock.h" class DllAvCodecInterface @@ -132,7 +118,6 @@ public: virtual void avpicture_free(AVPicture *picture)=0; virtual void av_free_packet(AVPacket *pkt)=0; virtual int avpicture_alloc(AVPicture *picture, PixelFormat pix_fmt, int width, int height)=0; - virtual const AVOption *av_set_string(void *obj, const char *name, const char *val)=0; virtual enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt)=0; virtual int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic)=0; virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic)=0; @@ -221,7 +206,6 @@ public: virtual void avpicture_free(AVPicture *picture) { ::avpicture_free(picture); } virtual void av_free_packet(AVPacket *pkt) { ::av_free_packet(pkt); } virtual int avpicture_alloc(AVPicture *picture, PixelFormat pix_fmt, int width, int height) { return ::avpicture_alloc(picture, pix_fmt, width, height); } - virtual const AVOption *av_set_string(void *obj, const char *name, const char *val) { return ::av_set_string(obj, name, val); } virtual int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic) { return ::avcodec_default_get_buffer(s, pic); } virtual void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic) { ::avcodec_default_release_buffer(s, pic); } virtual enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt) { return ::avcodec_default_get_format(s, fmt); } @@ -298,7 +282,6 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface DEFINE_METHOD1(void, av_bitstream_filter_close, (AVBitStreamFilterContext *p1)) DEFINE_METHOD1(void, av_free_packet, (AVPacket *p1)) DEFINE_METHOD4(int, avpicture_alloc, (AVPicture *p1, PixelFormat p2, int p3, int p4)) - DEFINE_METHOD3(const AVOption*, av_set_string, (void *p1, const char *p2, const char *p3)) DEFINE_METHOD2(int, avcodec_default_get_buffer, (AVCodecContext *p1, AVFrame *p2)) DEFINE_METHOD2(void, avcodec_default_release_buffer, (AVCodecContext *p1, AVFrame *p2)) DEFINE_METHOD2(enum PixelFormat, avcodec_default_get_format, (struct AVCodecContext *p1, const enum PixelFormat *p2)) @@ -338,7 +321,6 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface RESOLVE_METHOD(avpicture_free) RESOLVE_METHOD(avpicture_alloc) RESOLVE_METHOD(av_free_packet) - RESOLVE_METHOD(av_set_string) RESOLVE_METHOD(avcodec_default_get_buffer) RESOLVE_METHOD(avcodec_default_release_buffer) RESOLVE_METHOD(avcodec_default_get_format) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index 39f3548..293fc38 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -176,7 +176,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options if(pCodec->id == hints.codec && pCodec->capabilities & CODEC_CAP_HWACCEL_VDPAU) { - if ((pCodec->id == CODEC_ID_MPEG4 || pCodec->id == CODEC_ID_XVID) && !g_advancedSettings.m_videoAllowMpeg4VDPAU) + if ((pCodec->id == CODEC_ID_MPEG4) && !g_advancedSettings.m_videoAllowMpeg4VDPAU) continue; CLog::Log(LOGNOTICE,"CDVDVideoCodecFFmpeg::Open() Creating VDPAU(%ix%i, %d)",hints.width, hints.height, hints.codec); @@ -252,7 +252,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options // set any special options for(CDVDCodecOptions::iterator it = options.begin(); it != options.end(); it++) { - m_dllAvCodec.av_set_string(m_pCodecContext, it->m_name.c_str(), it->m_value.c_str()); + m_dllAvUtil.av_set_string3(m_pCodecContext, it->m_name.c_str(), it->m_value.c_str(), 0, NULL); } #if defined(__APPLE__) && defined(__arm__) @@ -329,17 +329,17 @@ void CDVDVideoCodecFFmpeg::SetDropState(bool bDrop) // TODO: 'hurry_up' has been deprecated in favor of the skip_* variables // Use those instead. - m_pCodecContext->hurry_up = 1; - //m_pCodecContext->skip_frame = AVDISCARD_NONREF; - //m_pCodecContext->skip_idct = AVDISCARD_NONREF; - //m_pCodecContext->skip_loop_filter = AVDISCARD_NONREF; + //m_pCodecContext->hurry_up = 1; + m_pCodecContext->skip_frame = AVDISCARD_NONREF; + m_pCodecContext->skip_idct = AVDISCARD_NONREF; + m_pCodecContext->skip_loop_filter = AVDISCARD_NONREF; } else { - m_pCodecContext->hurry_up = 0; - //m_pCodecContext->skip_frame = AVDISCARD_DEFAULT; - //m_pCodecContext->skip_idct = AVDISCARD_DEFAULT; - //m_pCodecContext->skip_loop_filter = AVDISCARD_DEFAULT; + //m_pCodecContext->hurry_up = 0; + m_pCodecContext->skip_frame = AVDISCARD_DEFAULT; + m_pCodecContext->skip_idct = AVDISCARD_DEFAULT; + m_pCodecContext->skip_loop_filter = AVDISCARD_DEFAULT; } } } @@ -412,7 +412,7 @@ int CDVDVideoCodecFFmpeg::Decode(BYTE* pData, int iSize, double dts, double pts) return VC_ERROR; } - if (len != iSize && !m_pCodecContext->hurry_up) + if (len != iSize && m_pCodecContext->skip_frame != AVDISCARD_NONREF) CLog::Log(LOGWARNING, "%s - avcodec_decode_video didn't consume the full packet. size: %d, consumed: %d", __FUNCTION__, iSize, len); if (!iGotPicture) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h index fd76517..c68b357 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h @@ -124,7 +124,7 @@ protected: void UpdateCurrentPTS(); CRITICAL_SECTION m_critSection; - // #define MAX_STREAMS 42 // from avformat.h + #define MAX_STREAMS 100 CDemuxStream* m_streams[MAX_STREAMS]; // maximum number of streams that ffmpeg can handle ByteIOContext* m_ioContext; diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp index d4124dc..698362f 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp @@ -161,7 +161,7 @@ void CDVDDemuxPVRClient::RequestStreams() for (unsigned int i = 0; i < props->iStreamCount; ++i) { - if (props->stream[i].iCodecType == CODEC_TYPE_AUDIO) + if (props->stream[i].iCodecType == AVMEDIA_TYPE_AUDIO) { CDemuxStreamAudioPVRClient* st = new CDemuxStreamAudioPVRClient(this); st->iChannels = props->stream[i].iChannels; @@ -171,7 +171,7 @@ void CDVDDemuxPVRClient::RequestStreams() st->iBitsPerSample = props->stream[i].iBitsPerSample; m_streams[props->stream[i].iStreamIndex] = st; } - else if (props->stream[i].iCodecType == CODEC_TYPE_VIDEO) + else if (props->stream[i].iCodecType == AVMEDIA_TYPE_VIDEO) { CDemuxStreamVideoPVRClient* st = new CDemuxStreamVideoPVRClient(this); st->iFpsScale = props->stream[i].iFPSScale; @@ -185,7 +185,7 @@ void CDVDDemuxPVRClient::RequestStreams() { m_streams[props->stream[i].iStreamIndex] = new CDemuxStreamTeletext(); } - else if (props->stream[i].iCodecType == CODEC_TYPE_SUBTITLE) + else if (props->stream[i].iCodecType == AVMEDIA_TYPE_SUBTITLE) { CDemuxStreamSubtitlePVRClient* st = new CDemuxStreamSubtitlePVRClient(this); st->identifier = props->stream[i].iIdentifier; diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h index aa45b27..c9ad23c 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h @@ -96,7 +96,7 @@ public: protected: CDVDInputStream* m_pInput; - + #define MAX_STREAMS 100 CDemuxStream* m_streams[MAX_STREAMS]; // maximum number of streams that ffmpeg can handle private: diff --git a/xbmc/pvrclients/tvheadend/HTSPDemux.cpp b/xbmc/pvrclients/tvheadend/HTSPDemux.cpp index 5d9d8d8..bfc5d02 100644 --- a/xbmc/pvrclients/tvheadend/HTSPDemux.cpp +++ b/xbmc/pvrclients/tvheadend/HTSPDemux.cpp @@ -340,32 +340,32 @@ void CHTSPDemux::SubscriptionStart(htsmsg_t *m) if(!strcmp(type, "AC3")) { - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_AC3; } else if(!strcmp(type, "EAC3")) { - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_EAC3; } else if(!strcmp(type, "MPEG2AUDIO")) { - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_MP2; } else if(!strcmp(type, "AAC")) { - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_AAC; } else if(!strcmp(type, "MPEG2VIDEO")) { - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_VIDEO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_VIDEO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_MPEG2VIDEO; } else if(!strcmp(type, "H264")) { - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_VIDEO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_VIDEO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_H264; } else if(!strcmp(type, "DVBSUB")) @@ -374,20 +374,20 @@ void CHTSPDemux::SubscriptionStart(htsmsg_t *m) htsmsg_get_u32(sub, "composition_id", &composition_id); htsmsg_get_u32(sub, "ancillary_id" , &ancillary_id); - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_SUBTITLE; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_SUBTITLE; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_DVB_SUBTITLE; m_Streams.stream[m_Streams.iStreamCount].iIdentifier = (composition_id & 0xffff) | ((ancillary_id & 0xffff) << 16); HTSPSetDemuxStreamInfoLanguage(m_Streams.stream[m_Streams.iStreamCount], sub); } else if(!strcmp(type, "TEXTSUB")) { - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_SUBTITLE; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_SUBTITLE; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_TEXT; HTSPSetDemuxStreamInfoLanguage(m_Streams.stream[m_Streams.iStreamCount], sub); } // else if(!strcmp(type, "TELETEXT")) // { -// m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_SUBTITLE; +// m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_SUBTITLE; // m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_DVB_TELETEXT; // } else @@ -399,12 +399,12 @@ void CHTSPDemux::SubscriptionStart(htsmsg_t *m) { m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - if (m_Streams.stream[m_Streams.iStreamCount].iCodecType == CODEC_TYPE_AUDIO) + if (m_Streams.stream[m_Streams.iStreamCount].iCodecType == AVMEDIA_TYPE_AUDIO) { HTSPSetDemuxStreamInfoAudio(m_Streams.stream[m_Streams.iStreamCount], sub); HTSPSetDemuxStreamInfoLanguage(m_Streams.stream[m_Streams.iStreamCount], sub); } - else if (m_Streams.stream[m_Streams.iStreamCount].iCodecType == CODEC_TYPE_VIDEO) + else if (m_Streams.stream[m_Streams.iStreamCount].iCodecType == AVMEDIA_TYPE_VIDEO) HTSPSetDemuxStreamInfoVideo(m_Streams.stream[m_Streams.iStreamCount], sub); ++m_Streams.iStreamCount; } diff --git a/xbmc/pvrclients/vdr-vnsi/VNSIDemux.cpp b/xbmc/pvrclients/vdr-vnsi/VNSIDemux.cpp index fc2cabf..0519484 100644 --- a/xbmc/pvrclients/vdr-vnsi/VNSIDemux.cpp +++ b/xbmc/pvrclients/vdr-vnsi/VNSIDemux.cpp @@ -228,7 +228,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_AC3; m_Streams.stream[m_Streams.iStreamCount].strLanguage[0]= language[0]; m_Streams.stream[m_Streams.iStreamCount].strLanguage[1]= language[1]; @@ -245,7 +245,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_MP2; m_Streams.stream[m_Streams.iStreamCount].strLanguage[0]= language[0]; m_Streams.stream[m_Streams.iStreamCount].strLanguage[1]= language[1]; @@ -262,7 +262,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_AAC; m_Streams.stream[m_Streams.iStreamCount].strLanguage[0]= language[0]; m_Streams.stream[m_Streams.iStreamCount].strLanguage[1]= language[1]; @@ -279,7 +279,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_DTS; m_Streams.stream[m_Streams.iStreamCount].strLanguage[0]= language[0]; m_Streams.stream[m_Streams.iStreamCount].strLanguage[1]= language[1]; @@ -296,7 +296,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_AUDIO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_AUDIO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_EAC3; m_Streams.stream[m_Streams.iStreamCount].strLanguage[0]= language[0]; m_Streams.stream[m_Streams.iStreamCount].strLanguage[1]= language[1]; @@ -311,7 +311,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) { m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_VIDEO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_VIDEO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_MPEG2VIDEO; m_Streams.stream[m_Streams.iStreamCount].iFPSScale = resp->extract_U32(); m_Streams.stream[m_Streams.iStreamCount].iFPSRate = resp->extract_U32(); @@ -329,7 +329,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) { m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_VIDEO; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_VIDEO; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_H264; m_Streams.stream[m_Streams.iStreamCount].iFPSScale = resp->extract_U32(); m_Streams.stream[m_Streams.iStreamCount].iFPSRate = resp->extract_U32(); @@ -351,7 +351,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_SUBTITLE; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_SUBTITLE; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_DVB_SUBTITLE; m_Streams.stream[m_Streams.iStreamCount].strLanguage[0]= language[0]; m_Streams.stream[m_Streams.iStreamCount].strLanguage[1]= language[1]; @@ -368,7 +368,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_SUBTITLE; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_SUBTITLE; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_TEXT; m_Streams.stream[m_Streams.iStreamCount].strLanguage[0]= language[0]; m_Streams.stream[m_Streams.iStreamCount].strLanguage[1]= language[1]; @@ -383,7 +383,7 @@ void cVNSIDemux::StreamChange(cResponsePacket *resp) { m_Streams.stream[m_Streams.iStreamCount].iStreamIndex = m_Streams.iStreamCount; m_Streams.stream[m_Streams.iStreamCount].iPhysicalId = index; - m_Streams.stream[m_Streams.iStreamCount].iCodecType = CODEC_TYPE_SUBTITLE; + m_Streams.stream[m_Streams.iStreamCount].iCodecType = AVMEDIA_TYPE_SUBTITLE; m_Streams.stream[m_Streams.iStreamCount].iCodecId = CODEC_ID_DVB_TELETEXT; m_Streams.stream[m_Streams.iStreamCount].strLanguage[0]= 0; m_Streams.stream[m_Streams.iStreamCount].strLanguage[1]= 0; @@ -439,7 +439,7 @@ bool cVNSIDemux::StreamContentInfo(cResponsePacket *resp) uint32_t index = resp->extract_U32(); if (index == m_Streams.stream[i].iPhysicalId) { - if (m_Streams.stream[i].iCodecType == CODEC_TYPE_AUDIO) + if (m_Streams.stream[i].iCodecType == AVMEDIA_TYPE_AUDIO) { const char *language = resp->extract_String(); @@ -455,7 +455,7 @@ bool cVNSIDemux::StreamContentInfo(cResponsePacket *resp) delete[] language; } - else if (m_Streams.stream[i].iCodecType == CODEC_TYPE_VIDEO) + else if (m_Streams.stream[i].iCodecType == AVMEDIA_TYPE_VIDEO) { m_Streams.stream[i].iFPSScale = resp->extract_U32(); m_Streams.stream[i].iFPSRate = resp->extract_U32(); @@ -463,7 +463,7 @@ bool cVNSIDemux::StreamContentInfo(cResponsePacket *resp) m_Streams.stream[i].iWidth = resp->extract_U32(); m_Streams.stream[i].fAspect = resp->extract_Double(); } - else if (m_Streams.stream[i].iCodecType == CODEC_TYPE_SUBTITLE) + else if (m_Streams.stream[i].iCodecType == AVMEDIA_TYPE_SUBTITLE) { const char *language = resp->extract_String(); uint32_t composition_id = resp->extract_U32();