Changeset 2286

Timestamp:

03/13/99 17:02:22 (14 years ago)

Author:

ucacoxh

Message:

- Bug in vanilla encoder with variable frame codecs - it was packing
state + n * sizeof first frame instead of n + sizes of frames. grrr.
- Tidier bit packing in vdvi codec.

Location:

rat/trunk

Files:

• cc_vanilla.c (modified) (2 diffs)
• cx_vdvi.c (modified) (4 diffs)

rat/trunk/cc_vanilla.c

@@ -109 +109 @@
 
         for(i = 1; i < ve->nelem; i++) {
-                size += ve->elem[0]->rep[0]->data_len;
+                size += ve->elem[i]->rep[0]->data_len;
         }
 
@@ -333 +333 @@
                 done = cf->mean_per_packet_state_size;
                 while(done < len) {
-                        step = codec_peek_frame_size(cid, buf+done, (u_int16)done);
+                        step = codec_peek_frame_size(cid, buf+done, (u_int16)(len - done));
                         if (step == 0) {
                                 debug_msg("Zero data len for audio unit ?\n");

rat/trunk/cx_vdvi.c

@@ -48 +48 @@
 
 #ifdef TEST_VDVI
-#define NUM_TESTS 10000
+#define NUM_TESTS 100000
 
 #include <stdio.h>
@@ -106 +106 @@
                         assert(src[i] == dst[i]);
                 }
-        }
-        printf("Tested %d frames\n", n);
+                if (0 == (n % 1000)) {
+                        printf(".");
+                        fflush(stdout);
+                }
+        }
+        printf("\nTested %d frames\n", n);
         return 1;
 }
 #endif TEST_DVI
 
-/*
-typedef unsigned int  u_int;
-typedef unsigned char u_char;
-*/
 /* Bitstream structure to make life a little easier */
 
 typedef struct {
-        u_char *buf;
-        u_char *pos;
-        u_int   bits_remain;
-        u_int   len;
+        u_char *buf;    /* head of bitstream            */
+        u_char *pos;    /* current byte in bitstream    */
+        u_int   remain; /* bits remaining               */
+        u_int   len;    /* length of bitstream in bytes */
 } bs;
 
 __inline static void
-bs_init(bs *b, char *buf, int bytes)
-{
-        b->buf = b->pos = buf;
-        b->len = bytes;
-        b->bits_remain = 8;
+bs_init(bs *b, char *buf, int blen)
+{
+        b->buf    = b->pos = buf;
+        b->remain = 8;
+        b->len    = blen;
 }
 
 __inline static void
-bs_put(bs* b, u_char in, u_int n_in)
-{
-        register u_int   br, t;
-        u_char *p;
-
-        p  = b->pos;
-        br = b->bits_remain;
+bs_put(bs* b, u_char bits, u_int nbits)
+{
+        assert(nbits != 0 && nbits <= 8);
         
-        assert(n_in <= 8);
-
-        if (br == 0) {
-                br = 8;
-                p++;
-                *p = 0;
+        if (b->remain == 0) {
+                b->pos++;
+                b->remain = 8;
+        }
+
+        if (nbits > b->remain) {
+                u_int over = nbits - b->remain;
+                (*b->pos) |= (bits >> over);
+                b->pos++;
+                b->remain = 8 - over;
+                (*b->pos)  = (bits << b->remain);
+        } else {
+                (*b->pos) |= bits << (b->remain - nbits);
+                b->remain -= nbits;
         }
         
-        if (n_in > br) {
-                t = n_in - br;
-                *p |= in >> t;
-                p++;
-                br = 8 - t;
-                *p = in << br;
+        assert((u_int)(b->pos - b->buf) <= b->len);
+}
+
+__inline static u_char
+bs_get(bs *b, u_int nbits)
+{
+        u_char out;
+
+        if (b->remain == 0) {
+                b->pos++;
+                b->remain = 8;
+        }
+
+        if (nbits > b->remain) {
+                /* Get high bits */
+                out = *b->pos;
+                out <<= (8 - b->remain);
+                out >>= (8 - nbits);
+                b->pos++;
+                b->remain += 8 - nbits;
+                out |= (*b->pos) >> b->remain;
         } else {
-                *p |= in << ( br - n_in);
-                br -= n_in;
-        }
-
-        b->pos = p;
-        b->bits_remain = br;
-        assert(((u_char)(b->pos - b->buf) < b->len) ||
-                ((u_char)(b->pos - b->buf) == b->len && b->bits_remain == 8));
-}
-
-__inline static u_char
-bs_get(bs *b, u_int bits)
-{
-        register char *p;
-        register u_int br;
-
-        u_char mask,out;
-        
-        p  = b->pos;
-        br = b->bits_remain;
-
-        if (bits >= br) {
-                mask = 0xff >> (8 - br);
-                bits -= br;
-                out = (*p & mask) << bits;
-                p++;
-                br = 8 - bits;
-                mask = 0xff << br;
-                out |= (*p & mask) >> br;
-        } else {
-                br -= bits;
-                mask = (0xff >> (8 - bits));
-                mask <<=  br;
-                out  = (*p & mask) >> br;
-        }
-        b->pos = p;
-        b->bits_remain = br;
-        assert(((u_char)(b->pos - b->buf) < b->len) ||
-                ((u_char)(b->pos - b->buf) == b->len && b->bits_remain == 8));
+                out = *b->pos;
+                out <<= (8 - b->remain);
+                out >>= (8 - nbits);
+                b->remain -= nbits;
+        }
+
+        assert((u_int)(b->pos - b->buf) <= b->len);
         return out;
 }
 
+static u_int 
+bs_used(bs *b)
+{
+        u_int used = (u_int)(b->pos - b->buf);
+        if (b->remain != 8) {
+                used++;
+        }
+        return used;
+}
 
 /* VDVI translations as defined in draft-ietf-avt-profile-new-00.txt 
@@ -262 +258 @@
         }
         /* Return number of bytes used */
-        bytes_used  = (dst.pos - dst.buf);
-        bytes_used += (dst.bits_remain != 8) ? 1 : 0;
+        bytes_used  = bs_used(&dst);
         assert(bytes_used <= out_bytes);
         return bytes_used;
@@ -318 +313 @@
         }
 
-        bytes_used  = (bin.pos - bin.buf);
-        bytes_used += (bin.bits_remain != 8) ? 1 : 0;
+        bytes_used = bs_used(&bin);
 
         assert(bytes_used <= in_bytes);