[Sumover-dev] [svn commit] r3889 - in vic/branches/mpeg4: . codec
ffmpeg ffmpeg/doc
ffmpeg/libavcodec ffmpeg/postproc ffmpeg/tests ffmpeg/vhook
sumover-dev at cs.ucl.ac.uk
sumover-dev at cs.ucl.ac.uk
Wed Oct 11 12:54:16 BST 2006
Author: barz
Date: Wed Oct 11 12:49:23 2006
New Revision: 3889
Added:
vic/branches/mpeg4/ffmpeg/
- copied from r3886, /vic/branches/mpeg4/codec/ffmpeg/
vic/branches/mpeg4/ffmpeg/.cvsignore
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/.cvsignore
vic/branches/mpeg4/ffmpeg/COPYING
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/COPYING
vic/branches/mpeg4/ffmpeg/CREDITS
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/CREDITS
vic/branches/mpeg4/ffmpeg/Changelog
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/Changelog
vic/branches/mpeg4/ffmpeg/INSTALL
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/INSTALL
vic/branches/mpeg4/ffmpeg/Makefile
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/Makefile
vic/branches/mpeg4/ffmpeg/README
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/README
vic/branches/mpeg4/ffmpeg/berrno.h
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/berrno.h
vic/branches/mpeg4/ffmpeg/clean-diff
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/clean-diff
vic/branches/mpeg4/ffmpeg/cmdutils.c
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/cmdutils.c
vic/branches/mpeg4/ffmpeg/cmdutils.h
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/cmdutils.h
vic/branches/mpeg4/ffmpeg/config.mak
- copied, changed from r3888, /vic/branches/mpeg4/codec/ffmpeg/config.mak
vic/branches/mpeg4/ffmpeg/configure
- copied, changed from r3888, /vic/branches/mpeg4/codec/ffmpeg/configure
vic/branches/mpeg4/ffmpeg/cws2fws.c
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/cws2fws.c
vic/branches/mpeg4/ffmpeg/doc/
- copied from r3888, /vic/branches/mpeg4/codec/ffmpeg/doc/
vic/branches/mpeg4/ffmpeg/ffinstall.nsi
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/ffinstall.nsi
vic/branches/mpeg4/ffmpeg/ffmpeg.c
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/ffmpeg.c
vic/branches/mpeg4/ffmpeg/ffplay.c
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/ffplay.c
vic/branches/mpeg4/ffmpeg/ffserver.c
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/ffserver.c
vic/branches/mpeg4/ffmpeg/ffserver.h
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/ffserver.h
vic/branches/mpeg4/ffmpeg/libavcodec/
- copied from r3888, /vic/branches/mpeg4/codec/ffmpeg/libavcodec/
vic/branches/mpeg4/ffmpeg/libavcodec-uninstalled.pc
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/libavcodec-uninstalled.pc
vic/branches/mpeg4/ffmpeg/libavcodec.pc
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/libavcodec.pc
vic/branches/mpeg4/ffmpeg/libavformat/
- copied from r3888, /vic/branches/mpeg4/codec/ffmpeg/libavformat/
vic/branches/mpeg4/ffmpeg/libavformat-uninstalled.pc
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/libavformat-uninstalled.pc
vic/branches/mpeg4/ffmpeg/libavformat.pc
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/libavformat.pc
vic/branches/mpeg4/ffmpeg/libpostproc-uninstalled.pc
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/libpostproc-uninstalled.pc
vic/branches/mpeg4/ffmpeg/libpostproc.pc
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/libpostproc.pc
vic/branches/mpeg4/ffmpeg/output_example.c
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/output_example.c
vic/branches/mpeg4/ffmpeg/pktdumper.c
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/pktdumper.c
vic/branches/mpeg4/ffmpeg/postproc/
- copied from r3886, /vic/branches/mpeg4/postproc/
vic/branches/mpeg4/ffmpeg/postproc/Makefile
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/Makefile
vic/branches/mpeg4/ffmpeg/postproc/Makefile.mingw
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/Makefile.mingw
vic/branches/mpeg4/ffmpeg/postproc/aclib.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/aclib.c
vic/branches/mpeg4/ffmpeg/postproc/aclib_template.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/aclib_template.c
vic/branches/mpeg4/ffmpeg/postproc/asmalign.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/asmalign.h
vic/branches/mpeg4/ffmpeg/postproc/bswap.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/bswap.h
vic/branches/mpeg4/ffmpeg/postproc/config.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/config.h
vic/branches/mpeg4/ffmpeg/postproc/config.mak
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/config.mak
vic/branches/mpeg4/ffmpeg/postproc/cpudetect.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/cpudetect.h
vic/branches/mpeg4/ffmpeg/postproc/cs_test.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/cs_test.c
vic/branches/mpeg4/ffmpeg/postproc/deinterlace.cpp
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/deinterlace.cpp
vic/branches/mpeg4/ffmpeg/postproc/deinterlace.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/deinterlace.h
vic/branches/mpeg4/ffmpeg/postproc/fastmemcpy.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/fastmemcpy.h
vic/branches/mpeg4/ffmpeg/postproc/img_format.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/img_format.c
vic/branches/mpeg4/ffmpeg/postproc/img_format.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/img_format.h
vic/branches/mpeg4/ffmpeg/postproc/mangle.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/mangle.h
vic/branches/mpeg4/ffmpeg/postproc/mp_msg.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/mp_msg.c
vic/branches/mpeg4/ffmpeg/postproc/mp_msg.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/mp_msg.h
vic/branches/mpeg4/ffmpeg/postproc/rgb2rgb.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/rgb2rgb.c
vic/branches/mpeg4/ffmpeg/postproc/rgb2rgb.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/rgb2rgb.h
vic/branches/mpeg4/ffmpeg/postproc/rgb2rgb_template.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/rgb2rgb_template.c
vic/branches/mpeg4/ffmpeg/postproc/swscale-example.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/swscale-example.c
vic/branches/mpeg4/ffmpeg/postproc/swscale.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/swscale.c
vic/branches/mpeg4/ffmpeg/postproc/swscale.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/swscale.h
vic/branches/mpeg4/ffmpeg/postproc/swscale_altivec_template.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/swscale_altivec_template.c
vic/branches/mpeg4/ffmpeg/postproc/swscale_internal.h
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/swscale_internal.h
vic/branches/mpeg4/ffmpeg/postproc/swscale_template.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/swscale_template.c
vic/branches/mpeg4/ffmpeg/postproc/yuv2rgb.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/yuv2rgb.c
vic/branches/mpeg4/ffmpeg/postproc/yuv2rgb_altivec.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/yuv2rgb_altivec.c
vic/branches/mpeg4/ffmpeg/postproc/yuv2rgb_mlib.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/yuv2rgb_mlib.c
vic/branches/mpeg4/ffmpeg/postproc/yuv2rgb_template.c
- copied unchanged from r3888, /vic/branches/mpeg4/postproc/yuv2rgb_template.c
vic/branches/mpeg4/ffmpeg/qt-faststart.c
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/qt-faststart.c
vic/branches/mpeg4/ffmpeg/tests/
- copied from r3888, /vic/branches/mpeg4/codec/ffmpeg/tests/
vic/branches/mpeg4/ffmpeg/vhook/
- copied from r3888, /vic/branches/mpeg4/codec/ffmpeg/vhook/
vic/branches/mpeg4/ffmpeg/xvmc_render.h
- copied unchanged from r3888, /vic/branches/mpeg4/codec/ffmpeg/xvmc_render.h
Modified:
vic/branches/mpeg4/Makefile.in
vic/branches/mpeg4/codec/decoder-mpeg4.cpp
vic/branches/mpeg4/configure
vic/branches/mpeg4/configure.in.tail
Log:
put postproc into ffmpeg dir to reuse config.h
Modified: vic/branches/mpeg4/Makefile.in
==============================================================================
--- vic/branches/mpeg4/Makefile.in (original)
+++ vic/branches/mpeg4/Makefile.in Wed Oct 11 12:49:23 2006
@@ -58,7 +58,7 @@
INCLUDE_TK = @V_INCLUDE_TK@
INCLUDE_TCL = @V_INCLUDE_TCL@
INCLUDE_X11 = @V_INCLUDE_X11@
-INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/x264 -Icodec/ffmpeg -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src
+INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/x264 -Iffmpeg -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src
STATIC = @V_STATIC@
MKDEP = ./mkdep
@@ -88,8 +88,8 @@
SRC_GRABBER = $(OBJ_GRABBER:.o=.cpp)
OBJ_XIL = @V_OBJ_XIL@
OBJ_CRYPT = @V_OBJ_CRYPT@
-CODEC_LIB = codec/ffmpeg/libavcodec/libavcodec.a codec/x264/libx264.a codec/tmndec/libh263.a codec/tmn-x/libh263coder.a
-VIDEO_LIB = postproc/libswscale.a
+CODEC_LIB = ffmpeg/libavcodec/libavcodec.a codec/x264/libx264.a codec/tmndec/libh263.a codec/tmn-x/libh263coder.a
+VIDEO_LIB = ffmpeg/postproc/libswscale.a
LIB = $(LIB_GRABBER) @V_LIB_TK@ @V_LIB_TCL@ @V_LIB_X11@ @V_LIB@ $(CODEC_LIB) $(VIDEO_LIB) \
../common/src/libuclmmbase.a -lm -lz -lcrypto -lpthread -lXv
@@ -373,9 +373,9 @@
config.cache config.log domake.* dotar.*
cd codec/tmn && $(MAKE) clean
cd codec/tmndec && $(MAKE) realclean
- cd codec/ffmpeg && $(MAKE) clean
+ cd ffmpeg && $(MAKE) clean
+ cd ffmpeg/postproc && $(MAKE) clean
cd codec/x264 && $(MAKE) clean
- cd postproc && $(MAKE) clean
rm -f codec/tmn-x/*.o codec/tmn-x/*.a
realclean:
@@ -435,11 +435,11 @@
"chmod 444 $$name.tar.gz" ; \
chmod 444 $$name.tar.gz
-postproc/libswscale.a:
- (cd postproc; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" )
-
-codec/ffmpeg/libavcodec/libavcodec.a:
- (cd codec/ffmpeg/libavcodec; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" )
+ffmpeg/postproc/libswscale.a:
+ (cd ffmpeg/postproc; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" )
+
+ffmpeg/libavcodec/libavcodec.a:
+ (cd ffmpeg/libavcodec; $(MAKE) CC=$(CC) CCOPT="$(CCOPT)" )
codec/x264/libx264.a:
(cd codec/x264; $(MAKE) )
Modified: vic/branches/mpeg4/codec/decoder-mpeg4.cpp
==============================================================================
--- vic/branches/mpeg4/codec/decoder-mpeg4.cpp (original)
+++ vic/branches/mpeg4/codec/decoder-mpeg4.cpp Wed Oct 11 12:49:23 2006
@@ -81,7 +81,7 @@
mpeg4.init_decoder();
startPkt = false;
startFrame = false;
- std::cout << "allocate packet buffer\n";
+ // std::cout << "allocate packet buffer\n";
stream = new PacketBuffer(1024, 1280);
b_all = 1;
Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure (original)
+++ vic/branches/mpeg4/configure Wed Oct 11 12:49:23 2006
@@ -2748,10 +2748,10 @@
echo ""
echo "Configuring FFMpeg package for MPEG4 codec..."
-cd codec/ffmpeg; ./configure
+cd ffmpeg; ./configure
echo ""
echo "Configuring x264 for H.264 codec..."
-cd ../x264; ./configure; cd ../..
+cd ../codec/x264; ./configure; cd ../..
V_TAR_TARGET=$target_os
Modified: vic/branches/mpeg4/configure.in.tail
==============================================================================
--- vic/branches/mpeg4/configure.in.tail (original)
+++ vic/branches/mpeg4/configure.in.tail Wed Oct 11 12:49:23 2006
@@ -58,10 +58,10 @@
echo ""
echo "Configuring FFMpeg package for MPEG4 codec..."
-cd codec/ffmpeg; ./configure
+cd ffmpeg; ./configure
echo ""
echo "Configuring x264 for H.264 codec..."
-cd ../x264; ./configure; cd ../..
+cd ../codec/x264; ./configure; cd ../..
V_TAR_TARGET=$target_os
AC_SUBST(V_TAR_TARGET)
Copied: vic/branches/mpeg4/ffmpeg/config.mak (from r3888, /vic/branches/mpeg4/codec/ffmpeg/config.mak)
==============================================================================
--- /vic/branches/mpeg4/codec/ffmpeg/config.mak (original)
+++ vic/branches/mpeg4/ffmpeg/config.mak Wed Oct 11 12:49:23 2006
@@ -9,8 +9,8 @@
RANLIB=ranlib
STRIP=strip
INSTALLSTRIP=-s
-OPTFLAGS=-O3 -g
-SHCFLAGS=-O3 -g
+OPTFLAGS=-O3 -g -Wall -Wno-switch
+SHCFLAGS=-O3 -g -Wall -Wno-switch
LDFLAGS=-Wl,--warn-common -rdynamic
LDCONFIG=ldconfig
FFSLDFLAGS=-Wl,-E
@@ -42,7 +42,7 @@
CONFIG_ZLIB=yes
CONFIG_FFSERVER=yes
CONFIG_FFPLAY=yes
-SRC_PATH='/home/barz/UCL/vic-ucl/codec/ffmpeg'
+SRC_PATH='/home/barz/UCL/vic-ucl-test/ffmpeg'
CONFIG_AC3_ENCODER=yes
CONFIG_MP2_ENCODER=yes
CONFIG_MP3LAME_ENCODER=yes
Copied: vic/branches/mpeg4/ffmpeg/configure (from r3888, /vic/branches/mpeg4/codec/ffmpeg/configure)
==============================================================================
--- /vic/branches/mpeg4/codec/ffmpeg/configure (original)
+++ vic/branches/mpeg4/ffmpeg/configure Wed Oct 11 12:49:23 2006
@@ -1199,6 +1199,8 @@
echo " $0 $FFMPEG_CONFIGURATION" >> config.log
echo "# Automatically generated by configure - do not modify" > config.mak
echo "/* Automatically generated by configure - do not modify */" > $TMPH
+echo "#ifndef __FMPEG_CONFIG_H__" >> $TMPH
+echo "#define __FMPEG_CONFIG_H__" >> $TMPH
echo "#define FFMPEG_CONFIGURATION "'"'"$FFMPEG_CONFIGURATION"'"' >> $TMPH
echo "prefix=$prefix" >> config.mak
@@ -1649,6 +1651,8 @@
echo "CONFIG_`echo $codec | tr a-z A-Z`=yes" >> config.mak
done
+echo "#endif" >> $TMPH
+
diff $TMPH config.h >/dev/null 2>&1
if test $? -ne 0 ; then
mv -f $TMPH config.h
More information about the Sumover-dev
mailing list