From 56a341e79a5db155b8f56a3b14675e06871cff8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Tue, 11 Dec 2007 22:07:39 +0100 Subject: use FFMPEG_POSTPROC_* variables, reduce conditional. --- src/post/planar/Makefile.am | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/post/planar') diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index cb1ee68f9..26aeec3b3 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -4,19 +4,8 @@ AM_CFLAGS = $(VISIBILITY_FLAG) $(ff_cflags) AM_CPPFLAGS = AM_LDFLAGS = -if WITH_EXTERNAL_FFMPEG -postproc_lib = $(FFMPEG_POSTPROC_LIBS) -ff_cflags = $(FFMPEG_POSTPROC_CFLAGS) -else -AM_CPPFLAGS += -I$(top_srcdir)/contrib/ffmpeg/libpostproc -postproc_lib = $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a \ - $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a - $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a: $(MAKE) -C $(top_builddir)/contrib ffmpeg/libpostproc/libpostproc.a -$(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a: - $(MAKE) -C $(top_builddir)/contrib ffmpeg/libavutil/libavutil.a -endif noinst_LTLIBRARIES = libpost_planar_asm.la libpost_planar_asm_la_SOURCES = eq.c eq2.c noise.c @@ -25,6 +14,7 @@ libpost_planar_asm_la_CFLAGS = $(O1_CFLAGS) -fomit-frame-pointer $(AM_CFLAGS) xinepost_LTLIBRARIES = xineplug_post_planar.la xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \ denoise3d.c unsharp.c pp.c -xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(PTHREAD_LIBS) $(LTLIBINTL) $(noinst_LTLIBRARIES) -xineplug_post_planar_la_CFLAGS = $(DEFAULT_OCFLAGS) $(AM_CFLAGS) +xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(FFMPEG_POSTPROC_LIBS) -lm $(PTHREAD_LIBS) $(LTLIBINTL) $(noinst_LTLIBRARIES) +xineplug_post_planar_la_DEPS = $(FFMPEG_POSTPROC_DEPS) +xineplug_post_planar_la_CFLAGS = $(DEFAULT_OCFLAGS) $(AM_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) xineplug_post_planar_la_LDFLAGS = $(AM_LDFLAGS) $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS) -- cgit v1.2.3 From 2e3f351aab6f653313d113f0d2ec0374c2d7aee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Wed, 12 Dec 2007 12:31:40 +0100 Subject: Replace usage of xine_xmalloc_aligned() with av_mallocz() from libavutil, link plugins needing it to libavutil. --- src/post/planar/Makefile.am | 4 +++- src/post/planar/noise.c | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src/post/planar') diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 26aeec3b3..68a3953bf 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -9,7 +9,9 @@ $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a: noinst_LTLIBRARIES = libpost_planar_asm.la libpost_planar_asm_la_SOURCES = eq.c eq2.c noise.c -libpost_planar_asm_la_CFLAGS = $(O1_CFLAGS) -fomit-frame-pointer $(AM_CFLAGS) +libpost_planar_asm_la_CFLAGS = $(O1_CFLAGS) -fomit-frame-pointer $(AM_CFLAGS) $(AVUTIL_CFLAGS) +libpost_planar_asm_la_LIBADD = $(AVUTIL_LIBS) +libpost_planar_asm_la_DEPS = $(AVUTIL_DEPS) xinepost_LTLIBRARIES = xineplug_post_planar.la xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \ diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index 8c04f2e72..6ca1ec967 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -27,6 +27,8 @@ #include #include +/* libavutil from FFmpeg */ +#include #ifdef ARCH_X86_64 # define REG_a "rax" @@ -55,7 +57,6 @@ typedef struct noise_param_t { shiftptr; int8_t *noise, *prev_shift[MAX_RES][3]; - void *base; } noise_param_t; static int nonTempRandShift[MAX_RES]= {-1}; @@ -72,9 +73,8 @@ static int8_t *initNoise(noise_param_t *fp){ int pattern= fp->pattern; int8_t *noise; int i, j; - void *base; - noise = xine_xmalloc_aligned(16, MAX_NOISE*sizeof(int8_t), &base); + noise = av_mallocz(MAX_NOISE*sizeof(int8_t)); srand(123457); for(i=0,j=0; inoise= noise; - fp->base = base; fp->shiftptr= 0; return noise; } @@ -537,6 +536,8 @@ static void noise_dispose(post_plugin_t *this_gen) if (_x_post_dispose(this_gen)) { pthread_mutex_destroy(&this->lock); + av_free(this->params[0].noise); + av_free(this->params[1].noise); free(this); } } -- cgit v1.2.3 From 86aaaf9492b320350431f52f92053cf72ba9e8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Fri, 14 Dec 2007 19:21:31 +0100 Subject: Remove internal FFmpeg reference from build system. --- src/post/planar/Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/post/planar') diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 68a3953bf..c9a36a001 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -1,17 +1,13 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(VISIBILITY_FLAG) $(ff_cflags) +AM_CFLAGS = $(VISIBILITY_FLAG) AM_CPPFLAGS = AM_LDFLAGS = -$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a: - $(MAKE) -C $(top_builddir)/contrib ffmpeg/libpostproc/libpostproc.a - noinst_LTLIBRARIES = libpost_planar_asm.la libpost_planar_asm_la_SOURCES = eq.c eq2.c noise.c libpost_planar_asm_la_CFLAGS = $(O1_CFLAGS) -fomit-frame-pointer $(AM_CFLAGS) $(AVUTIL_CFLAGS) libpost_planar_asm_la_LIBADD = $(AVUTIL_LIBS) -libpost_planar_asm_la_DEPS = $(AVUTIL_DEPS) xinepost_LTLIBRARIES = xineplug_post_planar.la xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \ -- cgit v1.2.3 From 19357940a57c565ebe319729bd08d6e4800aff5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 1 Mar 2008 04:00:18 +0100 Subject: Update to the new FFmpeg's include directory. This also allows to remove the comment stating the includes come from libavutil, as it's now explicit. --- src/post/planar/noise.c | 3 +-- src/post/planar/pp.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/post/planar') diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index b1417801f..29d79fb14 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -27,8 +27,7 @@ #include #include -/* libavutil from FFmpeg */ -#include +#include #ifdef ARCH_X86_64 # define REG_a "rax" diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index f8c571dcb..dc455a858 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -25,7 +25,7 @@ #include #include #include -#include "postprocess.h" +#include #include #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ -- cgit v1.2.3 From 8063ffb8c0b354d54834ba53b22003dac481de2c Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 9 Apr 2008 19:10:58 +0100 Subject: Compilation fixes, mostly ffmpeg-related, and linkage fixes. Tests done on amd64 with ffmpeg 0.svn20080206 from Debian experimental. libavcodec 51.50.0, libavutil 49.6.0, libpostproc 51.1.0 --- src/post/planar/noise.c | 2 +- src/post/planar/pp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/post/planar') diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index 29d79fb14..e7a7c3d32 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -27,7 +27,7 @@ #include #include -#include +#include #ifdef ARCH_X86_64 # define REG_a "rax" diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index dc455a858..c39db87cd 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ -- cgit v1.2.3