Merge pull request #43 from mpeg5/dev-DTSfromPTS

update DTS

Author: mpeg5

app/xeve_app.c

@@ -44,6 +44,11 @@
 #ifdef _WIN32
 #define y4m_struct_stat struct _stati64
 #define y4m_fstat _fstati64
+
+#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)
+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#endif
+
 #else
 #define y4m_struct_stat struct stat
 #define y4m_fstat fstat
@@ -1325,7 +1330,7 @@ int main(int argc, const char **argv)
             }
 
             /* store reconstructed image to list */
-            ilist_t = imgb_list_put(ilist_rec, imgb_rec, imgb_rec->ts[0]);
+            ilist_t = imgb_list_put(ilist_rec, imgb_rec, imgb_rec->ts[XEVE_TS_PTS]);
             if(ilist_t == NULL)
             {
                 logerr("cannot put reconstructed image to list\n");

app/xeve_app_util.h

@@ -464,6 +464,9 @@ static void imgb_cpy(XEVE_IMGB * dst, XEVE_IMGB * src)
         dst->y[i] = src->y[i];
         dst->w[i] = src->w[i];
         dst->h[i] = src->h[i];
+    }
+    for (i = 0; i < XEVE_TS_NUM; i++)
+    {
         dst->ts[i] = src->ts[i];
     }
 }

inc/xeve.h

@@ -175,6 +175,9 @@ extern "C"
  * type and macro for media time
  *****************************************************************************/
 typedef long long                        XEVE_MTIME; /* in 100-nanosec unit */
+#define XEVE_TS_PTS                      0
+#define XEVE_TS_DTS                      1
+#define XEVE_TS_NUM                      2
 
 /*****************************************************************************
  * profiles
@@ -241,7 +244,7 @@ struct _XEVE_IMGB
     void              * a[XEVE_IMGB_MAX_PLANE];
 
     /* time-stamps */
-    XEVE_MTIME          ts[4];
+    XEVE_MTIME          ts[XEVE_TS_NUM];
 
     int                 ndata[4]; /* arbitrary data, if needs */
     void              * pdata[4]; /* arbitrary adedress if needs */
@@ -292,7 +295,7 @@ typedef struct _XEVE_BITB
     /* arbitrary address, if needs */
     void              * pdata[4];
     /* time-stamps */
-    XEVE_MTIME          ts[4];
+    XEVE_MTIME          ts[XEVE_TS_NUM];
 
 } XEVE_BITB;
 

src_base/xeve_enc.c

@@ -683,6 +683,21 @@ int xeve_push_frm(XEVE_CTX * ctx, XEVE_IMGB * img)
         xeve_mset(pico->sinfo.transfer_cost, 0, sizeof(u16) * ctx->fcst.f_blk);
         xeve_picbuf_expand(spic, spic->pad_l, spic->pad_c, ctx->sps.chroma_format_idc);
     }
+
+    if (ctx->ts.frame_delay > 0)
+    {
+        if (ctx->pic_icnt == 0)
+        {
+            ctx->ts.frame_first_pts = pic->imgb->ts[XEVE_TS_PTS];
+        }
+        else if (ctx->pic_icnt == ctx->ts.frame_delay)
+        {
+            ctx->ts.frame_dealy_time = ctx->ts.frame_first_pts - pic->imgb->ts[XEVE_TS_PTS];
+        }
+    }
+
+    ctx->ts.frame_ts[ctx->pic_icnt % XEVE_MAX_INBUF_CNT] = pic->imgb->ts[XEVE_TS_PTS];
+
     return XEVE_OK;
 }
 
@@ -1265,15 +1280,27 @@ int xeve_pic_finish(XEVE_CTX *ctx, XEVE_BITB *bitb, XEVE_STAT *stat)
         }
     }
 
+    imgb_c->ts[XEVE_TS_PTS] = bitb->ts[XEVE_TS_PTS] = imgb_o->ts[XEVE_TS_PTS];
+    if (ctx->ts.frame_delay > 0)
+    {
+        if (ctx->pic_cnt < ctx->ts.frame_delay)
+        {
+            imgb_c->ts[XEVE_TS_DTS] = bitb->ts[XEVE_TS_DTS] = ctx->ts.frame_ts[ctx->pic_cnt % XEVE_MAX_INBUF_CNT] + ctx->ts.frame_dealy_time;
+        }
+        else
+        {
+            imgb_c->ts[XEVE_TS_DTS] = bitb->ts[XEVE_TS_DTS] = ctx->ts.frame_ts[(ctx->pic_cnt - ctx->ts.frame_delay) % XEVE_MAX_INBUF_CNT];
+        }
+    }
+    else
+    {
+        imgb_c->ts[XEVE_TS_DTS] = bitb->ts[XEVE_TS_DTS] = ctx->ts.frame_ts[ctx->pic_cnt % XEVE_MAX_INBUF_CNT];
+    }
+
     ctx->pic_cnt++; /* increase picture count */
     ctx->param.f_ifrm = 0; /* clear force-IDR flag */
     ctx->pico->is_used = 0;
 
-    imgb_c->ts[0] = bitb->ts[0] = imgb_o->ts[0];
-    imgb_c->ts[1] = bitb->ts[1] = imgb_o->ts[1];
-    imgb_c->ts[2] = bitb->ts[2] = imgb_o->ts[2];
-    imgb_c->ts[3] = bitb->ts[3] = imgb_o->ts[3];
-
     if (ctx->param.rc_type != 0)
     {
         ctx->rcore->real_bits = (stat->write - stat->sei_size) << 3;
@@ -1757,6 +1784,8 @@ int xeve_ready(XEVE_CTX* ctx)
     xeve_mset(ctx->sh_array, 0, sizeof(XEVE_SH) * ctx->ts_info.num_slice_in_pic);
     ctx->sh = &ctx->sh_array[0];
 
+    ctx->ts.frame_delay = ctx->param.bframes > 0 ? 8 : 0;
+
     return XEVE_OK;
 ERR:
     for (i = 0; i < (int)ctx->f_lcu; i++)

src_base/xeve_type.h

@@ -556,6 +556,15 @@ typedef struct _XEVE_TS_INFO
     int                 num_remaining_tiles_in_slice_minus1[XEVE_MAX_NUM_TILES >> 1];
 } XEVE_TS_INFO;
 
+/* time stamp */
+typedef struct _XEVE_TIME_STAMP
+{
+    int                frame_delay;
+    XEVE_MTIME         frame_first_pts;
+    XEVE_MTIME         frame_dealy_time;
+    XEVE_MTIME         frame_ts[XEVE_MAX_INBUF_CNT];
+}XEVE_TIME_STAMP;
+
 typedef struct _XEVE_CU_DATA
 {
     s8                 split_mode[NUM_CU_DEPTH][NUM_BLOCK_SHAPE][MAX_CU_CNT_IN_LCU];
@@ -783,6 +792,8 @@ struct _XEVE_CTX
     XEVE_SH          * sh_array;
     /* reference picture manager */
     XEVE_PM            rpm;
+    /* time stamp */
+    XEVE_TIME_STAMP    ts;
     /* quantization value of current encoding slice */
     u8                 qp;
     /* encoding picture width */

src_base/xeve_util.c

@@ -1856,6 +1856,9 @@ void xeve_imgb_cpy(XEVE_IMGB * dst, XEVE_IMGB * src)
         dst->y[i] = src->y[i];
         dst->w[i] = src->w[i];
         dst->h[i] = src->h[i];
+    }
+    for (i = 0; i < XEVE_TS_NUM; i++)
+    {
         dst->ts[i] = src->ts[i];
     }
 }