Refresh and remove now-unused patches.

parent 411e2fde
From: Alberto Luaces <aluaces@udc.es>
Date: Mon, 16 May 2016 14:15:29 +0200
Subject: Bas Couwenberg's patches for Hurd.
---
applications/present3D/Cluster.cpp | 4 +++-
examples/osgcluster/broadcaster.cpp | 2 ++
examples/osgcluster/receiver.cpp | 2 +-
src/OpenThreads/pthreads/PThread.cpp | 4 +++-
src/osgDB/FileNameUtils.cpp | 4 ++++
5 files changed, 13 insertions(+), 3 deletions(-)
Index: openscenegraph-3.4/applications/present3D/Cluster.cpp
===================================================================
--- openscenegraph-3.4.orig/applications/present3D/Cluster.cpp
+++ openscenegraph-3.4/applications/present3D/Cluster.cpp
@@ -41,6 +41,8 @@
#include <net/soioctl.h>
#elif defined(__CYGWIN__)
#include <unistd.h>
+#elif defined (__GNU__)
+ #include <unistd.h>
#elif defined(__sun)
#include <unistd.h>
#include <sys/sockio.h>
@@ -338,7 +340,7 @@ void Receiver::sync( void )
}
#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
- defined(__DragonFly__) || defined(__FreeBSD_kernel__)
+ defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__GNU__)
socklen_t
#else
int
Index: openscenegraph-3.4/examples/osgcluster/broadcaster.cpp
===================================================================
--- openscenegraph-3.4.orig/examples/osgcluster/broadcaster.cpp
+++ openscenegraph-3.4/examples/osgcluster/broadcaster.cpp
@@ -45,6 +45,8 @@
#include <net/soioctl.h>
#elif defined(__CYGWIN__)
#include <unistd.h>
+#elif defined (__GNU__)
+ #include <unistd.h>
#elif defined(__sun)
#include <unistd.h>
#include <sys/sockio.h>
Index: openscenegraph-3.4/examples/osgcluster/receiver.cpp
===================================================================
--- openscenegraph-3.4.orig/examples/osgcluster/receiver.cpp
+++ openscenegraph-3.4/examples/osgcluster/receiver.cpp
@@ -122,7 +122,7 @@ void Receiver::sync( void )
return;
}
-#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__FreeBSD_kernel__)
+#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__FreeBSD_kernel__) || defined(__GNU__)
socklen_t size;
#else
int size;
Index: openscenegraph-3.4/src/OpenThreads/pthreads/PThread.cpp
===================================================================
--- openscenegraph-3.4.orig/src/OpenThreads/pthreads/PThread.cpp
+++ openscenegraph-3.4/src/OpenThreads/pthreads/PThread.cpp
@@ -43,8 +43,10 @@
#endif
#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__MACH__)
#include <sys/types.h>
+#if !defined (__GNU__)
#include <sys/sysctl.h>
#endif
+#endif
#if defined(__ANDROID__)
#ifndef PAGE_SIZE
@@ -1012,7 +1014,7 @@ int Thread::microSleep(unsigned int micr
//
int OpenThreads::GetNumberOfProcessors()
{
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GNU__)
long ret = sysconf(_SC_NPROCESSORS_ONLN);
if (ret == -1)
return 0;
Index: openscenegraph-3.4/src/osgDB/FileNameUtils.cpp
===================================================================
--- openscenegraph-3.4.orig/src/osgDB/FileNameUtils.cpp
+++ openscenegraph-3.4/src/osgDB/FileNameUtils.cpp
@@ -30,6 +30,10 @@
using std::tolower;
#endif
+#if defined(__GNU__) && !defined(PATH_MAX)
+#define PATH_MAX 4096
+#endif
+
using namespace std;
static const char * const PATH_SEPARATORS = "/\\";
Index: openscenegraph-3.4/applications/present3D/Cluster.cpp
===================================================================
--- openscenegraph-3.4.orig/applications/present3D/Cluster.cpp
+++ openscenegraph-3.4/applications/present3D/Cluster.cpp
@@ -33,7 +33,7 @@
#if defined(__linux)
#include <unistd.h>
#include <linux/sockios.h>
-#elif defined(__FreeBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
#include <unistd.h>
#include <sys/sockio.h>
#elif defined(__sgi)
@@ -338,7 +338,7 @@ void Receiver::sync( void )
}
#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \
- defined(__DragonFly__)
+ defined(__DragonFly__) || defined(__FreeBSD_kernel__)
socklen_t
#else
int
Index: openscenegraph-3.4/examples/osgcluster/receiver.cpp
===================================================================
--- openscenegraph-3.4.orig/examples/osgcluster/receiver.cpp
+++ openscenegraph-3.4/examples/osgcluster/receiver.cpp
@@ -122,7 +122,7 @@ void Receiver::sync( void )
return;
}
-#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ )
+#if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || defined(__FreeBSD_kernel__)
socklen_t size;
#else
int size;
Description: Replace deprecated FFmpeg API
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Last-Update: <2015-11-02>
---
src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp | 3 +-
src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp | 48 +++++++++++++---------------
src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp | 4 +--
src/osgPlugins/ffmpeg/FFmpegParameters.cpp | 2 +-
4 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
index 665c68f..636bddd 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
@@ -227,8 +227,7 @@ printf("### CONVERTING from sample format %s TO %s\n\t\tFROM %d TO %d channels\n
if (avcodec_open2(m_context, p_codec, NULL) < 0)
throw std::runtime_error("avcodec_open() failed");
- m_context->get_buffer = avcodec_default_get_buffer;
- m_context->release_buffer = avcodec_default_release_buffer;
+ m_context->get_buffer2 = avcodec_default_get_buffer2;
}
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
index 9375657..083d3db 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream * const stream)
findAspectRatio();
// Find out whether we support Alpha channel
- m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P);
+ m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P);
// Find out the framerate
#if LIBAVCODEC_VERSION_MAJOR >= 56
@@ -95,20 +95,19 @@ void FFmpegDecoderVideo::open(AVStream * const stream)
throw std::runtime_error("avcodec_open() failed");
// Allocate video frame
- m_frame.reset(avcodec_alloc_frame());
+ m_frame.reset(av_frame_alloc());
// Allocate converted RGB frame
- m_frame_rgba.reset(avcodec_alloc_frame());
- m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height()));
+ m_frame_rgba.reset(av_frame_alloc());
+ m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height()));
m_buffer_rgba[1].resize(m_buffer_rgba[0].size());
// Assign appropriate parts of the buffer to image planes in m_frame_rgba
- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height());
+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height());
// Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame.
m_context->opaque = this;
- m_context->get_buffer = getBuffer;
- m_context->release_buffer = releaseBuffer;
+ m_context->get_buffer2 = getBuffer;
}
@@ -267,8 +266,8 @@ int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, AVPicture *src,
#ifdef USE_SWSCALE
if (m_swscale_ctx==0)
{
- m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt,
- src_width, src_height, (PixelFormat) dst_pix_fmt,
+ m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt,
+ src_width, src_height, (AVPixelFormat) dst_pix_fmt,
/*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL);
}
@@ -315,14 +314,14 @@ void FFmpegDecoderVideo::publishFrame(const double delay, bool audio_disabled)
AVPicture * const dst = (AVPicture *) m_frame_rgba.get();
// Assign appropriate parts of the buffer to image planes in m_frame_rgba
- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height());
+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height());
// Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine
- if (m_context->pix_fmt == PIX_FMT_YUVA420P)
+ if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P)
yuva420pToRgba(dst, src, width(), height());
else
- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height());
// Wait 'delay' seconds before publishing the picture.
int i_delay = static_cast<int>(delay * 1000000 + 0.5);
@@ -349,7 +348,7 @@ void FFmpegDecoderVideo::publishFrame(const double delay, bool audio_disabled)
void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height)
{
- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width, height);
const size_t bpp = 4;
@@ -367,31 +366,28 @@ void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const
}
}
-
-
-int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture)
+int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture, int flags)
{
+ AVBufferRef *ref;
const FFmpegDecoderVideo * const this_ = reinterpret_cast<const FFmpegDecoderVideo*>(context->opaque);
- const int result = avcodec_default_get_buffer(context, picture);
+ const int result = avcodec_default_get_buffer2(context, picture, flags);
int64_t * p_pts = reinterpret_cast<int64_t*>( av_malloc(sizeof(int64_t)) );
*p_pts = this_->m_packet_pts;
picture->opaque = p_pts;
+ ref = av_buffer_create((uint8_t *)picture->opaque, sizeof(int64_t), FFmpegDecoderVideo::freeBuffer, picture->buf[0], flags);
+ picture->buf[0] = ref;
+
return result;
}
-
-
-void FFmpegDecoderVideo::releaseBuffer(AVCodecContext * const context, AVFrame * const picture)
+void FFmpegDecoderVideo::freeBuffer(void *opaque, uint8_t *data)
{
- if (picture != 0)
- av_freep(&picture->opaque);
-
- avcodec_default_release_buffer(context, picture);
+ AVBufferRef *ref = (AVBufferRef *)opaque;
+ av_buffer_unref(&ref);
+ av_free(data);
}
-
-
} // namespace osgFFmpeg
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
index 7883b17..778c1a9 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
@@ -94,8 +94,8 @@ private:
int src_pix_fmt, int src_width, int src_height);
- static int getBuffer(AVCodecContext * context, AVFrame * picture);
- static void releaseBuffer(AVCodecContext * context, AVFrame * picture);
+ static int getBuffer(AVCodecContext * context, AVFrame * picture, int flags);
+ static void freeBuffer(void * opaque, uint8_t *data);
PacketQueue & m_packets;
FFmpegClocks & m_clocks;
diff --git a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
index 288e440..5915ab8 100644
--- a/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegParameters.cpp
@@ -19,7 +19,7 @@ extern "C"
#include <libavutil/pixdesc.h>
}
-inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
+inline AVPixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); }
namespace osgFFmpeg {
disable-zip-plugin-with-embedded-zlib.patch
check__FreeBSD_kernel__
no-xine-malloc-aligned.diff
ffmpeg_2.9.patch
0005-Bas-Couwenberg-s-patches-for-Hurd.patch
0006-Occlusion-Queries-Stuttering-fix-from-upstream.patch
0007-Explicit-signed-char-type-for-portability-base64.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment