[Sumover-dev] [svn commit] r4445 - in vic/branches/mpeg4: rtp

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Sun May 17 23:45:37 2009
New Revision: 4445

Modified:
   vic/branches/mpeg4/Makefile.in
   vic/branches/mpeg4/configure.in
   vic/branches/mpeg4/rtp/session.cpp

Log:
Removed USE_H261AS preprocessor conditional and enable/disable-h261as
configure switch.


Modified: vic/branches/mpeg4/Makefile.in
==============================================================================
--- vic/branches/mpeg4/Makefile.in	(original)
+++ vic/branches/mpeg4/Makefile.in	Sun May 17 23:45:37 2009
@@ -134,29 +134,32 @@
 OBJ1 =	net/inet.o net/inet6.o codec/cellb_tables.o tkStripchart.o \
 	md5c.o random.o @V_CPUDETECT_OBJ@ $(H263_OBJS)
 
-#	session-rtpv1.o session-nv.o session-ivs.o # Not supported anymore
 # .cpp objects
-OBJ2 =	main.o iohandler.o timer.o idlecallback.o media-timer.o \
-	rate-variable.o Tcl.o Tcl2.o module.o \
-	net/crypt.o net/crypt-des.o net/pkttbl.o net/pktbuf.o \
-	net/net.o net/net-ip.o net/net-addr.o net/net-ipv6.o \
-	net/mbus_handler.o net/mbus_engine.o net/group-ipc.o net/confbus.o \
-	rtp/session.o rtp/source.o rtp/transmitter.o rtp/pktbuf-rtp.o \
-	video/device.o video/grabber.o video/grabber-still.o video/grabber-file.o \
-	codec/encoder-h261.o codec/encoder-jpeg.o codec/encoder-raw.o \
-	codec/encoder-h263.o codec/encoder-h263v2.o codec/encoder-nv.o \
-	codec/encoder-cellb.o codec/encoder-pvh.o codec/compositor.o \
-	codec/jpeg/jpeg.o codec/p64/p64.o codec/dct.o codec/transcoder-jpeg.o \
-	codec/framer-jpeg.o codec/decoder-pvh.o video/assistor-list.o \
-	codec/decoder.o codec/decoder-jpeg.o codec/decoder-nv.o \
-	codec/decoder-h263.o codec/decoder-h263v2.o codec/decoder-cellb.o \
-	codec/decoder-h261.o codec/decoder-h261v1.o codec/decoder-raw.o \
-	render/renderer.o render/renderer-window.o render/color.o \
-	render/color-pseudo.o render/color-dither.o \
-	render/color-ed.o render/color-quant.o \
-	render/color-gray.o render/color-mono.o render/color-hist.o \
-	render/rgb-converter.o render/vw.o render/ppm.o @V_OBJ@
-
+OBJ2 =	idlecallback.o iohandler.o main.o media-timer.o module.o \
+	rate-variable.o Tcl.o Tcl2.o timer.o \
+	codec/compositor.o codec/dct.o \
+	codec/decoder-cellb.o \
+	codec/decoder-h261.o codec/decoder-h261v1.o codec/decoder-h261as.o \
+	codec/decoder-h263.o codec/decoder-h263v2.o codec/decoder-jpeg.o \
+	codec/decoder-nv.o codec/decoder.o codec/decoder-pvh.o \
+	codec/decoder-raw.o \
+	codec/encoder-cellb.o codec/encoder-h261.o codec/encoder-h261as.o \
+	codec/encoder-h263.o codec/encoder-h263v2.o codec/encoder-jpeg.o \
+	codec/encoder-nv.o codec/encoder-pvh.o codec/encoder-raw.o \
+	codec/framer-jpeg.o \
+	codec/jpeg/jpeg.o \
+	codec/p64/p64.o codec/p64/p64as.o codec/transcoder-jpeg.o \
+	net/confbus.o net/crypt-des.o net/crypt.o net/group-ipc.o \
+	net/mbus_engine.o net/mbus_handler.o net/net-addr.o \
+	net/net-ip.o net/net-ipv6.o net/net.o net/pktbuf.o net/pkttbl.o \
+	render/color-dither.o render/color-ed.o render/color-gray.o \
+	render/color-hist.o render/color-mono.o render/color.o \
+	render/color-pseudo.o render/color-quant.o render/ppm.o \
+	render/renderer.o render/renderer-window.o \
+	render/rgb-converter.o render/vw.o \
+	rtp/pktbuf-rtp.o rtp/session.o rtp/source.o rtp/transmitter.o \
+	video/assistor-list.o video/device.o video/grabber-file.o \
+	video/grabber.o video/grabber-still.o @V_OBJ@
 
 OBJ3 =	cm0.o cm1.o huffcode.o version.o bv.o codec/pvh-huff.o \
 	$(TCL_VIC:.tcl=.o) tk.o

Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in	(original)
+++ vic/branches/mpeg4/configure.in	Sun May 17 23:45:37 2009
@@ -236,14 +236,6 @@
    echo "No runtime cputect without --enable-gpl"
 fi
 
-V_H261AS=""
-dnl h261 as (arbitrary size) 
-AC_ARG_ENABLE(h261as, --disable-h261as         Enable or disable the h261as codec (default: enabled), h261as=no, h261as=yes)
-if test "$h261as" = "yes"; then
-   V_OBJ="$V_OBJ codec/p64/p64as.o codec/decoder-h261as.o codec/encoder-h261as.o"
-   V_H261AS="-DUSE_H261AS"
-fi
-
 V_DV=""
 dnl dv decoding support
 AC_ARG_ENABLE(dvdecode, --enable-dvdecode       Enable or disable dv decoding (default: disabled), dvdecode=yes, dvdecode=no)
@@ -674,6 +666,6 @@
 AC_SUBST(V_CODEC_LIB)
 AC_SUBST(V_CPUDETECT_OBJ)
 
-V_DEFINE="$V_DEFINE $V_SHM $V_H261AS $V_DV $V_XV $V_CPUDETECT -D$V_ARCH"
+V_DEFINE="$V_DEFINE $V_SHM $V_DV $V_XV $V_CPUDETECT -D$V_ARCH"
 
 builtin(include, configure.in.tail)

Modified: vic/branches/mpeg4/rtp/session.cpp
==============================================================================
--- vic/branches/mpeg4/rtp/session.cpp	(original)
+++ vic/branches/mpeg4/rtp/session.cpp	Sun May 17 23:45:37 2009
@@ -81,9 +81,7 @@
 		case RTP_PT_LDCT:
 		case RTP_PT_PVH:
 	        case RTP_PT_DV:
-#ifdef USE_H261AS
 		case RTP_PT_H261AS:
-#endif 
 		return (1);
 	}
 	return (0);