shithub: libvpx

Download patch

ref: e358ab5fc9cda71ea2c74eec0ed130940b9f5b17
parent: f349b071c6d5e806552c261ba13bd99bb5f7c6ce
author: Pengchong Jin <[email protected]>
date: Thu Jul 17 07:54:43 EDT 2014 

Fixed a bug of setting wrong first pass mb stats pointer

The bug sets the wrong pointer to the first pass mb stats
if the encoder does the re-coding in the second pass.

Change-Id: I8a11f45dd7dceb38de814adec24cecccae370d00


--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -3034,6 +3034,21 @@
   }
 }
 
+#if CONFIG_FP_MB_STATS
+static int input_fpmb_stats(FIRSTPASS_MB_STATS *firstpass_mb_stats,
+                            VP9_COMMON *cm, uint8_t **this_frame_mb_stats) {
+  uint8_t *mb_stats_in = firstpass_mb_stats->mb_stats_start +
+      cm->current_video_frame * cm->MBs * sizeof(uint8_t);
+
+  if (mb_stats_in > firstpass_mb_stats->mb_stats_end)
+    return EOF;
+
+  *this_frame_mb_stats = mb_stats_in;
+
+  return 1;
+}
+#endif
+
 static void encode_frame_internal(VP9_COMP *cpi) {
   SPEED_FEATURES *const sf = &cpi->sf;
   RD_OPT *const rd_opt = &cpi->rd;
@@ -3100,6 +3115,13 @@
   {
     struct vpx_usec_timer emr_timer;
     vpx_usec_timer_start(&emr_timer);
+
+#if CONFIG_FP_MB_STATS
+  if (cpi->use_fp_mb_stats) {
+    input_fpmb_stats(&cpi->twopass.firstpass_mb_stats, cm,
+                     &cpi->twopass.this_frame_mb_stats);
+  }
+#endif
 
     encode_tiles(cpi);
 
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -940,8 +940,6 @@
 
         cpi->twopass.firstpass_mb_stats.mb_stats_start =
             oxcf->firstpass_mb_stats_in.buf;
-        cpi->twopass.firstpass_mb_stats.mb_stats_in =
-            cpi->twopass.firstpass_mb_stats.mb_stats_start;
         cpi->twopass.firstpass_mb_stats.mb_stats_end =
             cpi->twopass.firstpass_mb_stats.mb_stats_start +
             (ps - 1) * cpi->common.MBs * sizeof(uint8_t);
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -148,16 +148,6 @@
 }
 
 #if CONFIG_FP_MB_STATS
-static int input_fpmb_stats(FIRSTPASS_MB_STATS *firstpass_mb_stats,
-                            VP9_COMMON *cm, uint8_t **this_frame_mb_stats) {
-  if (firstpass_mb_stats->mb_stats_in > firstpass_mb_stats->mb_stats_end)
-    return EOF;
-
-  *this_frame_mb_stats = firstpass_mb_stats->mb_stats_in;
-  firstpass_mb_stats->mb_stats_in += cm->MBs * sizeof(uint8_t);
-  return 1;
-}
-
 static void output_fpmb_stats(uint8_t *this_frame_mb_stats, VP9_COMMON *cm,
                          struct vpx_codec_pkt_list *pktlist) {
   struct vpx_codec_cx_pkt pkt;
@@ -2232,13 +2222,6 @@
 
   // Update the total stats remaining structure.
   subtract_stats(&twopass->total_left_stats, &this_frame);
-
-#if CONFIG_FP_MB_STATS
-  if (cpi->use_fp_mb_stats) {
-    input_fpmb_stats(&twopass->firstpass_mb_stats, cm,
-                     &twopass->this_frame_mb_stats);
-  }
-#endif
 }
 
 void vp9_twopass_postencode_update(VP9_COMP *cpi) {
--- a/vp9/encoder/vp9_firstpass.h
+++ b/vp9/encoder/vp9_firstpass.h
@@ -20,7 +20,6 @@
 
 #if CONFIG_FP_MB_STATS
 typedef struct {
-  uint8_t *mb_stats_in;
   uint8_t *mb_stats_start;
   uint8_t *mb_stats_end;
 } FIRSTPASS_MB_STATS;