diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index db007a1..3d98ca8 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -72,8 +72,8 @@ public: virtual void avcodec_register_all(void)=0; virtual void avcodec_flush_buffers(AVCodecContext *avctx)=0; virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options)=0; - virtual AVCodec *avcodec_find_decoder(enum CodecID id)=0; - virtual AVCodec *avcodec_find_encoder(enum CodecID id)=0; + virtual AVCodec *avcodec_find_decoder(enum AVCodecID id)=0; + virtual AVCodec *avcodec_find_encoder(enum AVCodecID id)=0; virtual int avcodec_close_dont_call(AVCodecContext *avctx)=0; virtual AVFrame *avcodec_alloc_frame(void)=0; virtual int avpicture_fill(AVPicture *picture, uint8_t *ptr, PixelFormat pix_fmt, int width, int height)=0; @@ -129,8 +129,8 @@ public: } virtual int avcodec_open2_dont_call(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) { *(volatile int *)0x0 = 0; return 0; } virtual int avcodec_close_dont_call(AVCodecContext *avctx) { *(volatile int *)0x0 = 0; return 0; } - virtual AVCodec *avcodec_find_decoder(enum CodecID id) { return ::avcodec_find_decoder(id); } - virtual AVCodec *avcodec_find_encoder(enum CodecID id) { return ::avcodec_find_encoder(id); } + virtual AVCodec *avcodec_find_decoder(enum AVCodecID id) { return ::avcodec_find_decoder(id); } + virtual AVCodec *avcodec_find_encoder(enum AVCodecID id) { return ::avcodec_find_encoder(id); } virtual int avcodec_close(AVCodecContext *avctx) { CSingleLock lock(DllAvCodec::m_critSection); @@ -203,8 +203,8 @@ class DllAvCodec : public DllDynamic, DllAvCodecInterface LOAD_SYMBOLS(); DEFINE_METHOD0(void, avcodec_register_all_dont_call) - DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum CodecID p1)) - DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum CodecID p1)) + DEFINE_METHOD1(AVCodec*, avcodec_find_decoder, (enum AVCodecID p1)) + DEFINE_METHOD1(AVCodec*, avcodec_find_encoder, (enum AVCodecID p1)) DEFINE_METHOD1(int, avcodec_close_dont_call, (AVCodecContext *p1)) DEFINE_METHOD0(AVFrame*, avcodec_alloc_frame) DEFINE_METHOD5(int, avpicture_fill, (AVPicture *p1, uint8_t *p2, PixelFormat p3, int p4, int p5)) diff --git a/xbmc/cdrip/EncoderFFmpeg.cpp b/xbmc/cdrip/EncoderFFmpeg.cpp index 20ddbcd..1bd8f44 100644 --- a/xbmc/cdrip/EncoderFFmpeg.cpp +++ b/xbmc/cdrip/EncoderFFmpeg.cpp @@ -67,7 +67,7 @@ bool CEncoderFFmpeg::Init(const char* strFile, int iInChannels, int iInRate, int AVCodec *codec; codec = m_dllAvCodec.avcodec_find_encoder( - strcmp(fmt->name, "ogg") == 0 ? CODEC_ID_VORBIS : fmt->audio_codec + strcmp(fmt->name, "ogg") == 0 ? AV_CODEC_ID_VORBIS : fmt->audio_codec ); if (!codec) diff --git a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp index d6463b3..7933e19 100644 --- a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp +++ b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp @@ -109,10 +109,10 @@ bool CAEEncoderFFmpeg::Initialize(AEAudioFormat &format) if (dts && (!ac3 || g_advancedSettings.m_audioTranscodeTo.Equals("dts"))) { m_CodecName = "DTS"; - m_CodecID = CODEC_ID_DTS; + m_AVCodecID = AV_CODEC_ID_DTS; m_PackFunc = &CAEPackIEC61937::PackDTS_1024; m_BitRate = DTS_ENCODE_BITRATE; - codec = m_dllAvCodec.avcodec_find_encoder(m_CodecID); + codec = m_dllAvCodec.avcodec_find_encoder(m_AVCodecID); } #endif @@ -120,10 +120,10 @@ bool CAEEncoderFFmpeg::Initialize(AEAudioFormat &format) if (!codec && ac3) { m_CodecName = "AC3"; - m_CodecID = CODEC_ID_AC3; + m_AVCodecID = AV_CODEC_ID_AC3; m_PackFunc = &CAEPackIEC61937::PackAC3; m_BitRate = AC3_ENCODE_BITRATE; - codec = m_dllAvCodec.avcodec_find_encoder(m_CodecID); + codec = m_dllAvCodec.avcodec_find_encoder(m_AVCodecID); } /* check we got the codec */ @@ -226,9 +226,9 @@ unsigned int CAEEncoderFFmpeg::GetBitRate() return m_BitRate; } -CodecID CAEEncoderFFmpeg::GetCodecID() +AVCodecID CAEEncoderFFmpeg::GetAVCodecID() { - return m_CodecID; + return m_AVCodecID; } unsigned int CAEEncoderFFmpeg::GetFrames() diff --git a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h index b69f8c6..e6f8371 100644 --- a/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h +++ b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h @@ -39,7 +39,7 @@ public: virtual void Reset(); virtual unsigned int GetBitRate (); - virtual CodecID GetCodecID (); + virtual AVCodecID GetAVCodecID (); virtual unsigned int GetFrames (); virtual int Encode (float *data, unsigned int frames); @@ -51,7 +51,7 @@ private: DllAvUtil m_dllAvUtil; std::string m_CodecName; - CodecID m_CodecID; + AVCodecID m_AVCodecID; unsigned int m_BitRate; CAEPackIEC61937::PackFunc m_PackFunc; diff --git a/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h b/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h index 9613d02..75fd83f 100644 --- a/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h +++ b/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h @@ -64,10 +64,10 @@ public: virtual unsigned int GetBitRate() = 0; /** - * Returns the CodecID of the encoder + * Returns the AVCodecID of the encoder * @return the ffmpeg codec id */ - virtual CodecID GetCodecID() = 0; + virtual AVCodecID GetAVCodecID() = 0; /** * Return the number of frames needed to encode diff --git a/xbmc/cores/amlplayer/AMLPlayer.cpp b/xbmc/cores/amlplayer/AMLPlayer.cpp index ebf8f1c..aa9879b 100644 --- a/xbmc/cores/amlplayer/AMLPlayer.cpp +++ b/xbmc/cores/amlplayer/AMLPlayer.cpp @@ -387,16 +387,16 @@ void CAMLSubTitleThread::Process(void) /* TODO: handle other subtitle codec types // subtitle codecs - CODEC_ID_DVD_SUBTITLE= 0x17000, - CODEC_ID_DVB_SUBTITLE, - CODEC_ID_TEXT, ///< raw UTF-8 text - CODEC_ID_XSUB, - CODEC_ID_SSA, - CODEC_ID_MOV_TEXT, - CODEC_ID_HDMV_PGS_SUBTITLE, - CODEC_ID_DVB_TELETEXT, - CODEC_ID_SRT, - CODEC_ID_MICRODVD, + AV_CODEC_ID_DVD_SUBTITLE= 0x17000, + AV_CODEC_ID_DVB_SUBTITLE, + AV_CODEC_ID_TEXT, ///< raw UTF-8 text + AV_CODEC_ID_XSUB, + AV_CODEC_ID_SSA, + AV_CODEC_ID_MOV_TEXT, + AV_CODEC_ID_HDMV_PGS_SUBTITLE, + AV_CODEC_ID_DVB_TELETEXT, + AV_CODEC_ID_SRT, + AV_CODEC_ID_MICRODVD, */ switch(sub_type) { @@ -405,12 +405,12 @@ void CAMLSubTitleThread::Process(void) "sub_type(0x%x), size(%d), bgntime(%lld), endtime(%lld), string(%s)", sub_type, sub_size-20, subtitle->bgntime, subtitle->endtime, &sub_buffer[20]); break; - case CODEC_ID_TEXT: + case AV_CODEC_ID_TEXT: subtitle->bgntime = sub_pts/ 90; subtitle->endtime = subtitle->bgntime + 4000; subtitle->string = &sub_buffer[20]; break; - case CODEC_ID_SSA: + case AV_CODEC_ID_SSA: if (strncmp((const char*)&sub_buffer[20], "Dialogue:", 9) == 0) { int vars_found, hour1, min1, sec1, hunsec1, hour2, min2, sec2, hunsec2, nothing; diff --git a/xbmc/cores/dvdplayer/DVDAudio.cpp b/xbmc/cores/dvdplayer/DVDAudio.cpp index bdb9c2a..7a9436b 100644 --- a/xbmc/cores/dvdplayer/DVDAudio.cpp +++ b/xbmc/cores/dvdplayer/DVDAudio.cpp @@ -116,7 +116,7 @@ CDVDAudio::~CDVDAudio() free(m_pBuffer); } -bool CDVDAudio::Create(const DVDAudioFrame &audioframe, CodecID codec, bool needresampler) +bool CDVDAudio::Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler) { CLog::Log(LOGNOTICE, "Creating audio stream (codec id: %i, channels: %i, sample rate: %i, %s)", diff --git a/xbmc/cores/dvdplayer/DVDAudio.h b/xbmc/cores/dvdplayer/DVDAudio.h index b2cbd46..cac066c 100644 --- a/xbmc/cores/dvdplayer/DVDAudio.h +++ b/xbmc/cores/dvdplayer/DVDAudio.h @@ -31,7 +31,7 @@ class IAEStream; #ifndef _LINUX -enum CodecID; +enum AVCodecID; #else extern "C" { #if (defined USE_EXTERNAL_FFMPEG) @@ -80,7 +80,7 @@ public: float GetCurrentAttenuation(); void Pause(); void Resume(); - bool Create(const DVDAudioFrame &audioframe, CodecID codec, bool needresampler); + bool Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool needresampler); bool IsValidFormat(const DVDAudioFrame &audioframe); void Destroy(); DWORD AddPackets(const DVDAudioFrame &audioframe); diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.cpp index 0c08900..0a0a723 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.cpp @@ -23,7 +23,7 @@ CDVDAudioCodecLPcm::CDVDAudioCodecLPcm() : CDVDAudioCodecPcm() { - m_codecID = CODEC_ID_NONE; + m_codecID = AV_CODEC_ID_NONE; m_bufferSize = LPCM_BUFFER_SIZE; memset(m_buffer, 0, sizeof(m_buffer)); } @@ -33,11 +33,11 @@ bool CDVDAudioCodecLPcm::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) m_codecID = hints.codec; CDVDStreamInfo hints2(hints, true); - hints2.codec = CODEC_ID_NONE; + hints2.codec = AV_CODEC_ID_NONE; #if 0 - if (hints.codecID = CODEC_ID_LPCM_S24BE) hints2.codec = CODEC_ID_PCM_S24BE; + if (hints.codecID = AV_CODEC_ID_LPCM_S24BE) hints2.codec = AV_CODEC_ID_PCM_S24BE; #endif - if (hints2.codec != CODEC_ID_NONE) + if (hints2.codec != AV_CODEC_ID_NONE) return CDVDAudioCodecPcm::Open(hints2, options); return false; @@ -54,7 +54,7 @@ int CDVDAudioCodecLPcm::Decode(BYTE* pData, int iSize) if (iSize >= 12) { #if 0 - if (m_codecID == CODEC_ID_LPCM_S24BE) + if (m_codecID == AV_CODEC_ID_LPCM_S24BE) #endif { for (iDecoded = 0; iDecoded <= (iSize - 12); iDecoded += 12) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.h index a4f112f..060d3dc 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecLPcm.h @@ -40,5 +40,5 @@ protected: int m_bufferSize; BYTE m_buffer[LPCM_BUFFER_SIZE]; - CodecID m_codecID; + AVCodecID m_codecID; }; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp index b23ef60..394cd7d 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp @@ -67,12 +67,12 @@ bool CDVDAudioCodecPassthrough::Open(CDVDStreamInfo &hints, CDVDCodecOptions &op m_bufferSize = 0; if ( - (hints.codec == CODEC_ID_AC3 && bSupportsAC3Out) || - (hints.codec == CODEC_ID_DTS && bSupportsDTSOut) || + (hints.codec == AV_CODEC_ID_AC3 && bSupportsAC3Out) || + (hints.codec == AV_CODEC_ID_DTS && bSupportsDTSOut) || (audioMode == AUDIO_HDMI && ( - (hints.codec == CODEC_ID_EAC3 && bSupportsAC3Out ) || - (hints.codec == CODEC_ID_TRUEHD && bSupportsTrueHDOut) + (hints.codec == AV_CODEC_ID_EAC3 && bSupportsAC3Out ) || + (hints.codec == AV_CODEC_ID_TRUEHD && bSupportsTrueHDOut) ) ) ) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp index c8523b7..0ae99a5 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.cpp @@ -139,7 +139,7 @@ bool CDVDAudioCodecPassthroughFFmpeg::SetupMuxer(CDVDStreamInfo &hints, CStdStri /* set the stream's parameters */ m_SampleRate = hints.samplerate; - if(!m_SampleRate && hints.codec == CODEC_ID_AC3) + if(!m_SampleRate && hints.codec == AV_CODEC_ID_AC3) m_SampleRate = 48000; AVCodecContext *codec = muxer.m_pStream->codec; @@ -277,9 +277,9 @@ bool CDVDAudioCodecPassthroughFFmpeg::SupportsFormat(CDVDStreamInfo &hints) { m_pSyncFrame = NULL; - if (m_bSupportsAC3Out && hints.codec == CODEC_ID_AC3) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncAC3; - else if (m_bSupportsDTSOut && hints.codec == CODEC_ID_DTS) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncDTS; - else if (m_bSupportsAACOut && hints.codec == CODEC_ID_AAC) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncAAC; + if (m_bSupportsAC3Out && hints.codec == AV_CODEC_ID_AC3) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncAC3; + else if (m_bSupportsDTSOut && hints.codec == AV_CODEC_ID_DTS) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncDTS; + else if (m_bSupportsAACOut && hints.codec == AV_CODEC_ID_AAC) m_pSyncFrame = &CDVDAudioCodecPassthroughFFmpeg::SyncAAC; else return false; return true; @@ -328,7 +328,7 @@ bool CDVDAudioCodecPassthroughFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptio else { /* aac needs to be wrapped into ADTS frames */ - if (hints.codec == CODEC_ID_AAC) + if (hints.codec == AV_CODEC_ID_AAC) if (!SetupMuxer(hints, "adts", m_ADTS)) { CLog::Log(LOGERROR, "CDVDAudioCodecPassthroughFFmpeg::Open - Unable to setup ADTS muxer"); @@ -481,8 +481,8 @@ enum AEDataFormat CDVDAudioCodecPassthroughFFmpeg::GetDataFormat() { switch(m_codec) { - case CODEC_ID_AC3: return AE_FMT_AC3; - case CODEC_ID_DTS: return AE_FMT_DTS; + case AV_CODEC_ID_AC3: return AE_FMT_AC3; + case AV_CODEC_ID_DTS: return AE_FMT_DTS; default: return AE_FMT_INVALID; //Unknown stream type } diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h index 8f305c5..1f2da43 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthroughFFmpeg.h @@ -94,7 +94,7 @@ private: unsigned int m_Needed; bool m_LostSync; int m_SampleRate; - CodecID m_codec; + AVCodecID m_codec; unsigned int (CDVDAudioCodecPassthroughFFmpeg::*m_pSyncFrame)(BYTE* pData, unsigned int iSize, unsigned int *fSize); unsigned int SyncAC3(BYTE* pData, unsigned int iSize, unsigned int *fSize); diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp index f399714..daf274e 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.cpp @@ -113,7 +113,7 @@ CDVDAudioCodecPcm::CDVDAudioCodecPcm() : CDVDAudioCodec() m_iSourceSampleRate = 0; m_iSourceBitrate = 0; m_decodedDataSize = 0; - m_codecID = CODEC_ID_NONE; + m_codecID = AV_CODEC_ID_NONE; m_iOutputChannels = 0; memset(m_decodedData, 0, sizeof(m_decodedData)); @@ -136,12 +136,12 @@ bool CDVDAudioCodecPcm::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) switch (m_codecID) { - case CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_ALAW: { for (int i = 0; i < 256; i++) table[i] = alaw2linear(i); break; } - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_MULAW: { for (int i = 0; i < 256; i++) table[i] = ulaw2linear(i); break; @@ -177,31 +177,31 @@ int CDVDAudioCodecPcm::Decode(BYTE* pData, int iSize) switch (m_codecID) { - case CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S32LE: decode_to16(4, 1, 0, &src, &samples, buf_size); break; - case CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_S32BE: decode_to16(4, 0, 0, &src, &samples, buf_size); break; - case CODEC_ID_PCM_U32LE: + case AV_CODEC_ID_PCM_U32LE: decode_to16(4, 1, 1, &src, &samples, buf_size); break; - case CODEC_ID_PCM_U32BE: + case AV_CODEC_ID_PCM_U32BE: decode_to16(4, 0, 1, &src, &samples, buf_size); break; - case CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S24LE: decode_to16(3, 1, 0, &src, &samples, buf_size); break; - case CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_S24BE: decode_to16(3, 0, 0, &src, &samples, buf_size); break; - case CODEC_ID_PCM_U24LE: + case AV_CODEC_ID_PCM_U24LE: decode_to16(3, 1, 1, &src, &samples, buf_size); break; - case CODEC_ID_PCM_U24BE: + case AV_CODEC_ID_PCM_U24BE: decode_to16(3, 0, 1, &src, &samples, buf_size); break; - case CODEC_ID_PCM_S24DAUD: + case AV_CODEC_ID_PCM_S24DAUD: n = buf_size / 3; for(;n>0;n--) { uint32_t v = src[0] << 16 | src[1] << 8 | src[2]; @@ -211,50 +211,50 @@ int CDVDAudioCodecPcm::Decode(BYTE* pData, int iSize) src += 3; } break; - case CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16LE: n = buf_size >> 1; for(;n>0;n--) { *samples++ = src[0] | (src[1] << 8); src += 2; } break; - case CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16BE: n = buf_size >> 1; for(;n>0;n--) { *samples++ = (src[0] << 8) | src[1]; src += 2; } break; - case CODEC_ID_PCM_U16LE: + case AV_CODEC_ID_PCM_U16LE: n = buf_size >> 1; for(;n>0;n--) { *samples++ = (src[0] | (src[1] << 8)) - 0x8000; src += 2; } break; - case CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_U16BE: n = buf_size >> 1; for(;n>0;n--) { *samples++ = ((src[0] << 8) | src[1]) - 0x8000; src += 2; } break; - case CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_S8: n = buf_size; for(;n>0;n--) { *samples++ = src[0] << 8; src++; } break; - case CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_U8: n = buf_size; for(;n>0;n--) { *samples++ = ((int)src[0] - 128) << 8; src++; } break; - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: n = buf_size; for(;n>0;n--) { *samples++ = table[src[0]]; @@ -281,7 +281,7 @@ void CDVDAudioCodecPcm::SetDefault() m_iSourceSampleRate = 0; m_iSourceBitrate = 0; m_decodedDataSize = 0; - m_codecID = CODEC_ID_NONE; + m_codecID = AV_CODEC_ID_NONE; } void CDVDAudioCodecPcm::Reset() diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h index 79feea2..79e1bdf 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPcm.h @@ -44,7 +44,7 @@ protected: short m_decodedData[131072]; // could be a bit to big int m_decodedDataSize; - CodecID m_codecID; + AVCodecID m_codecID; int m_iSourceSampleRate; int m_iSourceChannels; int m_iSourceBitrate; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h index 74b0313..3413943 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h @@ -23,7 +23,7 @@ #if (defined HAVE_CONFIG_H) && (!defined WIN32) #include "config.h" #endif -// enum CodecID +// enum AVCodecID #include <string> #include <vector> diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp index 0cea7a9..043789f 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp @@ -173,7 +173,7 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, unsigne CLog::Log(LOGDEBUG, "CDVDFactoryCodec: compiled in hardware support: %s", hwSupport.c_str()); // dvd's have weird still-frames in it, which is not fully supported in ffmpeg - if(hint.stills && (hint.codec == CODEC_ID_MPEG2VIDEO || hint.codec == CODEC_ID_MPEG1VIDEO)) + if(hint.stills && (hint.codec == AV_CODEC_ID_MPEG2VIDEO || hint.codec == AV_CODEC_ID_MPEG1VIDEO)) { if( (pCodec = OpenCodec(new CDVDVideoCodecLibMpeg2(), hint, options)) ) return pCodec; } @@ -182,7 +182,7 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, unsigne { if (g_sysinfo.HasVDADecoder()) { - if (hint.codec == CODEC_ID_H264 && !hint.ptsinvalid) + if (hint.codec == AV_CODEC_ID_H264 && !hint.ptsinvalid) { if ( (pCodec = OpenCodec(new CDVDVideoCodecVDA(), hint, options)) ) return pCodec; } @@ -197,8 +197,8 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, unsigne { switch(hint.codec) { - case CODEC_ID_H264: - if (hint.codec == CODEC_ID_H264 && hint.ptsinvalid) + case AV_CODEC_ID_H264: + if (hint.codec == AV_CODEC_ID_H264 && hint.ptsinvalid) break; if ( (pCodec = OpenCodec(new CDVDVideoCodecVideoToolBox(), hint, options)) ) return pCodec; break; @@ -216,13 +216,13 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, unsigne { switch(hint.codec) { - case CODEC_ID_VC1: - case CODEC_ID_WMV3: - case CODEC_ID_H264: - case CODEC_ID_MPEG2VIDEO: - if (hint.codec == CODEC_ID_H264 && hint.ptsinvalid) + case AV_CODEC_ID_VC1: + case AV_CODEC_ID_WMV3: + case AV_CODEC_ID_H264: + case AV_CODEC_ID_MPEG2VIDEO: + if (hint.codec == AV_CODEC_ID_H264 && hint.ptsinvalid) break; - if (hint.codec == CODEC_ID_MPEG2VIDEO && hint.width <= 720) + if (hint.codec == AV_CODEC_ID_MPEG2VIDEO && hint.width <= 720) break; if ( (pCodec = OpenCodec(new CDVDVideoCodecCrystalHD(), hint, options)) ) return pCodec; break; @@ -236,7 +236,7 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, unsigne #if defined(HAVE_LIBOPENMAX) if (g_guiSettings.GetBool("videoplayer.useomx") && !hint.software ) { - if (hint.codec == CODEC_ID_H264 || hint.codec == CODEC_ID_MPEG2VIDEO || hint.codec == CODEC_ID_VC1) + if (hint.codec == AV_CODEC_ID_H264 || hint.codec == AV_CODEC_ID_MPEG2VIDEO || hint.codec == AV_CODEC_ID_VC1) { if ( (pCodec = OpenCodec(new CDVDVideoCodecOpenMax(), hint, options)) ) return pCodec; } @@ -271,8 +271,8 @@ CDVDAudioCodec* CDVDFactoryCodec::CreateAudioCodec( CDVDStreamInfo &hint, bool p #if defined(TARGET_DARWIN_OSX) || defined(TARGET_DARWIN_IOS) switch(hint.codec) { - case CODEC_ID_AC3: - case CODEC_ID_DTS: + case AV_CODEC_ID_AC3: + case AV_CODEC_ID_DTS: pCodec = OpenCodec( new CDVDAudioCodecPassthroughFFmpeg(), hint, options ); if( pCodec ) return pCodec; break; @@ -286,39 +286,39 @@ CDVDAudioCodec* CDVDFactoryCodec::CreateAudioCodec( CDVDStreamInfo &hint, bool p switch (hint.codec) { - case CODEC_ID_MP2: - case CODEC_ID_MP3: + case AV_CODEC_ID_MP2: + case AV_CODEC_ID_MP3: { pCodec = OpenCodec( new CDVDAudioCodecLibMad(), hint, options ); if( pCodec ) return pCodec; break; } - case CODEC_ID_PCM_S32LE: - case CODEC_ID_PCM_S32BE: - case CODEC_ID_PCM_U32LE: - case CODEC_ID_PCM_U32BE: - case CODEC_ID_PCM_S24LE: - case CODEC_ID_PCM_S24BE: - case CODEC_ID_PCM_U24LE: - case CODEC_ID_PCM_U24BE: - case CODEC_ID_PCM_S24DAUD: - case CODEC_ID_PCM_S16LE: - case CODEC_ID_PCM_S16BE: - case CODEC_ID_PCM_U16LE: - case CODEC_ID_PCM_U16BE: - case CODEC_ID_PCM_S8: - case CODEC_ID_PCM_U8: - case CODEC_ID_PCM_ALAW: - case CODEC_ID_PCM_MULAW: + case AV_CODEC_ID_PCM_S32LE: + case AV_CODEC_ID_PCM_S32BE: + case AV_CODEC_ID_PCM_U32LE: + case AV_CODEC_ID_PCM_U32BE: + case AV_CODEC_ID_PCM_S24LE: + case AV_CODEC_ID_PCM_S24BE: + case AV_CODEC_ID_PCM_U24LE: + case AV_CODEC_ID_PCM_U24BE: + case AV_CODEC_ID_PCM_S24DAUD: + case AV_CODEC_ID_PCM_S16LE: + case AV_CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_U16LE: + case AV_CODEC_ID_PCM_U16BE: + case AV_CODEC_ID_PCM_S8: + case AV_CODEC_ID_PCM_U8: + case AV_CODEC_ID_PCM_ALAW: + case AV_CODEC_ID_PCM_MULAW: { pCodec = OpenCodec( new CDVDAudioCodecPcm(), hint, options ); if( pCodec ) return pCodec; break; } #if 0 - //case CODEC_ID_LPCM_S16BE: - //case CODEC_ID_LPCM_S20BE: - case CODEC_ID_LPCM_S24BE: + //case AV_CODEC_ID_LPCM_S16BE: + //case AV_CODEC_ID_LPCM_S20BE: + case AV_CODEC_ID_LPCM_S24BE: { pCodec = OpenCodec( new CDVDAudioCodecLPcm(), hint, options ); if( pCodec ) return pCodec; @@ -345,12 +345,12 @@ CDVDOverlayCodec* CDVDFactoryCodec::CreateOverlayCodec( CDVDStreamInfo &hint ) switch (hint.codec) { - case CODEC_ID_TEXT: + case AV_CODEC_ID_TEXT: pCodec = OpenCodec(new CDVDOverlayCodecText(), hint, options); if( pCodec ) return pCodec; break; - case CODEC_ID_SSA: + case AV_CODEC_ID_SSA: pCodec = OpenCodec(new CDVDOverlayCodecSSA(), hint, options); if( pCodec ) return pCodec; @@ -358,7 +358,7 @@ CDVDOverlayCodec* CDVDFactoryCodec::CreateOverlayCodec( CDVDStreamInfo &hint ) if( pCodec ) return pCodec; break; - case CODEC_ID_MOV_TEXT: + case AV_CODEC_ID_MOV_TEXT: pCodec = OpenCodec(new CDVDOverlayCodecTX3G(), hint, options); if( pCodec ) return pCodec; break; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp index a85eae1..1909971 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp @@ -182,7 +182,7 @@ int CDVDOverlayCodecFFmpeg::Decode(DemuxPacket *pPacket) double pts_offset = 0.0; - if (m_pCodecContext->codec_id == CODEC_ID_HDMV_PGS_SUBTITLE && m_Subtitle.format == 0) + if (m_pCodecContext->codec_id == AV_CODEC_ID_HDMV_PGS_SUBTITLE && m_Subtitle.format == 0) { // for pgs subtitles the packet pts of the end_segments are wrong // instead use the subtitle pts to calc the offset here diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp index 7db7865..f47ec4e 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp @@ -44,7 +44,7 @@ CDVDOverlayCodecSSA::~CDVDOverlayCodecSSA() bool CDVDOverlayCodecSSA::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) { - if(hints.codec != CODEC_ID_SSA) + if(hints.codec != AV_CODEC_ID_SSA) return false; Dispose(); diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp index 95fdf73..3b7db54 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp @@ -75,7 +75,7 @@ CDVDOverlayCodecTX3G::~CDVDOverlayCodecTX3G() bool CDVDOverlayCodecTX3G::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) { - if (hints.codec == CODEC_ID_MOV_TEXT) + if (hints.codec == AV_CODEC_ID_MOV_TEXT) return true; return false; } diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp index abaaccb..e51a3fd 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp @@ -41,8 +41,8 @@ CDVDOverlayCodecText::~CDVDOverlayCodecText() bool CDVDOverlayCodecText::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) { - m_bIsSSA = (hints.codec == CODEC_ID_SSA); - if(hints.codec == CODEC_ID_TEXT || hints.codec == CODEC_ID_SSA) + m_bIsSSA = (hints.codec == AV_CODEC_ID_SSA); + if(hints.codec == AV_CODEC_ID_TEXT || hints.codec == AV_CODEC_ID_SSA) return true; return false; } diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp index 4b7a12f..a0f4b9f 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp @@ -1259,7 +1259,7 @@ bool CCrystalHD::OpenDecoder(CRYSTALHD_CODEC_TYPE codec_type, CDVDStreamInfo &hi return false; #if (HAVE_LIBCRYSTALHD == 2) && defined(TARGET_WINDOWS) - // Drivers prior to 3.6.9.32 don't have proper support for CRYSTALHD_CODEC_ID_AVC1 + // Drivers prior to 3.6.9.32 don't have proper support for CRYSTALHD_AV_CODEC_ID_AVC1 // The internal version numbers are different for some reason... if ( (m_bc_info_crystal.dilVersion.dilRelease < 3) || (m_bc_info_crystal.dilVersion.dilRelease == 3 && m_bc_info_crystal.dilVersion.dilMajor < 22) @@ -1269,7 +1269,7 @@ bool CCrystalHD::OpenDecoder(CRYSTALHD_CODEC_TYPE codec_type, CDVDStreamInfo &hi CGUIDialogKaiToast::QueueNotification(CGUIDialogKaiToast::Warning, "CrystalHD", g_localizeStrings.Get(2101)); CLog::Log(LOGWARNING, "CrystalHD drivers too old, please upgrade to 3.6.9 or later. Make sure to uninstall the old version first or the upgrade won't work."); - if (codec_type == CRYSTALHD_CODEC_ID_AVC1) + if (codec_type == CRYSTALHD_AV_CODEC_ID_AVC1) return false; } #endif @@ -1277,29 +1277,29 @@ bool CCrystalHD::OpenDecoder(CRYSTALHD_CODEC_TYPE codec_type, CDVDStreamInfo &hi uint32_t videoAlg = 0; switch (codec_type) { - case CRYSTALHD_CODEC_ID_VC1: + case CRYSTALHD_AV_CODEC_ID_VC1: videoAlg = BCM::BC_VID_ALGO_VC1; StreamType = BCM::BC_STREAM_TYPE_ES; m_convert_bitstream = false; break; - case CRYSTALHD_CODEC_ID_WVC1: + case CRYSTALHD_AV_CODEC_ID_WVC1: videoAlg = BCM::BC_VID_ALGO_VC1MP; StreamType = BCM::BC_STREAM_TYPE_ES; m_convert_bitstream = false; break; - case CRYSTALHD_CODEC_ID_WMV3: + case CRYSTALHD_AV_CODEC_ID_WMV3: if (!m_has_bcm70015) return false; videoAlg = BCM::BC_VID_ALGO_VC1MP; StreamType = BCM::BC_STREAM_TYPE_ES; m_convert_bitstream = false; break; - case CRYSTALHD_CODEC_ID_H264: + case CRYSTALHD_AV_CODEC_ID_H264: videoAlg = BCM::BC_VID_ALGO_H264; StreamType = BCM::BC_STREAM_TYPE_ES; m_convert_bitstream = false; break; - case CRYSTALHD_CODEC_ID_AVC1: + case CRYSTALHD_AV_CODEC_ID_AVC1: videoAlg = BCM::BC_VID_ALGO_H264; StreamType = BCM::BC_STREAM_TYPE_ES; if (!m_new_lib) @@ -1307,7 +1307,7 @@ bool CCrystalHD::OpenDecoder(CRYSTALHD_CODEC_TYPE codec_type, CDVDStreamInfo &hi else m_convert_bitstream = false; break; - case CRYSTALHD_CODEC_ID_MPEG2: + case CRYSTALHD_AV_CODEC_ID_MPEG2: videoAlg = BCM::BC_VID_ALGO_MPEG2; StreamType = BCM::BC_STREAM_TYPE_ES; m_convert_bitstream = false; @@ -1326,25 +1326,25 @@ bool CCrystalHD::OpenDecoder(CRYSTALHD_CODEC_TYPE codec_type, CDVDStreamInfo &hi m_chd_params.sps_pps_buf = NULL; switch (codec_type) { - case CRYSTALHD_CODEC_ID_VC1: + case CRYSTALHD_AV_CODEC_ID_VC1: Subtype = BCM::BC_MSUBTYPE_VC1; pMetaData = (uint8_t*)hints.extradata; metaDataSz = hints.extrasize; break; - case CRYSTALHD_CODEC_ID_WVC1: + case CRYSTALHD_AV_CODEC_ID_WVC1: Subtype = BCM::BC_MSUBTYPE_WVC1; break; - case CRYSTALHD_CODEC_ID_WMV3: + case CRYSTALHD_AV_CODEC_ID_WMV3: Subtype = BCM::BC_MSUBTYPE_WMV3; pMetaData = (uint8_t*)hints.extradata; metaDataSz = hints.extrasize; break; - case CRYSTALHD_CODEC_ID_H264: + case CRYSTALHD_AV_CODEC_ID_H264: Subtype = BCM::BC_MSUBTYPE_H264; pMetaData = (uint8_t*)hints.extradata; metaDataSz = hints.extrasize; break; - case CRYSTALHD_CODEC_ID_AVC1: + case CRYSTALHD_AV_CODEC_ID_AVC1: Subtype = BCM::BC_MSUBTYPE_AVC1; m_chd_params.sps_pps_buf = (uint8_t*)malloc(1000); if (!extract_sps_pps_from_avcc(hints.extrasize, hints.extradata)) @@ -1359,7 +1359,7 @@ bool CCrystalHD::OpenDecoder(CRYSTALHD_CODEC_TYPE codec_type, CDVDStreamInfo &hi startCodeSz = m_chd_params.nal_size_bytes; } break; - case CRYSTALHD_CODEC_ID_MPEG2: + case CRYSTALHD_AV_CODEC_ID_MPEG2: Subtype = BCM::BC_MSUBTYPE_MPEG2VIDEO; pMetaData = (uint8_t*)hints.extradata; metaDataSz = hints.extrasize; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h index 7d30332..d6cc556 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.h @@ -89,12 +89,12 @@ public: //////////////////////////////////////////////////////////////////////////////////////////// enum _CRYSTALHD_CODEC_TYPES { - CRYSTALHD_CODEC_ID_MPEG2 = 0, - CRYSTALHD_CODEC_ID_H264 = 1, - CRYSTALHD_CODEC_ID_AVC1 = 2, - CRYSTALHD_CODEC_ID_VC1 = 3, - CRYSTALHD_CODEC_ID_WMV3 = 4, - CRYSTALHD_CODEC_ID_WVC1 = 5, + CRYSTALHD_AV_CODEC_ID_MPEG2 = 0, + CRYSTALHD_AV_CODEC_ID_H264 = 1, + CRYSTALHD_AV_CODEC_ID_AVC1 = 2, + CRYSTALHD_AV_CODEC_ID_VC1 = 3, + CRYSTALHD_AV_CODEC_ID_WMV3 = 4, + CRYSTALHD_AV_CODEC_ID_WVC1 = 5, }; typedef uint32_t CRYSTALHD_CODEC_TYPE; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp index c304078..5a9a048 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecCrystalHD.cpp @@ -40,7 +40,7 @@ CDVDVideoCodecCrystalHD::CDVDVideoCodecCrystalHD() : m_DropPictures(false), m_Duration(0.0), m_pFormatName(""), - m_CodecType(CRYSTALHD_CODEC_ID_MPEG2) + m_CodecType(CRYSTALHD_AV_CODEC_ID_MPEG2) { } @@ -55,11 +55,11 @@ bool CDVDVideoCodecCrystalHD::Open(CDVDStreamInfo &hints, CDVDCodecOptions &opti { switch (hints.codec) { - case CODEC_ID_MPEG2VIDEO: - m_CodecType = CRYSTALHD_CODEC_ID_MPEG2; + case AV_CODEC_ID_MPEG2VIDEO: + m_CodecType = CRYSTALHD_AV_CODEC_ID_MPEG2; m_pFormatName = "chd-mpeg2"; break; - case CODEC_ID_H264: + case AV_CODEC_ID_H264: switch(hints.profile) { case FF_PROFILE_H264_HIGH_10: @@ -80,18 +80,18 @@ bool CDVDVideoCodecCrystalHD::Open(CDVDStreamInfo &hints, CDVDCodecOptions &opti } // valid avcC data (bitstream) always starts with the value 1 (version) if ( *(char*)hints.extradata == 1 ) - m_CodecType = CRYSTALHD_CODEC_ID_AVC1; + m_CodecType = CRYSTALHD_AV_CODEC_ID_AVC1; else - m_CodecType = CRYSTALHD_CODEC_ID_H264; + m_CodecType = CRYSTALHD_AV_CODEC_ID_H264; m_pFormatName = "chd-h264"; break; - case CODEC_ID_VC1: - m_CodecType = CRYSTALHD_CODEC_ID_VC1; + case AV_CODEC_ID_VC1: + m_CodecType = CRYSTALHD_AV_CODEC_ID_VC1; m_pFormatName = "chd-vc1"; break; - case CODEC_ID_WMV3: - m_CodecType = CRYSTALHD_CODEC_ID_WMV3; + case AV_CODEC_ID_WMV3: + m_CodecType = CRYSTALHD_AV_CODEC_ID_WMV3; m_pFormatName = "chd-wmv3"; break; default: diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index 8f81637..eca44dd 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -103,7 +103,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx #ifdef HAVE_LIBVA // mpeg4 vaapi decoding is disabled if(*cur == PIX_FMT_VAAPI_VLD && g_guiSettings.GetBool("videoplayer.usevaapi") - && (avctx->codec_id != CODEC_ID_MPEG4 || g_advancedSettings.m_videoAllowMpeg4VAAPI)) + && (avctx->codec_id != AV_CODEC_ID_MPEG4 || g_advancedSettings.m_videoAllowMpeg4VAAPI)) { VAAPI::CDecoder* dec = new VAAPI::CDecoder(); if(dec->Open(avctx, *cur)) @@ -176,7 +176,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options pCodec = NULL; m_pCodecContext = NULL; - if (hints.codec == CODEC_ID_H264) + if (hints.codec == AV_CODEC_ID_H264) { switch(hints.profile) { @@ -200,7 +200,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) && !g_advancedSettings.m_videoAllowMpeg4VDPAU) + if ((pCodec->id == AV_CODEC_ID_MPEG4) && !g_advancedSettings.m_videoAllowMpeg4VDPAU) continue; CLog::Log(LOGNOTICE,"CDVDVideoCodecFFmpeg::Open() Creating VDPAU(%ix%i, %d)",hints.width, hints.height, hints.codec); @@ -214,7 +214,7 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options if(vdp->Open(m_pCodecContext, pCodec->pix_fmts ? pCodec->pix_fmts[0] : PIX_FMT_NONE)) { m_pHardware = vdp; - m_pCodecContext->codec_id = CODEC_ID_NONE; // ffmpeg will complain if this has been set + m_pCodecContext->codec_id = AV_CODEC_ID_NONE; // ffmpeg will complain if this has been set break; } m_dllAvUtil.av_freep(&m_pCodecContext); @@ -254,8 +254,8 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options // ffmpeg with enabled neon will crash and burn if this is enabled m_pCodecContext->flags &= CODEC_FLAG_EMU_EDGE; #else - if (pCodec->id != CODEC_ID_H264 && pCodec->capabilities & CODEC_CAP_DR1 - && pCodec->id != CODEC_ID_VP8 + if (pCodec->id != AV_CODEC_ID_H264 && pCodec->capabilities & CODEC_CAP_DR1 + && pCodec->id != AV_CODEC_ID_VP8 ) m_pCodecContext->flags |= CODEC_FLAG_EMU_EDGE; #endif @@ -293,8 +293,8 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options int num_threads = std::min(8 /*MAX_THREADS*/, g_cpuInfo.getCPUCount()); if( num_threads > 1 && !hints.software && m_pHardware == NULL // thumbnail extraction fails when run threaded - && ( pCodec->id == CODEC_ID_H264 - || pCodec->id == CODEC_ID_MPEG4 )) + && ( pCodec->id == AV_CODEC_ID_H264 + || pCodec->id == AV_CODEC_ID_MPEG4 )) m_pCodecContext->thread_count = num_threads; if (m_dllAvCodec.avcodec_open2(m_pCodecContext, pCodec, NULL) < 0) @@ -492,8 +492,8 @@ int CDVDVideoCodecFFmpeg::Decode(BYTE* pData, int iSize, double dts, double pts) m_iLastKeyframe = 300; /* h264 doesn't always have keyframes + won't output before first keyframe anyway */ - if(m_pCodecContext->codec_id == CODEC_ID_H264 - || m_pCodecContext->codec_id == CODEC_ID_SVQ3) + if(m_pCodecContext->codec_id == AV_CODEC_ID_H264 + || m_pCodecContext->codec_id == AV_CODEC_ID_SVQ3) m_started = true; if(m_pHardware == NULL) diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp index 1981d01..977c7e9 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp @@ -26,7 +26,7 @@ /* I really don't want to include ffmpeg headers here, could */ /* potentially interfere with libmpeg2's, so let's just define this */ #ifndef _LINUX -const int CODEC_ID_MPEG1VIDEO = 1; +const int AV_CODEC_ID_MPEG1VIDEO = 1; #endif enum MPEGProfile diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp index f1f30ba..077f60f 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp @@ -58,7 +58,7 @@ bool CDVDVideoCodecOpenMax::Open(CDVDStreamInfo &hints, CDVDCodecOptions &option switch (hints.codec) { - case CODEC_ID_H264: + case AV_CODEC_ID_H264: { m_pFormatName = "omx-h264"; if (hints.extrasize < 7 || hints.extradata == NULL) @@ -72,13 +72,13 @@ bool CDVDVideoCodecOpenMax::Open(CDVDStreamInfo &hints, CDVDCodecOptions &option m_convert_bitstream = bitstream_convert_init(hints.extradata, hints.extrasize); } break; - case CODEC_ID_MPEG4: + case AV_CODEC_ID_MPEG4: m_pFormatName = "omx-mpeg4"; break; - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: m_pFormatName = "omx-mpeg2"; break; - case CODEC_ID_VC1: + case AV_CODEC_ID_VC1: m_pFormatName = "omx-vc1"; break; default: diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp index e4511a6..788e7f6 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp @@ -697,7 +697,7 @@ bool CDVDVideoCodecVDA::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options) switch (hints.codec) { - case CODEC_ID_H264: + case AV_CODEC_ID_H264: // source must be H.264 with valid avcC atom data in extradata if (extrasize < 7 || extradata == NULL) { diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp index 11e7919..7334d1b 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp @@ -538,7 +538,7 @@ quicktime_esds_t* quicktime_set_esds(DllAvFormat *av_format_ctx, const uint8_t * esds->esid = 0; esds->stream_priority = 0; // 16 ? 0x1f - esds->objectTypeId = 32; // 32 = CODEC_ID_MPEG4, 33 = CODEC_ID_H264 + esds->objectTypeId = 32; // 32 = AV_CODEC_ID_MPEG4, 33 = AV_CODEC_ID_H264 // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio) // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved) esds->streamType = 0x11; @@ -1095,7 +1095,7 @@ bool CDVDVideoCodecVideoToolBox::Open(CDVDStreamInfo &hints, CDVDCodecOptions &o switch (hints.codec) { - case CODEC_ID_MPEG4: + case AV_CODEC_ID_MPEG4: if (extrasize) { AVIOContext *pb; @@ -1127,12 +1127,12 @@ bool CDVDVideoCodecVideoToolBox::Open(CDVDStreamInfo &hints, CDVDCodecOptions &o m_pFormatName = "vtb-mpeg4"; break; - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: m_fmt_desc = CreateFormatDescription(kVTFormatMPEG2Video, width, height); m_pFormatName = "vtb-mpeg2"; break; - case CODEC_ID_H264: + case AV_CODEC_ID_H264: if (extrasize < 7 || extradata == NULL) { //m_fmt_desc = CreateFormatDescription(kVTFormatH264, width, height); diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp index 5cf0566..e36b29a 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp @@ -95,19 +95,19 @@ typedef struct { /* XXX Prefered modes must come first */ static const dxva2_mode_t dxva2_modes[] = { - { "MPEG2 VLD", &DXVA2_ModeMPEG2_VLD, CODEC_ID_MPEG2VIDEO }, - { "MPEG1/2 VLD", &DXVA_ModeMPEG2and1_VLD, CODEC_ID_MPEG2VIDEO }, + { "MPEG2 VLD", &DXVA2_ModeMPEG2_VLD, AV_CODEC_ID_MPEG2VIDEO }, + { "MPEG1/2 VLD", &DXVA_ModeMPEG2and1_VLD, AV_CODEC_ID_MPEG2VIDEO }, { "MPEG2 MoComp", &DXVA2_ModeMPEG2_MoComp, 0 }, { "MPEG2 IDCT", &DXVA2_ModeMPEG2_IDCT, 0 }, // Intel drivers return standard modes in addition to the Intel specific ones. Try the Intel specific first, they work better for Sandy Bridges. - { "Intel H.264 VLD, no FGT", &DXVADDI_Intel_ModeH264_E, CODEC_ID_H264 }, + { "Intel H.264 VLD, no FGT", &DXVADDI_Intel_ModeH264_E, AV_CODEC_ID_H264 }, { "Intel H.264 inverse discrete cosine transform (IDCT), no FGT", &DXVADDI_Intel_ModeH264_C, 0 }, { "Intel H.264 motion compensation (MoComp), no FGT", &DXVADDI_Intel_ModeH264_A, 0 }, { "Intel VC-1 VLD", &DXVADDI_Intel_ModeVC1_E, 0 }, - { "H.264 variable-length decoder (VLD), FGT", &DXVA2_ModeH264_F, CODEC_ID_H264 }, - { "H.264 VLD, no FGT", &DXVA2_ModeH264_E, CODEC_ID_H264 }, + { "H.264 variable-length decoder (VLD), FGT", &DXVA2_ModeH264_F, AV_CODEC_ID_H264 }, + { "H.264 VLD, no FGT", &DXVA2_ModeH264_E, AV_CODEC_ID_H264 }, { "H.264 IDCT, FGT", &DXVA2_ModeH264_D, 0, }, { "H.264 inverse discrete cosine transform (IDCT), no FGT", &DXVA2_ModeH264_C, 0, }, { "H.264 MoComp, FGT", &DXVA2_ModeH264_B, 0, }, @@ -120,10 +120,10 @@ static const dxva2_mode_t dxva2_modes[] = { { "Windows Media Video 9 MoComp", &DXVA2_ModeWMV9_B, 0 }, { "Windows Media Video 9 post processing", &DXVA2_ModeWMV9_A, 0 }, - { "VC-1 VLD", &DXVA2_ModeVC1_D, CODEC_ID_VC1 }, - { "VC-1 VLD", &DXVA2_ModeVC1_D, CODEC_ID_WMV3 }, - { "VC-1 VLD 2010", &DXVA_ModeVC1_D2010, CODEC_ID_VC1 }, - { "VC-1 VLD 2010", &DXVA_ModeVC1_D2010, CODEC_ID_WMV3 }, + { "VC-1 VLD", &DXVA2_ModeVC1_D, AV_CODEC_ID_VC1 }, + { "VC-1 VLD", &DXVA2_ModeVC1_D, AV_CODEC_ID_WMV3 }, + { "VC-1 VLD 2010", &DXVA_ModeVC1_D2010, AV_CODEC_ID_VC1 }, + { "VC-1 VLD 2010", &DXVA_ModeVC1_D2010, AV_CODEC_ID_WMV3 }, { "VC-1 IDCT", &DXVA2_ModeVC1_C, 0 }, { "VC-1 MoComp", &DXVA2_ModeVC1_B, 0 }, { "VC-1 post processing", &DXVA2_ModeVC1_A, 0 }, @@ -435,7 +435,7 @@ static bool HasVP3WidthBug(AVCodecContext *avctx) static bool CheckCompatibility(AVCodecContext *avctx) { // The incompatibilities are all for H264 - if(avctx->codec_id != CODEC_ID_H264) + if(avctx->codec_id != AV_CODEC_ID_H264) return true; // Macroblock width incompatibility @@ -626,7 +626,7 @@ bool CDecoder::Open(AVCodecContext *avctx, enum PixelFormat fmt, unsigned int su if(m_refs == 0) { - if(avctx->codec_id == CODEC_ID_H264) + if(avctx->codec_id == AV_CODEC_ID_H264) m_refs = 16; else m_refs = 2; @@ -771,9 +771,9 @@ int CDecoder::Check(AVCodecContext* avctx) } // Status reports are available only for the DXVA2_ModeH264 and DXVA2_ModeVC1 modes - if(avctx->codec_id != CODEC_ID_H264 - && avctx->codec_id != CODEC_ID_VC1 - && avctx->codec_id != CODEC_ID_WMV3) + if(avctx->codec_id != AV_CODEC_ID_H264 + && avctx->codec_id != AV_CODEC_ID_VC1 + && avctx->codec_id != AV_CODEC_ID_WMV3) return 0; DXVA2_DecodeExecuteParams params = {}; @@ -786,7 +786,7 @@ int CDecoder::Check(AVCodecContext* avctx) params.pExtensionData = &data; data.Function = DXVA_STATUS_REPORTING_FUNCTION; data.pPrivateOutputData = &status; - data.PrivateOutputDataSize = avctx->codec_id == CODEC_ID_H264 ? sizeof(DXVA_Status_H264) : sizeof(DXVA_Status_VC1); + data.PrivateOutputDataSize = avctx->codec_id == AV_CODEC_ID_H264 ? sizeof(DXVA_Status_H264) : sizeof(DXVA_Status_VC1); HRESULT hr; if(FAILED( hr = m_decoder->Execute(¶ms))) { @@ -794,7 +794,7 @@ int CDecoder::Check(AVCodecContext* avctx) return VC_ERROR; } - if(avctx->codec_id == CODEC_ID_H264) + if(avctx->codec_id == AV_CODEC_ID_H264) { if(status.h264.bStatus) CLog::Log(LOGWARNING, "DXVA - decoder problem of status %d with %d", status.h264.bStatus, status.h264.bBufType); diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp index 357d720..7ebd391 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp @@ -115,7 +115,7 @@ bool COpenMaxVideo::Open(CDVDStreamInfo &hints) switch (hints.codec) { - case CODEC_ID_H264: + case AV_CODEC_ID_H264: { switch(hints.profile) { @@ -140,7 +140,7 @@ bool COpenMaxVideo::Open(CDVDStreamInfo &hints) } } break; - case CODEC_ID_MPEG4: + case AV_CODEC_ID_MPEG4: // (role name) video_decoder.mpeg4 // MPEG-4, DivX 4/5 and Xvid compatible decoder_name = OMX_MPEG4_DECODER; @@ -154,12 +154,12 @@ bool COpenMaxVideo::Open(CDVDStreamInfo &hints) m_pFormatName = "omx-mpeg4"; break; */ - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: // (role name) video_decoder.mpeg2 // MPEG-2 decoder_name = OMX_MPEG2V_DECODER; break; - case CODEC_ID_VC1: + case AV_CODEC_ID_VC1: // (role name) video_decoder.vc1 // VC-1, WMV9 decoder_name = OMX_VC1_DECODER; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp index 9f5a960..6271392 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp @@ -268,14 +268,14 @@ bool CDecoder::Open(AVCodecContext *avctx, enum PixelFormat fmt, unsigned int su vector<VAProfile> accepted; switch (avctx->codec_id) { - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: accepted.push_back(VAProfileMPEG2Main); break; - case CODEC_ID_MPEG4: - case CODEC_ID_H263: + case AV_CODEC_ID_MPEG4: + case AV_CODEC_ID_H263: accepted.push_back(VAProfileMPEG4AdvancedSimple); break; - case CODEC_ID_H264: + case AV_CODEC_ID_H264: { #ifdef FF_PROFILE_H264_BASELINE if (avctx->profile == FF_PROFILE_H264_BASELINE) @@ -294,10 +294,10 @@ bool CDecoder::Open(AVCodecContext *avctx, enum PixelFormat fmt, unsigned int su } break; } - case CODEC_ID_WMV3: + case AV_CODEC_ID_WMV3: accepted.push_back(VAProfileVC1Main); break; - case CODEC_ID_VC1: + case AV_CODEC_ID_VC1: accepted.push_back(VAProfileVC1Advanced); break; default: @@ -383,7 +383,7 @@ bool CDecoder::EnsureContext(AVCodecContext *avctx) m_refs = avctx->refs; if(m_refs == 0) { - if(avctx->codec_id == CODEC_ID_H264) + if(avctx->codec_id == AV_CODEC_ID_H264) m_refs = 16; else m_refs = 2; diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp index f70a4f9..42c316e 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp @@ -184,10 +184,10 @@ bool CVDPAU::Open(AVCodecContext* avctx, const enum PixelFormat, unsigned int su SpewHardwareAvailable(); VdpDecoderProfile profile = 0; - if(avctx->codec_id == CODEC_ID_H264) + if(avctx->codec_id == AV_CODEC_ID_H264) profile = VDP_DECODER_PROFILE_H264_HIGH; #ifdef VDP_DECODER_PROFILE_MPEG4_PART2_ASP - else if(avctx->codec_id == CODEC_ID_MPEG4) + else if(avctx->codec_id == AV_CODEC_ID_MPEG4) profile = VDP_DECODER_PROFILE_MPEG4_PART2_ASP; #endif if(profile) diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp index 3f9909e..13a0eb1 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp @@ -31,8 +31,8 @@ void CDemuxStreamAudio::GetStreamType(std::string& strInfo) { char sInfo[64]; - if (codec == CODEC_ID_AC3) strcpy(sInfo, "AC3 "); - else if (codec == CODEC_ID_DTS) + if (codec == AV_CODEC_ID_AC3) strcpy(sInfo, "AC3 "); + else if (codec == AV_CODEC_ID_DTS) { #ifdef FF_PROFILE_DTS_HD_MA if (profile == FF_PROFILE_DTS_HD_MA) @@ -43,7 +43,7 @@ void CDemuxStreamAudio::GetStreamType(std::string& strInfo) #endif strcpy(sInfo, "DTS "); } - else if (codec == CODEC_ID_MP2) strcpy(sInfo, "MP2 "); + else if (codec == AV_CODEC_ID_MP2) strcpy(sInfo, "MP2 "); else strcpy(sInfo, ""); if (iChannels == 1) strcat(sInfo, "Mono"); diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h index aac0cce..121a2d4 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h @@ -35,7 +35,7 @@ class CDVDInputStream; #include "config.h" #endif #ifndef _LINUX -enum CodecID; +enum AVCodecID; #include <libavcodec/avcodec.h> #else extern "C" { @@ -88,7 +88,7 @@ public: { iId = 0; iPhysicalId = 0; - codec = (CodecID)0; // CODEC_ID_NONE + codec = (AVCodecID)0; // AV_CODEC_ID_NONE codec_fourcc = 0; profile = FF_PROFILE_UNKNOWN; level = 0; @@ -118,7 +118,7 @@ public: int iId; // most of the time starting from 0 int iPhysicalId; // id - CodecID codec; + AVCodecID codec; unsigned int codec_fourcc; // if available int profile; // encoder profile of the stream reported by the decoder. used to qualify hw decoders. int level; // encoder level of the stream reported by the decoder. used to qualify hw decoders. diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp index b0f6244..2621da1 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp @@ -90,7 +90,7 @@ bool CDVDDemuxBXA::Open(CDVDInputStream* pInput) m_stream->iBitRate = m_header.sampleRate * m_header.channels * m_header.bitsPerSample; m_stream->iChannels = m_header.channels; m_stream->type = STREAM_AUDIO; - m_stream->codec = CODEC_ID_PCM_S16LE; + m_stream->codec = AV_CODEC_ID_PCM_S16LE; return true; } diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp index 35d0fc5..efd8cae 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp @@ -450,7 +450,7 @@ bool CDVDDemuxFFmpeg::Open(CDVDInputStream* pInput) if (iErr < 0) { CLog::Log(LOGWARNING,"could not find codec parameters for %s", strFile.c_str()); - if (m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) || (m_pFormatContext->nb_streams == 1 && m_pFormatContext->streams[0]->codec->codec_id == CODEC_ID_AC3)) + if (m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) || (m_pFormatContext->nb_streams == 1 && m_pFormatContext->streams[0]->codec->codec_id == AV_CODEC_ID_AC3)) { // special case, our codecs can still handle it. } @@ -715,7 +715,7 @@ DemuxPacket* CDVDDemuxFFmpeg::Read() } // we need to get duration slightly different for matroska embedded text subtitels - if(m_bMatroska && stream->codec->codec_id == CODEC_ID_TEXT && pkt.convergence_duration != 0) + if(m_bMatroska && stream->codec->codec_id == AV_CODEC_ID_TEXT && pkt.convergence_duration != 0) pkt.duration = pkt.convergence_duration; if(m_bAVI && stream->codec && stream->codec->codec_type == AVMEDIA_TYPE_VIDEO) @@ -967,7 +967,7 @@ void CDVDDemuxFFmpeg::AddStream(int iId) st->bVFR = false; // never trust pts in avi files with h264. - if (m_bAVI && pStream->codec->codec_id == CODEC_ID_H264) + if (m_bAVI && pStream->codec->codec_id == AV_CODEC_ID_H264) st->bPTSInvalid = true; //average fps is more accurate for mkv files @@ -1008,15 +1008,15 @@ void CDVDDemuxFFmpeg::AddStream(int iId) if ( m_pInput->IsStreamType(DVDSTREAM_TYPE_DVD) ) { - if (pStream->codec->codec_id == CODEC_ID_PROBE) + if (pStream->codec->codec_id == AV_CODEC_ID_PROBE) { - // fix MPEG-1/MPEG-2 video stream probe returning CODEC_ID_PROBE for still frames. + // fix MPEG-1/MPEG-2 video stream probe returning AV_CODEC_ID_PROBE for still frames. // ffmpeg issue 1871, regression from ffmpeg r22831. if ((pStream->id & 0xF0) == 0xE0) { - pStream->codec->codec_id = CODEC_ID_MPEG2VIDEO; + pStream->codec->codec_id = AV_CODEC_ID_MPEG2VIDEO; pStream->codec->codec_tag = MKTAG('M','P','2','V'); - CLog::Log(LOGERROR, "%s - CODEC_ID_PROBE detected, forcing CODEC_ID_MPEG2VIDEO", __FUNCTION__); + CLog::Log(LOGERROR, "%s - AV_CODEC_ID_PROBE detected, forcing AV_CODEC_ID_MPEG2VIDEO", __FUNCTION__); } } } @@ -1031,7 +1031,7 @@ void CDVDDemuxFFmpeg::AddStream(int iId) case AVMEDIA_TYPE_SUBTITLE: { #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,38,1) - if (pStream->codec->codec_id == CODEC_ID_DVB_TELETEXT && g_guiSettings.GetBool("videoplayer.teletextenabled")) + if (pStream->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT && g_guiSettings.GetBool("videoplayer.teletextenabled")) { CDemuxStreamTeletext* st = new CDemuxStreamTeletext(); m_streams[iId] = st; @@ -1053,9 +1053,9 @@ void CDVDDemuxFFmpeg::AddStream(int iId) } case AVMEDIA_TYPE_ATTACHMENT: { //mkv attachments. Only bothering with fonts for now. - if(pStream->codec->codec_id == CODEC_ID_TTF + if(pStream->codec->codec_id == AV_CODEC_ID_TTF #if (!defined USE_EXTERNAL_FFMPEG) - || pStream->codec->codec_id == CODEC_ID_OTF + || pStream->codec->codec_id == AV_CODEC_ID_OTF #endif ) { @@ -1137,19 +1137,19 @@ void CDVDDemuxFFmpeg::AddStream(int iId) // id's reported from libdvdnav switch(m_streams[iId]->codec) { - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: m_streams[iId]->iPhysicalId = pStream->id - 128; break; - case CODEC_ID_DTS: + case AV_CODEC_ID_DTS: m_streams[iId]->iPhysicalId = pStream->id - 136; break; - case CODEC_ID_MP2: + case AV_CODEC_ID_MP2: m_streams[iId]->iPhysicalId = pStream->id - 448; break; - case CODEC_ID_PCM_S16BE: + case AV_CODEC_ID_PCM_S16BE: m_streams[iId]->iPhysicalId = pStream->id - 160; break; - case CODEC_ID_DVD_SUBTITLE: + case AV_CODEC_ID_DVD_SUBTITLE: m_streams[iId]->iPhysicalId = pStream->id - 0x20; break; default: @@ -1300,7 +1300,7 @@ void CDVDDemuxFFmpeg::GetStreamCodecName(int iStreamId, CStdString &strName) #ifdef FF_PROFILE_DTS_HD_MA /* use profile to determine the DTS type */ - if (stream->codec == CODEC_ID_DTS) + if (stream->codec == AV_CODEC_ID_DTS) { if (stream->profile == FF_PROFILE_DTS_HD_MA) strName = "dtshd_ma"; diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp index 5c4c312..f940bb0 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp @@ -290,39 +290,39 @@ void CDVDDemuxHTSP::SubscriptionStart (htsmsg_t *m) if(!strcmp(type, "AC3")) { st.a = new CDemuxStreamAudioHTSP(this, type); - st.a->codec = CODEC_ID_AC3; + st.a->codec = AV_CODEC_ID_AC3; } else if(!strcmp(type, "EAC3")) { st.a = new CDemuxStreamAudioHTSP(this, type); - st.a->codec = CODEC_ID_EAC3; + st.a->codec = AV_CODEC_ID_EAC3; } else if(!strcmp(type, "MPEG2AUDIO")) { st.a = new CDemuxStreamAudioHTSP(this, type); - st.a->codec = CODEC_ID_MP2; + st.a->codec = AV_CODEC_ID_MP2; } else if(!strcmp(type, "AAC")) { st.a = new CDemuxStreamAudioHTSP(this, type); - st.a->codec = CODEC_ID_AAC; + st.a->codec = AV_CODEC_ID_AAC; } else if(!strcmp(type, "MPEG2VIDEO")) { st.v = new CDemuxStreamVideoHTSP(this, type); - st.v->codec = CODEC_ID_MPEG2VIDEO; + st.v->codec = AV_CODEC_ID_MPEG2VIDEO; st.v->iWidth = htsmsg_get_u32_or_default(sub, "width" , 0); st.v->iHeight = htsmsg_get_u32_or_default(sub, "height", 0); } else if(!strcmp(type, "H264")) { st.v = new CDemuxStreamVideoHTSP(this, type); - st.v->codec = CODEC_ID_H264; + st.v->codec = AV_CODEC_ID_H264; st.v->iWidth = htsmsg_get_u32_or_default(sub, "width" , 0); st.v->iHeight = htsmsg_get_u32_or_default(sub, "height", 0); } else if(!strcmp(type, "DVBSUB")) { st.s = new CDemuxStreamSubtitle(); - st.s->codec = CODEC_ID_DVB_SUBTITLE; + st.s->codec = AV_CODEC_ID_DVB_SUBTITLE; uint32_t composition_id = 0, ancillary_id = 0; htsmsg_get_u32(sub, "composition_id", &composition_id); htsmsg_get_u32(sub, "ancillary_id" , &ancillary_id); st.s->identifier = (composition_id & 0xffff) | ((ancillary_id & 0xffff) << 16); } else if(!strcmp(type, "TEXTSUB")) { st.s = new CDemuxStreamSubtitle(); - st.s->codec = CODEC_ID_TEXT; + st.s->codec = AV_CODEC_ID_TEXT; } else if(!strcmp(type, "TELETEXT")) { st.t = new CDemuxStreamTeletext(); - st.t->codec = CODEC_ID_DVB_TELETEXT; + st.t->codec = AV_CODEC_ID_DVB_TELETEXT; } else { continue; } diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp index 8c984f6..1445584 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp @@ -60,10 +60,10 @@ void CDemuxStreamVideoPVRClient::GetStreamInfo(std::string& strInfo) { switch (codec) { - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: strInfo = "mpeg2video"; break; - case CODEC_ID_H264: + case AV_CODEC_ID_H264: strInfo = "h264"; break; default: @@ -75,19 +75,19 @@ void CDemuxStreamAudioPVRClient::GetStreamInfo(std::string& strInfo) { switch (codec) { - case CODEC_ID_AC3: + case AV_CODEC_ID_AC3: strInfo = "ac3"; break; - case CODEC_ID_EAC3: + case AV_CODEC_ID_EAC3: strInfo = "eac3"; break; - case CODEC_ID_MP2: + case AV_CODEC_ID_MP2: strInfo = "mpeg2audio"; break; - case CODEC_ID_AAC: + case AV_CODEC_ID_AAC: strInfo = "aac"; break; - case CODEC_ID_DTS: + case AV_CODEC_ID_DTS: strInfo = "dts"; break; default: @@ -349,7 +349,7 @@ void CDVDDemuxPVRClient::RequestStreams() { st = dynamic_cast<CDemuxStreamAudioPVRClient*>(stm); if (!st - || (st->codec != (CodecID)props.stream[i].iCodecId) + || (st->codec != (AVCodecID)props.stream[i].iCodecId) || (st->iChannels != props.stream[i].iChannels)) DisposeStream(i); } @@ -375,7 +375,7 @@ void CDVDDemuxPVRClient::RequestStreams() { st = dynamic_cast<CDemuxStreamVideoPVRClient*>(stm); if (!st - || (st->codec != (CodecID)props.stream[i].iCodecId) + || (st->codec != (AVCodecID)props.stream[i].iCodecId) || (st->iWidth != props.stream[i].iWidth) || (st->iHeight != props.stream[i].iHeight)) DisposeStream(i); @@ -395,11 +395,11 @@ void CDVDDemuxPVRClient::RequestStreams() m_streams[i] = st; st->m_parser_split = true; } - else if (props.stream[i].iCodecId == CODEC_ID_DVB_TELETEXT) + else if (props.stream[i].iCodecId == AV_CODEC_ID_DVB_TELETEXT) { if (stm) { - if (stm->codec != (CodecID)props.stream[i].iCodecId) + if (stm->codec != (AVCodecID)props.stream[i].iCodecId) DisposeStream(i); } if (!m_streams[i]) @@ -411,7 +411,7 @@ void CDVDDemuxPVRClient::RequestStreams() if (stm) { st = dynamic_cast<CDemuxStreamSubtitlePVRClient*>(stm); - if (!st || (st->codec != (CodecID)props.stream[i].iCodecId)) + if (!st || (st->codec != (AVCodecID)props.stream[i].iCodecId)) DisposeStream(i); } if (!m_streams[i]) @@ -428,7 +428,7 @@ void CDVDDemuxPVRClient::RequestStreams() m_streams[i] = new CDemuxStream(); } - m_streams[i]->codec = (CodecID)props.stream[i].iCodecId; + m_streams[i]->codec = (AVCodecID)props.stream[i].iCodecId; m_streams[i]->iId = i; m_streams[i]->iPhysicalId = props.stream[i].iPhysicalId; m_streams[i]->language[0] = props.stream[i].strLanguage[0]; @@ -475,19 +475,19 @@ void CDVDDemuxPVRClient::GetStreamCodecName(int iStreamId, CStdString &strName) CDemuxStream *stream = GetStream(iStreamId); if (stream) { - if (stream->codec == CODEC_ID_AC3) + if (stream->codec == AV_CODEC_ID_AC3) strName = "ac3"; - else if (stream->codec == CODEC_ID_MP2) + else if (stream->codec == AV_CODEC_ID_MP2) strName = "mp2"; - else if (stream->codec == CODEC_ID_AAC) + else if (stream->codec == AV_CODEC_ID_AAC) strName = "aac"; - else if (stream->codec == CODEC_ID_DTS) + else if (stream->codec == AV_CODEC_ID_DTS) strName = "dca"; - else if (stream->codec == CODEC_ID_MPEG2VIDEO) + else if (stream->codec == AV_CODEC_ID_MPEG2VIDEO) strName = "mpeg2video"; - else if (stream->codec == CODEC_ID_H264) + else if (stream->codec == AV_CODEC_ID_H264) strName = "h264"; - else if (stream->codec == CODEC_ID_EAC3) + else if (stream->codec == AV_CODEC_ID_EAC3) strName = "eac3"; } } diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp index d5c5712..3cf28b7 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp @@ -86,12 +86,12 @@ bool CDVDDemuxShoutcast::Open(CDVDInputStream* pInput) stricmp(strMimeType.c_str(), CONTENT_TYPE_AACPLUS) == 0) { // need an aac decoder first - m_pDemuxStream->codec = CODEC_ID_AAC; + m_pDemuxStream->codec = AV_CODEC_ID_AAC; } else // (stricmp(strMimeType, CONTENT_TYPE_MP3) == 0) { // default to mp3 - m_pDemuxStream->codec = CODEC_ID_MP3; + m_pDemuxStream->codec = AV_CODEC_ID_MP3; } return true; diff --git a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp index bde0471..f2982e9 100644 --- a/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp +++ b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp @@ -71,7 +71,7 @@ bool CDVDDemuxVobsub::Open(const string& filename, const string& subfilename) CDVDStreamInfo hints; CDVDCodecOptions options; - hints.codec = CODEC_ID_DVD_SUBTITLE; + hints.codec = AV_CODEC_ID_DVD_SUBTITLE; char line[2048]; DECLARE_UNUSED(bool,res) @@ -211,7 +211,7 @@ bool CDVDDemuxVobsub::ParseId(SState& state, char* line) else stream->iPhysicalId = -1; - stream->codec = CODEC_ID_DVD_SUBTITLE; + stream->codec = AV_CODEC_ID_DVD_SUBTITLE; stream->iId = m_Streams.size(); state.id = stream->iId; diff --git a/xbmc/cores/dvdplayer/DVDFileInfo.cpp b/xbmc/cores/dvdplayer/DVDFileInfo.cpp index 30f59f5..a4596d7 100644 --- a/xbmc/cores/dvdplayer/DVDFileInfo.cpp +++ b/xbmc/cores/dvdplayer/DVDFileInfo.cpp @@ -162,7 +162,7 @@ bool CDVDFileInfo::ExtractThumb(const CStdString &strPath, CTextureDetails &deta CDVDStreamInfo hint(*pDemuxer->GetStream(nVideoStream), true); hint.software = true; - if (hint.codec == CODEC_ID_MPEG2VIDEO || hint.codec == CODEC_ID_MPEG1VIDEO) + if (hint.codec == AV_CODEC_ID_MPEG2VIDEO || hint.codec == AV_CODEC_ID_MPEG1VIDEO) { // libmpeg2 is not thread safe so use ffmepg for mpeg2/mpeg1 thumb extraction CDVDCodecOptions dvdOptions; diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/dvdplayer/DVDPlayerAudio.h index 0b1d287..b8deba8 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerAudio.h +++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.h @@ -38,7 +38,7 @@ class CDVDAudioCodec; class IAudioCallback; class CDVDAudioCodec; -enum CodecID; +enum AVCodecID; #define DECODE_FLAG_DROP 1 #define DECODE_FLAG_RESYNC 2 diff --git a/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp b/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp index 8d3bf65..059f3b3 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp @@ -86,7 +86,7 @@ void CDVDPlayerSubtitle::SendMessage(CDVDMsg* pMsg) } } } - else if (m_streaminfo.codec == CODEC_ID_DVD_SUBTITLE) + else if (m_streaminfo.codec == AV_CODEC_ID_DVD_SUBTITLE) { CDVDOverlaySpu* pSPUInfo = m_dvdspus.AddData(pPacket->pData, pPacket->iSize, pPacket->pts); if (pSPUInfo) @@ -171,7 +171,7 @@ bool CDVDPlayerSubtitle::OpenStream(CDVDStreamInfo &hints, string &filename) } // dvd's use special subtitle decoder - if(hints.codec == CODEC_ID_DVD_SUBTITLE && filename == "dvd") + if(hints.codec == AV_CODEC_ID_DVD_SUBTITLE && filename == "dvd") return true; m_pOverlayCodec = CDVDFactoryCodec::CreateOverlayCodec(hints); diff --git a/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp b/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp index 52ec758..b990bf8 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp @@ -114,7 +114,7 @@ CDVDTeletextData::~CDVDTeletextData() bool CDVDTeletextData::CheckStream(CDVDStreamInfo &hints) { #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,38,1) - if (hints.codec == CODEC_ID_DVB_TELETEXT) + if (hints.codec == AV_CODEC_ID_DVB_TELETEXT) return true; #endif @@ -126,7 +126,7 @@ bool CDVDTeletextData::OpenStream(CDVDStreamInfo &hints) m_messageQueue.Init(); #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,38,1) - if (hints.codec == CODEC_ID_DVB_TELETEXT) + if (hints.codec == AV_CODEC_ID_DVB_TELETEXT) { CLog::Log(LOGNOTICE, "Creating teletext data thread"); Create(); diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/dvdplayer/DVDPlayerVideo.h index fe7e12c..4569bd8 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerVideo.h +++ b/xbmc/cores/dvdplayer/DVDPlayerVideo.h @@ -31,7 +31,7 @@ #include "cores/VideoRenderers/RenderManager.h" #endif -enum CodecID; +enum AVCodecID; class CDemuxStreamVideo; class CDVDOverlayCodecCC; diff --git a/xbmc/cores/dvdplayer/DVDStreamInfo.cpp b/xbmc/cores/dvdplayer/DVDStreamInfo.cpp index 36cf798..cd54a33 100644 --- a/xbmc/cores/dvdplayer/DVDStreamInfo.cpp +++ b/xbmc/cores/dvdplayer/DVDStreamInfo.cpp @@ -38,7 +38,7 @@ CDVDStreamInfo::~CDVDStreamInfo() void CDVDStreamInfo::Clear() { - codec = CODEC_ID_NONE; + codec = AV_CODEC_ID_NONE; type = STREAM_NONE; software = false; codec_tag = 0; diff --git a/xbmc/cores/dvdplayer/DVDStreamInfo.h b/xbmc/cores/dvdplayer/DVDStreamInfo.h index e4fec0f..9f84a5b 100644 --- a/xbmc/cores/dvdplayer/DVDStreamInfo.h +++ b/xbmc/cores/dvdplayer/DVDStreamInfo.h @@ -25,7 +25,7 @@ #endif #ifndef _LINUX enum StreamType; -enum CodecID; +enum AVCodecID; #else #include "DVDDemuxers/DVDDemux.h" extern "C" { @@ -59,7 +59,7 @@ public: void Assign(const CDVDStreamInfo &right, bool withextradata); void Assign(const CDemuxStream &right, bool withextradata); - CodecID codec; + AVCodecID codec; StreamType type; bool software; //force software decoding diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp index 0c9693d..ab7ec78 100644 --- a/xbmc/cores/omxplayer/OMXAudio.cpp +++ b/xbmc/cores/omxplayer/OMXAudio.cpp @@ -1225,17 +1225,17 @@ void COMXAudio::SetCodingType(AEDataFormat dataFormat) } } -bool COMXAudio::CanHWDecode(CodecID codec) +bool COMXAudio::CanHWDecode(AVCodecID codec) { bool ret = false; switch(codec) { - case CODEC_ID_DTS: + case AV_CODEC_ID_DTS: CLog::Log(LOGDEBUG, "COMXAudio::CanHWDecode OMX_AUDIO_CodingDTS\n"); ret = true; break; - case CODEC_ID_AC3: - case CODEC_ID_EAC3: + case AV_CODEC_ID_AC3: + case AV_CODEC_ID_EAC3: CLog::Log(LOGDEBUG, "COMXAudio::CanHWDecode OMX_AUDIO_CodingDDP\n"); ret = true; break; diff --git a/xbmc/cores/omxplayer/OMXAudio.h b/xbmc/cores/omxplayer/OMXAudio.h index 9537d9e..f3d9ffd 100644 --- a/xbmc/cores/omxplayer/OMXAudio.h +++ b/xbmc/cores/omxplayer/OMXAudio.h @@ -85,7 +85,7 @@ public: void Process(); void SetCodingType(AEDataFormat dataFormat); - static bool CanHWDecode(CodecID codec); + static bool CanHWDecode(AVCodecID codec); void PrintChannels(OMX_AUDIO_CHANNELTYPE eChannelMapping[]); void PrintPCM(OMX_AUDIO_PARAM_PCMMODETYPE *pcm, std::string direction); diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp index e309d2e..4e76088 100644 --- a/xbmc/cores/omxplayer/OMXPlayerAudio.cpp +++ b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp @@ -305,8 +305,8 @@ bool OMXPlayerAudio::CodecChange() m_hints.samplerate = m_pAudioCodec->GetSampleRate(); } - /* only check bitrate changes on CODEC_ID_DTS, CODEC_ID_AC3, CODEC_ID_EAC3 */ - if(m_hints.codec != CODEC_ID_DTS && m_hints.codec != CODEC_ID_AC3 && m_hints.codec != CODEC_ID_EAC3) + /* only check bitrate changes on AV_CODEC_ID_DTS, AV_CODEC_ID_AC3, AV_CODEC_ID_EAC3 */ + if(m_hints.codec != AV_CODEC_ID_DTS && m_hints.codec != AV_CODEC_ID_AC3 && m_hints.codec != AV_CODEC_ID_EAC3) new_bitrate = old_bitrate = 0; if(m_hints_current.codec != m_hints.codec || @@ -667,12 +667,12 @@ AEDataFormat OMXPlayerAudio::GetDataFormat(CDVDStreamInfo hints) /* pathrought is overriding hw decode*/ if(AUDIO_IS_BITSTREAM(g_guiSettings.GetInt("audiooutput.mode")) && m_use_passthrough) { - if(hints.codec == CODEC_ID_AC3 && g_guiSettings.GetBool("audiooutput.ac3passthrough") && hdmi_passthrough_ac3) + if(hints.codec == AV_CODEC_ID_AC3 && g_guiSettings.GetBool("audiooutput.ac3passthrough") && hdmi_passthrough_ac3) { dataFormat = AE_FMT_AC3; m_passthrough = true; } - if(hints.codec == CODEC_ID_DTS && g_guiSettings.GetBool("audiooutput.dtspassthrough") && hdmi_passthrough_dts) + if(hints.codec == AV_CODEC_ID_DTS && g_guiSettings.GetBool("audiooutput.dtspassthrough") && hdmi_passthrough_dts) { dataFormat = AE_FMT_DTS; m_passthrough = true; @@ -682,12 +682,12 @@ AEDataFormat OMXPlayerAudio::GetDataFormat(CDVDStreamInfo hints) /* hw decode */ if(m_use_hw_decode && !m_passthrough) { - if(hints.codec == CODEC_ID_AC3 && COMXAudio::CanHWDecode(m_hints.codec)) + if(hints.codec == AV_CODEC_ID_AC3 && COMXAudio::CanHWDecode(m_hints.codec)) { dataFormat = AE_FMT_AC3; m_hw_decode = true; } - if(hints.codec == CODEC_ID_DTS && COMXAudio::CanHWDecode(m_hints.codec)) + if(hints.codec == AV_CODEC_ID_DTS && COMXAudio::CanHWDecode(m_hints.codec)) { dataFormat = AE_FMT_DTS; m_hw_decode = true; diff --git a/xbmc/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp index 489dc8a..1c11694 100644 --- a/xbmc/cores/omxplayer/OMXVideo.cpp +++ b/xbmc/cores/omxplayer/OMXVideo.cpp @@ -131,11 +131,11 @@ bool COMXVideo::SendDecoderConfig() return true; } -bool COMXVideo::NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize) +bool COMXVideo::NaluFormatStartCodes(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize) { switch(codec) { - case CODEC_ID_H264: + case AV_CODEC_ID_H264: if (in_extrasize < 7 || in_extradata == NULL) return true; // valid avcC atom data always starts with the value 1 (version), otherwise annexb @@ -178,7 +178,7 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool deinterlace, b switch (hints.codec) { - case CODEC_ID_H264: + case AV_CODEC_ID_H264: { switch(hints.profile) { @@ -234,64 +234,64 @@ bool COMXVideo::Open(CDVDStreamInfo &hints, OMXClock *clock, bool deinterlace, b } } break; - case CODEC_ID_MPEG4: + case AV_CODEC_ID_MPEG4: // (role name) video_decoder.mpeg4 // MPEG-4, DivX 4/5 and Xvid compatible decoder_name = OMX_MPEG4_DECODER; m_codingType = OMX_VIDEO_CodingMPEG4; m_video_codec_name = "omx-mpeg4"; break; - case CODEC_ID_MPEG1VIDEO: - case CODEC_ID_MPEG2VIDEO: + case AV_CODEC_ID_MPEG1VIDEO: + case AV_CODEC_ID_MPEG2VIDEO: // (role name) video_decoder.mpeg2 // MPEG-2 decoder_name = OMX_MPEG2V_DECODER; m_codingType = OMX_VIDEO_CodingMPEG2; m_video_codec_name = "omx-mpeg2"; break; - case CODEC_ID_H263: + case AV_CODEC_ID_H263: // (role name) video_decoder.mpeg4 // MPEG-4, DivX 4/5 and Xvid compatible decoder_name = OMX_MPEG4_DECODER; m_codingType = OMX_VIDEO_CodingMPEG4; m_video_codec_name = "omx-h263"; break; - case CODEC_ID_VP6: + case AV_CODEC_ID_VP6: // this form is encoded upside down vflip = true; // fall through - case CODEC_ID_VP6F: - case CODEC_ID_VP6A: + case AV_CODEC_ID_VP6F: + case AV_CODEC_ID_VP6A: // (role name) video_decoder.vp6 // VP6 decoder_name = OMX_VP6_DECODER; m_codingType = OMX_VIDEO_CodingVP6; m_video_codec_name = "omx-vp6"; break; - case CODEC_ID_VP8: + case AV_CODEC_ID_VP8: // (role name) video_decoder.vp8 // VP8 decoder_name = OMX_VP8_DECODER; m_codingType = OMX_VIDEO_CodingVP8; m_video_codec_name = "omx-vp8"; break; - case CODEC_ID_THEORA: + case AV_CODEC_ID_THEORA: // (role name) video_decoder.theora // theora decoder_name = OMX_THEORA_DECODER; m_codingType = OMX_VIDEO_CodingTheora; m_video_codec_name = "omx-theora"; break; - case CODEC_ID_MJPEG: - case CODEC_ID_MJPEGB: + case AV_CODEC_ID_MJPEG: + case AV_CODEC_ID_MJPEGB: // (role name) video_decoder.mjpg // mjpg decoder_name = OMX_MJPEG_DECODER; m_codingType = OMX_VIDEO_CodingMJPEG; m_video_codec_name = "omx-mjpeg"; break; - case CODEC_ID_VC1: - case CODEC_ID_WMV3: + case AV_CODEC_ID_VC1: + case AV_CODEC_ID_WMV3: // (role name) video_decoder.vc1 // VC-1, WMV9 decoder_name = OMX_VC1_DECODER; diff --git a/xbmc/cores/omxplayer/OMXVideo.h b/xbmc/cores/omxplayer/OMXVideo.h index 96ccb34..3eff0ba 100644 --- a/xbmc/cores/omxplayer/OMXVideo.h +++ b/xbmc/cores/omxplayer/OMXVideo.h @@ -98,7 +98,7 @@ protected: ResolutionUpdateCallBackFn m_res_callback; void *m_res_ctx; bool m_submitted_eos; - bool NaluFormatStartCodes(enum CodecID codec, uint8_t *in_extradata, int in_extrasize); + bool NaluFormatStartCodes(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize); }; #endif diff --git a/xbmc/utils/BitstreamConverter.cpp b/xbmc/utils/BitstreamConverter.cpp index 622c9eb..0d3c0e6 100644 --- a/xbmc/utils/BitstreamConverter.cpp +++ b/xbmc/utils/BitstreamConverter.cpp @@ -431,7 +431,7 @@ CBitstreamConverter::~CBitstreamConverter() Close(); } -bool CBitstreamConverter::Open(enum CodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb) +bool CBitstreamConverter::Open(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb) { m_to_annexb = to_annexb; @@ -439,7 +439,7 @@ bool CBitstreamConverter::Open(enum CodecID codec, uint8_t *in_extradata, int in switch(codec) { - case CODEC_ID_H264: + case AV_CODEC_ID_H264: if (in_extrasize < 7 || in_extradata == NULL) { CLog::Log(LOGERROR, "CBitstreamConverter::Open avcC data too small or missing\n"); @@ -587,7 +587,7 @@ bool CBitstreamConverter::Convert(uint8_t *pData, int iSize) if (pData) { - if(m_codec == CODEC_ID_H264) + if(m_codec == AV_CODEC_ID_H264) { if(m_to_annexb) { diff --git a/xbmc/utils/BitstreamConverter.h b/xbmc/utils/BitstreamConverter.h index b555143..4c884e9 100644 --- a/xbmc/utils/BitstreamConverter.h +++ b/xbmc/utils/BitstreamConverter.h @@ -114,7 +114,7 @@ public: static void skip_bits( bits_reader_t *br, int nbits ); static uint32_t get_bits( bits_reader_t *br, int nbits ); - bool Open(enum CodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb); + bool Open(enum AVCodecID codec, uint8_t *in_extradata, int in_extrasize, bool to_annexb); void Close(void); bool NeedConvert(void) { return m_convert_bitstream; }; bool Convert(uint8_t *pData, int iSize); @@ -163,7 +163,7 @@ protected: bool m_convert_bytestream; DllAvUtil *m_dllAvUtil; DllAvFormat *m_dllAvFormat; - CodecID m_codec; + AVCodecID m_codec; }; #endif