[Sumover-dev] [svn commit] r4211 - in vic/branches/cc: codec net

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

Author: soohyunc
Date: Fri Jul  4 14:22:11 2008
New Revision: 4211

Modified:
   vic/branches/cc/codec/compositor.cpp
   vic/branches/cc/codec/decoder-h264.cpp
   vic/branches/cc/codec/encoder-mpeg4.cpp
   vic/branches/cc/codec/ffmpeg_codec.cpp
   vic/branches/cc/codec/p64/p64.cpp
   vic/branches/cc/net/net-ip.cpp
   vic/branches/cc/net/pktbuf.cpp
   vic/branches/cc/net/pktbuf.h

Log:
sync'ing commits to the vic-mpeg4 branch
(for the commit comments, please refer to vic-mpeg4 branch's message)

(note: most of these commits done by Piers O'Hanlon)


Modified: vic/branches/cc/codec/compositor.cpp
==============================================================================
--- vic/branches/cc/codec/compositor.cpp	(original)
+++ vic/branches/cc/codec/compositor.cpp	Fri Jul  4 14:22:11 2008
@@ -203,6 +203,7 @@
 		delete p;
 		p = n;
 	}
+	overlays_=0;
 }
 
 int Compositor::command(int argc, const char*const* argv)
@@ -281,9 +282,9 @@
 	UNUSED(o); //SV-XXX: unused
 
 	for (onode** op = &overlays_; *op != 0; op = &(*op)->next) {
-		onode* p = (*op)->next;
-		if (*op == p) {
-			damage(p);
+		onode* p = (*op);
+		if (p->overlay == o) {
+			//damage(p);
 			*op = p->next;
 			delete p;
 			return;

Modified: vic/branches/cc/codec/decoder-h264.cpp
==============================================================================
--- vic/branches/cc/codec/decoder-h264.cpp	(original)
+++ vic/branches/cc/codec/decoder-h264.cpp	Fri Jul  4 14:22:11 2008
@@ -90,8 +90,8 @@
      * Assume CIF.  Picture header will trigger a resize if
      * we encounter QCIF instead.
      */
-    inw_ = 0;
-    inh_ = 0;
+    inw_ = 352;
+    inh_ = 288;
 
      /*XXX*/ 
     resize(inw_, inh_);
@@ -245,15 +245,15 @@
 	    }
 	    
 	    if (len < 0) {
-		//fprintf(stderr, "H264_RTP: frame error\n");
+			//fprintf(stderr, "H264_RTP: frame error\n");
+			debug_msg("H264_RTP: frame error\n");
 	    }
 	   
 	    if (inw_ != h264.width || inh_ != h264.height) {
 			inw_ = h264.width;
 			inh_ = h264.height;
 			resize(inw_, inh_);
-	    }
-	    else {
+	    } else {
 			Decoder::redraw(xxx_frame);
 	    }
 	    stream->clear();

Modified: vic/branches/cc/codec/encoder-mpeg4.cpp
==============================================================================
--- vic/branches/cc/codec/encoder-mpeg4.cpp	(original)
+++ vic/branches/cc/codec/encoder-mpeg4.cpp	Fri Jul  4 14:22:11 2008
@@ -7,6 +7,7 @@
 #include "inet.h"
 #include "net.h"
 #include "rtp.h"
+#include "debug.h"
 #include "vic_tcl.h"
 #include "transmitter.h"
 #include "pktbuf-rtp.h"

Modified: vic/branches/cc/codec/ffmpeg_codec.cpp
==============================================================================
--- vic/branches/cc/codec/ffmpeg_codec.cpp	(original)
+++ vic/branches/cc/codec/ffmpeg_codec.cpp	Fri Jul  4 14:22:11 2008
@@ -4,9 +4,11 @@
 #include <string.h>
 #include <iostream>
 #include <math.h>
-#include "config.h"
+#include "debug.h"
 #include "ffmpeg_codec.h"
-
+#ifndef _UNISTD_H
+extern "C" int getpid();
+#endif
 
 FFMpegCodec::FFMpegCodec()
 {
@@ -143,6 +145,7 @@
 	release();
     }
     width = height = 0;
+	frame_size = 0;
 
     picture = avcodec_alloc_frame();
     c = avcodec_alloc_context();

Modified: vic/branches/cc/codec/p64/p64.cpp
==============================================================================
--- vic/branches/cc/codec/p64/p64.cpp	(original)
+++ vic/branches/cc/codec/p64/p64.cpp	Fri Jul  4 14:22:11 2008
@@ -64,6 +64,7 @@
 
 #ifdef WIN32
 //#include <winsock.h>
+typedef int intptr_t;
 #else
 #include <sys/param.h>
 #include <sys/file.h>

Modified: vic/branches/cc/net/net-ip.cpp
==============================================================================
--- vic/branches/cc/net/net-ip.cpp	(original)
+++ vic/branches/cc/net/net-ip.cpp	Fri Jul  4 14:22:11 2008
@@ -223,7 +223,7 @@
 {
 	char *g_addr;
 	// Check for SSM src address: Src,Group
-	if ((g_addr=strchr(host,(int)','))!=NULL) {
+	if ((g_addr=(char*)strchr(host,(int)','))!=NULL) {
 		char s_addr_ssm[MAXHOSTNAMELEN];
 		int i=0;
 		while (&host[i]<g_addr) {

Modified: vic/branches/cc/net/pktbuf.cpp
==============================================================================
--- vic/branches/cc/net/pktbuf.cpp	(original)
+++ vic/branches/cc/net/pktbuf.cpp	Fri Jul  4 14:22:11 2008
@@ -35,8 +35,8 @@
 
 #include "pktbuf.h"
 
-pktbuf* BufferPool::freebufs_;
-int BufferPool::nbufs_;
+pktbuf* BufferPool::freebufs_=0;
+int BufferPool::nbufs_=0;
 
 /*static class BufferPoolClass : public TclClass {
 public:

Modified: vic/branches/cc/net/pktbuf.h
==============================================================================
--- vic/branches/cc/net/pktbuf.h	(original)
+++ vic/branches/cc/net/pktbuf.h	Fri Jul  4 14:22:11 2008
@@ -86,6 +86,7 @@
 
 class pktbuf : public Buffer {
 public:
+	pktbuf(): layer(0),len(0),ref(0) {};
 	pktbuf* next;
 	int layer;
 	int len;