Make current_IDR_display non-global.

diff --git a/h264encode.cpp b/h264encode.cpp
index e0083a13a3bbc33a41fd2b203029db685519eec5..2569470ef006e70806d8c40c8ae7c52a03abfd73 100644 (file)
--- a/h264encode.cpp
+++ b/h264encode.cpp
@@ -131,7 +131,6 @@ static  int rc_default_modes[] = {
     VA_RC_VCM,
     VA_RC_NONE,
 };
-static  unsigned long long current_IDR_display = 0;
 static  unsigned int current_frame_num = 0;
 
 static  int misc_priv_type = 0;
@@ -1365,7 +1364,7 @@ static int calc_poc(int pic_order_cnt_lsb, int frame_type)
     return TopFieldOrderCnt;
 }
 
-static int render_picture(int frame_type, int display_frame_num)
+static int render_picture(int frame_type, int display_frame_num, int gop_start_display_frame_num)
 {
     VABufferID pic_param_buf;
     VAStatus va_status;
@@ -1374,7 +1373,7 @@ static int render_picture(int frame_type, int display_frame_num)
     pic_param.CurrPic.picture_id = gl_surfaces[display_frame_num % SURFACE_NUM].ref_surface;
     pic_param.CurrPic.frame_idx = current_frame_num;
     pic_param.CurrPic.flags = 0;
-    pic_param.CurrPic.TopFieldOrderCnt = calc_poc((display_frame_num - current_IDR_display) % MaxPicOrderCntLsb, frame_type);
+    pic_param.CurrPic.TopFieldOrderCnt = calc_poc((display_frame_num - gop_start_display_frame_num) % MaxPicOrderCntLsb, frame_type);
     pic_param.CurrPic.BottomFieldOrderCnt = pic_param.CurrPic.TopFieldOrderCnt;
     CurrentCurrPic = pic_param.CurrPic;
 
@@ -1510,7 +1509,7 @@ static void render_packedslice()
     free(packedslice_buffer);
 }
 
-static int render_slice(int encoding_frame_num, int display_frame_num, int frame_type)
+static int render_slice(int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num, int frame_type)
 {
     VABufferID slice_param_buf;
     VAStatus va_status;
@@ -1553,7 +1552,7 @@ static int render_slice(int encoding_frame_num, int display_frame_num, int frame
     slice_param.slice_alpha_c0_offset_div2 = 0;
     slice_param.slice_beta_offset_div2 = 0;
     slice_param.direct_spatial_mv_pred_flag = 1;
-    slice_param.pic_order_cnt_lsb = (display_frame_num - current_IDR_display) % MaxPicOrderCntLsb;
+    slice_param.pic_order_cnt_lsb = (display_frame_num - gop_start_display_frame_num) % MaxPicOrderCntLsb;
     
 
     if (h264_packedheader &&
@@ -1898,6 +1897,7 @@ void H264Encoder::end_frame(RefCountedGLsync fence, int64_t pts, const vector<Re
 void H264Encoder::copy_thread_func()
 {
        int64_t last_dts = -1;
+       int gop_start_display_frame_num = 0;
        for (int encoding_frame_num = 0; ; ++encoding_frame_num) {
                PendingFrame frame;
                int pts_lag;
@@ -1907,7 +1907,7 @@ void H264Encoder::copy_thread_func()
                if (frame_type == FRAME_IDR) {
                        numShortTerm = 0;
                        current_frame_num = 0;
-                       current_IDR_display = display_frame_num;
+                       gop_start_display_frame_num = display_frame_num;
                }
 
                {
@@ -1933,11 +1933,11 @@ void H264Encoder::copy_thread_func()
                }
                last_dts = dts;
 
-               encode_frame(frame, encoding_frame_num, display_frame_num, frame_type, frame.pts, dts);
+               encode_frame(frame, encoding_frame_num, display_frame_num, gop_start_display_frame_num, frame_type, frame.pts, dts);
        }
 }
 
-void H264Encoder::encode_frame(H264Encoder::PendingFrame frame, int encoding_frame_num, int display_frame_num,
+void H264Encoder::encode_frame(H264Encoder::PendingFrame frame, int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num,
                                int frame_type, int64_t pts, int64_t dts)
 {
        // Wait for the GPU to be done with the frame.
@@ -1963,16 +1963,16 @@ void H264Encoder::encode_frame(H264Encoder::PendingFrame frame, int encoding_fra
 
        if (frame_type == FRAME_IDR) {
                render_sequence();
-               render_picture(frame_type, display_frame_num);
+               render_picture(frame_type, display_frame_num, gop_start_display_frame_num);
                if (h264_packedheader) {
                        render_packedsequence();
                        render_packedpicture();
                }
        } else {
                //render_sequence();
-               render_picture(frame_type, display_frame_num);
+               render_picture(frame_type, display_frame_num, gop_start_display_frame_num);
        }
-       render_slice(encoding_frame_num, display_frame_num, frame_type);
+       render_slice(encoding_frame_num, display_frame_num, gop_start_display_frame_num, frame_type);
 
        va_status = vaEndPicture(va_dpy, context_id);
        CHECK_VASTATUS(va_status, "vaEndPicture");

diff --git a/h264encode.h b/h264encode.h
index 5adb876db0d1f4207e4cb16762d08f99da7d7f3e..eadfca7f50a9e8bd19ddb011793dab46ac9f3c7e 100644 (file)
--- a/h264encode.h
+++ b/h264encode.h
@@ -88,7 +88,7 @@ private:
        };
 
        void copy_thread_func();
-       void encode_frame(PendingFrame frame, int encoding_frame_num, int display_frame_num,
+       void encode_frame(PendingFrame frame, int encoding_frame_num, int display_frame_num, int gop_start_display_frame_num,
                          int frame_type, int64_t pts, int64_t dts);
        void storage_task_thread();
        void storage_task_enqueue(storage_task task);