Changeset 4211

Timestamp:

07/04/08 14:22:11 (5 years ago)

Author:

soohyunc

Message:

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)

Location:

vic/branches/cc

Files:

• codec/compositor.cpp (modified) (2 diffs)
• codec/decoder-h264.cpp (modified) (3 diffs)
• codec/encoder-mpeg4.cpp (modified) (1 diff)
• codec/ffmpeg_codec.cpp (modified) (2 diffs)
• codec/p64/p64.cpp (modified) (1 diff)
• net/net-ip.cpp (modified) (1 diff)
• net/pktbuf.cpp (modified) (1 diff)
• net/pktbuf.h (modified) (1 diff)

vic/branches/cc/codec/compositor.cpp

@@ -204 +204 @@
                 p = n;
         }
+        overlays_=0;
 }
 
@@ -282 +283 @@
 
         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;

vic/branches/cc/codec/decoder-h264.cpp

@@ -91 +91 @@
      * we encounter QCIF instead.
      */
-    inw_ = 0;
-    inh_ = 0;
+    inw_ = 352;
+    inh_ = 288;
 
      /*XXX*/ 
@@ -246 +246 @@
             
             if (len < 0) {
-                //fprintf(stderr, "H264_RTP: frame error\n");
+                        //fprintf(stderr, "H264_RTP: frame error\n");
+                        debug_msg("H264_RTP: frame error\n");
             }
            
@@ -253 +254 @@
                         inh_ = h264.height;
                         resize(inw_, inh_);
-            }
-            else {
+            } else {
                         Decoder::redraw(xxx_frame);
             }

vic/branches/cc/codec/encoder-mpeg4.cpp

@@ -8 +8 @@
 #include "net.h"
 #include "rtp.h"
+#include "debug.h"
 #include "vic_tcl.h"
 #include "transmitter.h"

vic/branches/cc/codec/ffmpeg_codec.cpp

@@ -5 +5 @@
 #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()
@@ -144 +146 @@
     }
     width = height = 0;
+        frame_size = 0;
 
     picture = avcodec_alloc_frame();

vic/branches/cc/codec/p64/p64.cpp

@@ -65 +65 @@
 #ifdef WIN32
 //#include <winsock.h>
+typedef int intptr_t;
 #else
 #include <sys/param.h>

vic/branches/cc/net/net-ip.cpp

@@ -224 +224 @@
         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;

vic/branches/cc/net/pktbuf.cpp

@@ -36 +36 @@
 #include "pktbuf.h"
 
-pktbuf* BufferPool::freebufs_;
-int BufferPool::nbufs_;
+pktbuf* BufferPool::freebufs_=0;
+int BufferPool::nbufs_=0;
 
 /*static class BufferPoolClass : public TclClass {

vic/branches/cc/net/pktbuf.h

@@ -87 +87 @@
 class pktbuf : public Buffer {
 public:
+        pktbuf(): layer(0),len(0),ref(0) {};
         pktbuf* next;
         int layer;