Changeset 4685

Timestamp:

03/12/10 02:10:27 (3 years ago)

Author:

soohyunc

Message:

-- added mechanisms to keep track of

sent packets
didn't sent packets

per frame

so that we could do some necessary actions when:

capture frames faster than transmitting
(e.g., building transmitter queue forever)

currently, action fields are left empty.

Location:

vic/branches/cc

Files:

• cc/o.sh (modified) (1 diff)
• codec/encoder-h261.cpp (modified) (8 diffs)

vic/branches/cc/cc/o.sh

@@ -13 +13 @@
 
 # encoding time difference
-grep enc_time trace.s | grep -v pid | awk '{if($1=="num:" && $3=="enc_time:") print}' | awk '{print $2"\t"$4}' > enct.xg
+grep enc_time trace.s | grep -v pid | awk '{if($1=="now:" && $3=="enc_time:") print}' | awk '{print $2"\t"$4}' > enct.xg
 
 # start grab

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

@@ -114 +114 @@
 }
 
+// frame history size to keep track the number of packets per frame
+#define FHSIZE  10
 
 class H261Encoder : public TransmitterModule {
     public:
         void setq(int q);
+
+        // Tx pktbuf size
+        int txq_beg_;
+        int txq_end_;
+        int txq_dif_;
+        // number of transmitted packets for this round of encoding
+        int num_sent_;
+        // number of sent packets in between two encoding instances
+        // (these packets were sent from the Tx queue upon XR reception)
+        int sent_more_;
+        // packets per frame
+        int ppframe_[FHSIZE];
+        inline void init_ppframe() {
+                for (int i = 0; i < FHSIZE; i++)
+                ppframe_[i] = 0;
+        }
+        // video frame number
+        int vfno_;
+
     protected:
         H261Encoder(int ft);
@@ -137 +158 @@
                 return ((double) tv.tv_sec + 1e-6 * (double) tv.tv_usec);
         }
-        double ts_off_; // timestamp offset
         double enc_start_;      // encoding start timestamp
         double enc_end_;        // encoding end timestamp
-        int encno_;     // number of encoding routine 
 
         /* bit buffer */
@@ -177 +196 @@
         u_int loff_[12];        /* where to find Y given gob# */
         u_int blkno_[12];       /* for CR */
+
+private:
 };
 
@@ -221 +242 @@
         enc_start_ = 0.0;
         enc_end_ = 0.0;
-        encno_ = 1;
+
+        // Tx pktbuf size
+        txq_beg_ = 0;
+        txq_end_ = 0;
+        txq_dif_ = 0;
+        // number of transmitted packets for this round of encoding
+        num_sent_ = 0;
+        // number of sent packets in between two encoding instances
+        // (these packets were sent from the Tx queue upon XR reception)
+        sent_more_ = 0;
+
+        // packets per frame
+        init_ppframe();
+        // video frame number
+        vfno_ = 0;
 
         for (int q = 0; q < 32; ++q) {
@@ -769 +804 @@
                         bb_ = 0;
         }
+        // increment the number of packets for this frame
+        ppframe_[vfno_%FHSIZE]++;
+        fprintf(stderr, "\tnow: %f\tppframe[%d]: %d\n",
+        h261_now()-offset(), vfno_%FHSIZE, ppframe_[vfno_%FHSIZE]);
         tx_->send(pb);
 
@@ -786 +825 @@
 int H261PixelEncoder::consume(const VideoFrame *vf)
 {
+        // adjust timestamp offset
+        tx_->tx_now_offset_ = offset();
+
+        // (get the necessary stats before encoding) ---------------------*
+        // Tx queue size before entering this encoding
+        txq_beg_ = tx_->tx_buf_size();
+        // sent packets after the previous encoding round, 
+        // but before starting this encoding instance.
+        // -- these packets were sent from the Tx queue 
+        //    upon XR reception in between two encoding instances.
+        sent_more_ = txq_end_ - txq_beg_;
+
+        fprintf(stderr, "\tnow: %f\tsent: %d more: %d vf[%d]: %d\n",
+        h261_now()-offset(), num_sent_, sent_more_, vfno_%FHSIZE, ppframe_[vfno_%FHSIZE]);
+
+        // all encoded packets associated with 
+        // the previously captured frame have been sent 
+        if (num_sent_ + sent_more_ == ppframe_[vfno_%FHSIZE]) {
+        }
+        // some packets associated with 
+        // the previously captured frame have not been sent
+        if (num_sent_ + sent_more_ < ppframe_[vfno_%FHSIZE]) {
+        }
+        // more packets have been sent than the encoded packets
+        // perhaps, there were some packets in the tx queue, and
+        // cwnd has been increrased allowing sending them all.
+        if (num_sent_ + sent_more_ > ppframe_[vfno_%FHSIZE]) {
+        }
+        // ---------------------------------------------------------------*
+
+        // increment frame number
+        if (vfno_++%FHSIZE == 0) 
+        init_ppframe();
+
+        // check size
         if (!samesize(vf))
                 size(vf->width_, vf->height_);
 
+        // main encoding loop
+        // (send packets while encoding)
         YuvFrame* p = (YuvFrame*)vf;
-        return(encode(p, p->crvec_));
+        int cc = encode(p, p->crvec_);
+
+        // Tx queue size after finishing encoding
+        txq_end_ = tx_->tx_buf_size();
+        txq_dif_ = txq_end_ - txq_beg_;
+        // number of Tx'd packets during this encoding instance
+        // (these Tx'd packets may include the previous frame(s).)
+        num_sent_ = ppframe_[vfno_%FHSIZE] - txq_dif_;
+
+        fprintf(stderr, "   now: %f\ttxq_end: %d\tdif: %d\n", 
+                h261_now()-offset(), txq_end_, txq_dif_);
+
+        fprintf(stderr, "   now: %f\tenc_time: %f\n\n", 
+                h261_now()-offset(), (enc_end_ - enc_start_));
+
+        return(cc);
 }
                 
@@ -797 +888 @@
 H261Encoder::encode(const VideoFrame* vf, const u_int8_t *crvec)
 {
-        //fprintf(stderr,"\nH261Encoder encode()\n");
-        ts_off_ = offset();
-        tx_->tx_now_offset_ = ts_off_;
-        enc_start_ = h261_now() - ts_off_;
+        enc_start_ = h261_now()-offset();
         fprintf(stderr,">>>h261_encode_start\tnow: %f\n", enc_start_);
 
@@ -898 +986 @@
 
         // time measurement
-        enc_end_ = h261_now() - ts_off_;
+        enc_end_ = h261_now()-offset();
         fprintf(stderr,"\n>>>h261_encode_end\tnow: %f\n", enc_end_);
-        fprintf(stderr,"   num: %d\tenc_time: %f\n\n", 
-                encno_++, (enc_end_ - enc_start_));
 
         return (cc);