mirror of https://github.com/mpv-player/mpv
moving postprocess code to libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9427 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael
parent
36f9921102
commit
dd16f0a075
16
Makefile
16
Makefile
|
|
@ -36,7 +36,7 @@ OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
|
|||
VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB)
|
||||
AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
|
||||
CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB)
|
||||
COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a $(PP_LIB) postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB)
|
||||
COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(CSS_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(STREAMING_LIB) $(WIN32_LIB) $(GIF_LIB)
|
||||
|
||||
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) # -Wall
|
||||
|
||||
|
|
@ -81,11 +81,6 @@ ALL_PRG += $(PRG_FIBMAP)
|
|||
endif
|
||||
|
||||
COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
|
||||
ifeq (($SHARED_PP),yes)
|
||||
COMMON_DEPS += postproc/libpostproc.so
|
||||
else
|
||||
COMMON_DEPS += postproc/libpostproc.a
|
||||
endif
|
||||
|
||||
ifeq ($(VIDIX),yes)
|
||||
COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
|
||||
|
|
@ -176,12 +171,6 @@ osdep/libosdep.a:
|
|||
postproc/libswscale.a:
|
||||
$(MAKE) -C postproc
|
||||
|
||||
postproc/libpostproc.a:
|
||||
$(MAKE) -C postproc
|
||||
|
||||
postproc/libpostproc.so:
|
||||
$(MAKE) -C postproc
|
||||
|
||||
input/libinput.a:
|
||||
$(MAKE) -C input
|
||||
|
||||
|
|
@ -250,9 +239,6 @@ $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
|
|||
install: $(ALL_PRG)
|
||||
ifeq ($(VIDIX),yes)
|
||||
$(DO_MAKE)
|
||||
endif
|
||||
ifeq ($(SHARED_PP),yes)
|
||||
$(MAKE) install -C postproc
|
||||
endif
|
||||
if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
|
||||
$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
|
||||
|
|
|
|||
|
|
@ -4494,11 +4494,6 @@ fi
|
|||
echores "$_byte_order"
|
||||
|
||||
echocheck "shared postprocess lib"
|
||||
if test "$_shared_pp" = yes ; then
|
||||
_ld_pp='-Lpostproc -lpostproc'
|
||||
else
|
||||
_ld_pp='postproc/libpostproc.a'
|
||||
fi
|
||||
echores "$_shared_pp"
|
||||
|
||||
echocheck "New config"
|
||||
|
|
@ -4836,8 +4831,8 @@ STREAMING = $_streaming
|
|||
STREAMING_LIVE_DOT_COM = $_live
|
||||
STREAMING_LIB = $_ld_streaming $_ld_live
|
||||
VIDIX = $_vidix
|
||||
PP_LIB = $_ld_pp
|
||||
SHARED_PP = $_shared_pp
|
||||
CONFIG_PP = yes
|
||||
CONFIG_RISKY = yes
|
||||
LIBMENU = $_menu
|
||||
I18NLIBS = $_i18n_libs
|
||||
|
|
|
|||
|
|
@ -37,8 +37,6 @@
|
|||
extern double video_time_usage;
|
||||
extern double vout_time_usage;
|
||||
|
||||
#include "postproc/postprocess.h"
|
||||
|
||||
#include "cpudetect.h"
|
||||
|
||||
int divx_quality=0;
|
||||
|
|
|
|||
|
|
@ -16,12 +16,14 @@
|
|||
#include "mp_image.h"
|
||||
#include "vf.h"
|
||||
|
||||
#ifdef USE_LIBAVCODEC
|
||||
|
||||
#define EMU_OLD
|
||||
|
||||
#include "../postproc/postprocess.h"
|
||||
#include "../libavcodec/libpostproc/postprocess.h"
|
||||
|
||||
#ifdef EMU_OLD
|
||||
#include "../postproc/postprocess_internal.h"
|
||||
#include "../libavcodec/libpostproc/postprocess_internal.h"
|
||||
#endif
|
||||
|
||||
struct vf_priv_s {
|
||||
|
|
@ -241,3 +243,5 @@ vf_info_t vf_info_pp = {
|
|||
};
|
||||
|
||||
//===========================================================================//
|
||||
|
||||
#endif // USE_LIBAVCODEC
|
||||
|
|
|
|||
|
|
@ -2,16 +2,9 @@
|
|||
include ../config.mak
|
||||
|
||||
SWSLIB = libswscale.a
|
||||
ifeq ($(SHARED_PP),yes)
|
||||
SPPLIB = libpostproc.so
|
||||
SPPVERSION = 0.0.1
|
||||
endif
|
||||
PPLIB = libpostproc.a
|
||||
|
||||
SWSSRCS=swscale.c rgb2rgb.c yuv2rgb.c
|
||||
SWSOBJS=$(SWSSRCS:.c=.o)
|
||||
PPOBJS=postprocess.o
|
||||
SPPOBJS=postprocess_pic.o
|
||||
CS_TEST_OBJS=cs_test.o rgb2rgb.o ../cpudetect.o ../mp_msg.o ../libvo/aclib.o
|
||||
|
||||
CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
|
||||
|
|
@ -24,7 +17,7 @@ CFLAGS = $(OPTFLAGS) $(MLIB_INC) -I. -I.. $(EXTRA_INC)
|
|||
.c.o:
|
||||
$(CC) -c $(CFLAGS) -I.. -o $@ $<
|
||||
|
||||
all: $(SWSLIB) $(PPLIB) $(SPPLIB)
|
||||
all: $(SWSLIB)
|
||||
|
||||
$(SWSLIB): $(SWSOBJS)
|
||||
$(AR) r $(SWSLIB) $(SWSOBJS)
|
||||
|
|
@ -43,29 +36,6 @@ depend:
|
|||
cs_test: $(CS_TEST_OBJS)
|
||||
$(CC) $(CS_TEST_OBJS) -o cs_test
|
||||
|
||||
ifeq ($(SHARED_PP),yes)
|
||||
postprocess_pic.o: postprocess.c
|
||||
$(CC) -c $(CFLAGS) -fomit-frame-pointer -fPIC -DPIC -I.. -o $@ $<
|
||||
|
||||
$(SPPLIB): $(SPPOBJS)
|
||||
$(CC) -shared -Wl,-soname,$(SPPLIB).0 \
|
||||
-o $(SPPLIB) $(SPPOBJS)
|
||||
endif
|
||||
|
||||
$(PPLIB): $(PPOBJS)
|
||||
$(AR) r $(PPLIB) $(PPOBJS)
|
||||
|
||||
install: all
|
||||
ifeq ($(SHARED_PP),yes)
|
||||
install -d $(prefix)/lib
|
||||
install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION)
|
||||
ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB)
|
||||
ldconfig || true
|
||||
mkdir -p $(prefix)/include/postproc
|
||||
install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
|
||||
endif
|
||||
|
||||
|
||||
#
|
||||
# include dependency files if they exist
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in New Issue