Changeset 964

Timestamp:

11/05/99 12:30:25 (14 years ago)

Author:

piers

Message:

Altered to use new packet buffer class from MASH

Location:

vic/trunk/codec

Files:

• decoder-bvc.cpp (modified) (3 diffs)
• encoder-bvc.cpp (modified) (8 diffs)

vic/trunk/codec/decoder-bvc.cpp

@@ -14 +14 @@
         BvcDecoder();
         ~BvcDecoder();
-        virtual void recv(const struct rtphdr*, const u_char* data, int len);
+        virtual void recv(pktbuf* pb);
         void resize(int width, int height);
         int colorhist(u_int* hist) const;
@@ -813 +813 @@
 }
 
-void BvcDecoder::recv(const rtphdr* rh, const u_char* bp, int cc)
-{
+void BvcDecoder::recv(pktbuf* pb)
+{
+        rtphdr* rh = (rtphdr*)pb->dp;
+        int hdrsize = sizeof(rtphdr) + hdrlen();
+        u_char* bp = pb->dp + hdrsize;
+        int cc = pb->len - hdrsize;
+
         const bvchdr* ph = (bvchdr*)(rh + 1);
         int w = ph->width << 3;
@@ -840 +845 @@
                 resetndblk();
         }
+        pb->release();
 }
 

vic/trunk/codec/encoder-bvc.cpp

@@ -11 +11 @@
 #include "rtp.h"
 #include "crdef.h"
+#include "pktbuf-rtp.h"
 #include "module.h"
 #include "transmitter.h"
+
+#define HDRSIZE (sizeof(rtphdr) + sizeof(bvchdr))
 
 class BvcEncoder : public TransmitterModule {
@@ -22 +25 @@
  protected:
         void size(int w, int h);
-        Transmitter::pktbuf* getpkt(u_int32_t ts, int layer);
-        int flush(Transmitter::pktbuf* pb, int sync);
+        pktbuf* getpkt(u_int32_t ts, int layer);
+        int flush(pktbuf* pb, int sync);
         void quantizer(int n, int q);
         void encode_sbc(const u_char* blk);
@@ -105 +108 @@
 
 /*XXX share with h261*/
-int BvcEncoder::flush(Transmitter::pktbuf* pb, int sync)
+int BvcEncoder::flush(pktbuf* pb, int sync)
 {
         /* flush bit buffer */
         STORE_BITS(bs_, bb_);
 
-        int cc = bs_ - (u_char*)pb->iov[1].iov_base;
+        //int cc = bs_ - (u_char*)pb->iov[1].iov_base;
+        int cc = bs_ - (u_char*)&pb->data[HDRSIZE];
         cc += nbb_ >> 3;
         int nbit = nbb_ & 7;
@@ -121 +125 @@
                 abort();
 
-        pb->iov[0].iov_len = sizeof(rtphdr) + sizeof(bvchdr);
-        pb->iov[1].iov_len = cc;
-        rtphdr* rh = (rtphdr*)pb->iov[0].iov_base;
+        //pb->iov[0].iov_len = sizeof(rtphdr) + sizeof(bvchdr);
+        //pb->iov[1].iov_len = cc;
+        pb->len = cc + HDRSIZE;
+        //rtphdr* rh = (rtphdr*)pb->iov[0].iov_base;
+        rtphdr* rh = (rtphdr*)pb->data;
         if (sync)
                 rh->rh_flags |= htons(RTP_M);
@@ -131 +137 @@
         tx_->send(pb);
 
-        return (cc + sizeof(rtphdr) + sizeof(bvchdr));
+        return (cc + HDRSIZE);
 }
 
@@ -736 +742 @@
 }
 
-#define HDRSIZE (sizeof(rtphdr) + sizeof(bvchdr))
-
-Transmitter::pktbuf* BvcEncoder::getpkt(u_int32_t ts, int layer)
-{
-        Transmitter::pktbuf* pb = tx_->alloc(ts, RTP_PT_BVC);
+pktbuf* BvcEncoder::getpkt(u_int32_t ts, int layer)
+{
+        //Transmitter::pktbuf* pb = tx_->alloc(ts, RTP_PT_BVC);
+        pktbuf* pb = pool_->alloc(ts, RTP_PT_BVC);
         pb->layer = layer;
-        rtphdr* rh = (rtphdr*)pb->iov[0].iov_base;
+        //rtphdr* rh = (rtphdr*)pb->iov[0].iov_base;
+        rtphdr* rh = (rtphdr*)pb->data;
         bvchdr* bh = (bvchdr*)(rh + 1);
         bh->version = 0;
@@ -750 +756 @@
         bh->quant = htonl(quant_);
         bh->blkno = htons(blkno_);
-        bs_ = (u_char*)pb->iov[1].iov_base;
+        //bs_ = (u_char*)pb->iov[1].iov_base;
+        bs_ = (u_char*)&pb->data[HDRSIZE];
         es_ = bs_ + tx_->mtu() - HDRSIZE;
         bb_ = 0;
@@ -769 +776 @@
         const u_char* chm = frm + framesize_;
         blkno_ = -1;
-        Transmitter::pktbuf* pb = getpkt(p->ts_, layer);
+        pktbuf* pb = getpkt(p->ts_, layer);
         const u_int8_t* crv = p->crvec_;
-memset(&b, 0, sizeof(b));
+        memset(&b, 0, sizeof(b));
+
 #ifdef SBC_STAT
-if (f[0] == 0) {
-        f[0] = fopen("sbc0", "w");
-        f[1] = fopen("sbc1", "w");
-        f[2] = fopen("sbc2", "w");
-        f[3] = fopen("sbc3", "w");
-}
+        if (f[0] == 0) {
+                f[0] = fopen("sbc0", "w");
+                f[1] = fopen("sbc1", "w");
+                f[2] = fopen("sbc2", "w");
+                f[3] = fopen("sbc3", "w");
+        }
 #endif
         int cc = 0;