undefine PixelFormat in AVCompat.h

conflict with VideoFormat::PixelFormat only when ffmpeg header is used, so move to AVCompat.h is better
kiki1307 · Jul 20, 2015 · 678b4fc · 678b4fc
1 parent 61be1d6
commit 678b4fc
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 43 deletions.
diff --git a/src/QtAV/VideoFormat.h b/src/QtAV/VideoFormat.h
@@ -28,14 +28,8 @@
 #include <QtGui/QImage>
 #include <QtAV/QtAV_Global.h>
 
-// FF_API_PIX_FMT
-#ifdef PixelFormat
-#undef PixelFormat
-#endif
-
 class QDebug;
 namespace QtAV {
-
 class VideoFormatPrivate;
 class Q_AV_EXPORT VideoFormat
 {

diff --git a/src/QtAV/private/AVCompat.h b/src/QtAV/private/AVCompat.h
@@ -215,7 +215,7 @@ int64_t av_get_default_channel_layout(int nb_channels);
 #ifdef AVRESAMPLE_MAX_CHANNELS
 #define SWR_CH_MAX AVRESAMPLE_MAX_CHANNELS
 #else
-#define SWR_CH_MAX 32
+#define SWR_CH_MAX 64
 #endif //AVRESAMPLE_MAX_CHANNELS
 #endif //SWR_CH_MAX
 #define SwrContext AVAudioResampleContext
@@ -264,6 +264,10 @@ typedef enum PixelFormat AVPixelFormat; // so we must avoid using  enum AVPixelF
 typedef enum AVPixelFormat AVPixelFormat;
 #define QTAV_PIX_FMT_C(X) AV_PIX_FMT_##X
 #endif //AV_VERSION_INT(51, 42, 0)
+// FF_API_PIX_FMT
+#ifdef PixelFormat
+#undef PixelFormat
+#endif
 
 // AV_PIX_FMT_FLAG_XXX was PIX_FMT_XXX before FFmpeg 2.0
 // AV_PIX_FMT_FLAG_ALPHA was added at 52.2.0. but version.h not changed

diff --git a/src/QtAV/private/AVEncoder_p.h b/src/QtAV/private/AVEncoder_p.h
@@ -28,11 +28,6 @@
 #include "QtAV/VideoFormat.h"
 #include "QtAV/private/AVCompat.h"
 
-// FF_API_PIX_FMT
-#ifdef PixelFormat
-#undef PixelFormat
-#endif
-
 namespace QtAV {
 
 class Q_AV_PRIVATE_EXPORT AVEncoderPrivate : public DPtrPrivate<AVEncoder>

diff --git a/src/VideoFormat.cpp b/src/VideoFormat.cpp
@@ -30,11 +30,6 @@ extern "C" {
 #include <libavutil/imgutils.h>
 }
 
-// FF_API_PIX_FMT
-#ifdef PixelFormat
-#undef PixelFormat
-#endif
-
 #define FF_HAS_YUV12BITS FFMPEG_MODULE_CHECK(LIBAVUTIL, 51, 73, 101)
 #if (Q_BYTE_ORDER == Q_BIG_ENDIAN)
 #define PIXFMT_NE(B, L) VideoFormat::Format_##B

diff --git a/src/VideoFrame.cpp b/src/VideoFrame.cpp
@@ -29,11 +29,6 @@
 #include "utils/GPUMemCopy.h"
 #include "utils/Logger.h"
 
-// FF_API_PIX_FMT
-#ifdef PixelFormat
-#undef PixelFormat
-#endif
-
 namespace QtAV {
 namespace{
 static const struct RegisterMetaTypes

diff --git a/src/codec/video/VideoDecoderDXVA.cpp b/src/codec/video/VideoDecoderDXVA.cpp
@@ -36,11 +36,6 @@
 #include "utils/DirectXHelper.h"
 
 // d3d9ex: http://dxr.mozilla.org/mozilla-central/source/dom/media/wmf/DXVA2Manager.cpp
-// TODO: add to QtAV_Compat.h?
-// FF_API_PIX_FMT
-#ifdef PixelFormat
-#undef PixelFormat
-#endif
 // AV_CODEC_ID_H265 is a macro defined as AV_CODEC_ID_HEVC. so we can avoid libavcodec version check. (from ffmpeg 2.1)
 #ifndef AV_CODEC_ID_H265
 #ifdef _MSC_VER

diff --git a/src/codec/video/VideoDecoderVAAPI.cpp b/src/codec/video/VideoDecoderVAAPI.cpp
@@ -37,12 +37,6 @@ extern "C" {
 #include "vaapi/SurfaceInteropVAAPI.h"
 #include "utils/Logger.h"
 
-// TODO: add to AVCompat.h?
-// FF_API_PIX_FMT
-#ifdef PixelFormat
-#undef PixelFormat
-#endif
-
 #define VERSION_CHK(major, minor, patch) \
     (((major&0xff)<<16) | ((minor&0xff)<<8) | (patch&0xff))
 

diff --git a/src/codec/video/VideoDecoderVDA.cpp b/src/codec/video/VideoDecoderVDA.cpp
@@ -37,11 +37,6 @@ extern "C" {
 #include <VideoDecodeAcceleration/VDADecoder.h>
 #include "utils/Logger.h"
 
-// TODO: add to QtAV_Compat.h?
-// FF_API_PIX_FMT
-#ifdef PixelFormat
-#undef PixelFormat
-#endif
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
 #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 //MAC_OS_X_VERSION_10_7
 #define OSX_TARGET_MIN_LION

diff --git a/src/codec/video/VideoEncoder.cpp b/src/codec/video/VideoEncoder.cpp
@@ -24,11 +24,6 @@
 #include "QtAV/private/factory.h"
 #include "utils/Logger.h"
 
-// FF_API_PIX_FMT
-#ifdef PixelFormat
-#undef PixelFormat
-#endif
-
 namespace QtAV {
 
 FACTORY_DEFINE(VideoEncoder)