Diff of /xvidcore/src/plugins/plugin_2pass2.c

-revision 1.1.2.32, Sun Dec 21 12:41:48 2003 UTC
+revision 1.1.2.37, Sat Jan 31 14:51:56 2004 UTC
 Line 35
  /* forces second pass not to be bigger than first */
  #undef PASS_SMALLER
+ /* automtically alters overflow controls (strength and improvement/degradation)
+         to fight most common problems without user's knowladge */
+ #define SMART_OVERFLOW_SETTING
  #include <stdio.h>
  #include <math.h>
  #include <limits.h>
-Line 130
+Line 134
          /*----------------------------------
           * Zones statistical data
-          *
-          * ToDo: Fix zones, current
-          *       implementation is buggy
           *--------------------------------*/
-         /* Average weight of the zones */
-         double avg_weight;
          /* Total length used by XVID_ZONE_QUANT zones */
          uint64_t tot_quant;
          uint64_t tot_quant_invariant;
+         /* Holds the total amount of frame bytes, zone weighted (only scalable
+          * part of frame bytes) */
+         uint64_t tot_weighted;
          /*----------------------------------
           * Advanced settings helper ratios
           *--------------------------------*/
-Line 210
+Line 212
           * ToDo: description */
          double fq_error;
+         int min_quant; /* internal minimal quant, prevents wrong quants from being used */
          /*----------------------------------
           * Debug
           *--------------------------------*/
-Line 313
+Line 317
          for (i=0; i<3; i++) rc->last_quant[i] = 0;
          rc->fq_error = 0;
+         rc->min_quant = 1;
          /* Count frames (and intra frames) in the stats file, store the result into
           * the rc structure */
-Line 375
+Line 380
          if(rc->param.container_frame_overhead)
                  DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- New target filesize after container compensation: %lld\n", rc->target);
+         /* When bitrate is not given it means it has been scaled by an external
+          * application */
+         if (rc->param.bitrate) {
+                 /* Apply zone settings
+                  * - set rc->tot_quant which represents the total num of bytes spent in
+                  *   fixed quant zones
+                  * - set rc->tot_weighted which represents the total amount of bytes
+                  *   spent in normal or weighted zones in first pass (normal zones can
+                  *   be considered weight=1)
+                  * - set rc->tot_quant_invariant which represents the total num of bytes
+                  *   spent in fixed quant zones for headers */
+                 zone_process(rc, create);
+         } else {
+                 /* External scaling -- zones are ignored */
+                 for (i=0;i<rc->num_frames;i++) {
+                         rc->stats[i].zone_mode = XVID_ZONE_WEIGHT;
+                         rc->stats[i].weight = 1.0;
+                 }
+                 rc->tot_quant = 0;
+         }
          /* Gathers some information about first pass stats:
           *  - finds the minimum frame length for each frame type during 1st pass.
           *     rc->min_size[]
-Line 390
+Line 416
           */
          first_pass_stats_prepare_data(rc);
-         /* When bitrate is not given it means it has been scaled by an external
+         /* If we have a user bitrate, it means it's an internal curve scaling */
-          * application */
          if (rc->param.bitrate) {
-                 /* Apply zone settings
-                  * - set rc->tot_quant which represents the total num of bytes spent in
-                  *   fixed quant zones
-                  * - set rc->tot_quant_invariant which represents the total num of bytes spent
-                  *   in fixed quant zones for headers */
-                 zone_process(rc, create);
                  /* Perform internal curve scaling */
                  first_pass_scale_curve_internal(rc);
-         } else {
-                 /* External scaling -- zones are ignored */
-                 for (i=0;i<rc->num_frames;i++) {
-                         rc->stats[i].zone_mode = XVID_ZONE_WEIGHT;
-                         rc->stats[i].weight = 1.0;
-                 }
-                 rc->avg_weight = 1.0;
-                 rc->tot_quant = 0;
          }
          /* Apply advanced curve options, and compute some parameters in order to
-Line 457
+Line 468
          if (data->quant > 0)
                  return(0);
-         /* Second case: insufficent stats data */
+         /* Second case: insufficent stats data
+          * We can't guess much what we should do, let core decide all alone */
          if (data->frame_num >= rc->num_frames) {
                  DPRINTF(XVID_DEBUG_RC,"[xvid rc] -- stats file too short (now processing frame %d)",
                          data->frame_num);
                  return(0);
          }
-         /* Third case: We are in a Quant zone */
+         /* Third case: We are in a Quant zone
+          * Quant zones must just ensure we use the same settings as first pass
+          * So set the quantizer and the type */
          if (s->zone_mode == XVID_ZONE_QUANT) {
+                 /* Quant stuff */
                  rc->fq_error += s->weight;
                  data->quant = (int)rc->fq_error;
                  rc->fq_error -= data->quant;
+                 /* The type stuff */
+                 data->type = s->type;
+                 /* The only required data for AFTER step is this one for the overflow
+                  * control */
                  s->desired_length = s->length;
                  return(0);
-Line 604
+Line 624
  #ifdef PASS_SMALLER
          if (dbytes > s->length) {
                  dbytes = s->length;
-         } else
+         }
  #endif
+         /* Prevent stupid desired sizes under logical values */
                  if (dbytes < rc->min_length[s->type-1]) {
                  dbytes = rc->min_length[s->type-1];
-         } else if (dbytes > rc->max_length) {
-                 /* ToDo: this condition is always wrong as max_length == maximum frame
-                  * length of first pass, so the first condition already caps the frame
-                  * size... */
-                 capped_to_max_framesize = 1;
-                 dbytes = rc->max_length;
-                 DPRINTF(XVID_DEBUG_RC,"[xvid rc] -- frame:%d Capped to maximum frame size\n",
-                                 data->frame_num);
          }
          /*------------------------------------------------------------------------
-Line 700
+Line 714
                  data->quant = data->max_quant[s->type-1];
          }
+         if (data->quant < rc->min_quant) data->quant = rc->min_quant;
          /* To avoid big quality jumps from frame to frame, we apply a "security"
           * rule that makes |last_quant - new_quant| <= 2. This rule only applies
           * to predicted frames (P and B) */
-Line 975
+Line 991
  /* pre-process the statistics data
   * - for each type, count, tot_length, min_length, max_length
-  * - set keyframes_locations */
+  * - set keyframes_locations, tot_prescaled */
  static void
  first_pass_stats_prepare_data(rc_2pass2_t * rc)
  {
-Line 992
+Line 1008
          }
          rc->max_length = INT_MIN;
+         rc->tot_weighted = 0;
          /* Loop through all frames and find/compute all the stuff this function
           * is supposed to do */
-Line 1001
+Line 1018
                  rc->count[s->type-1]++;
                  rc->tot_length[s->type-1] += s->length;
                  rc->tot_invariant[s->type-1] += s->invariant;
+                 if (s->zone_mode != XVID_ZONE_QUANT)
+                         rc->tot_weighted += (int)(s->weight*(s->length - s->invariant));
                  if (s->length < rc->min_length[s->type-1]) {
                          rc->min_length[s->type-1] = s->length;
-Line 1035
+Line 1054
          int i,j;
          int n = 0;
-         rc->avg_weight = 0.0;
          rc->tot_quant = 0;
          rc->tot_quant_invariant = 0;
-Line 1044
+Line 1062
                          rc->stats[j].zone_mode = XVID_ZONE_WEIGHT;
                          rc->stats[j].weight = 1.0;
                  }
-                 rc->avg_weight += rc->num_frames * 1.0;
                  n += rc->num_frames;
          }
-Line 1053
+Line 1070
                  int next = (i+1<create->num_zones) ? create->zones[i+1].frame : rc->num_frames;
+                 /* Zero weight make no sense */
+                 if (create->zones[i].increment == 0) create->zones[i].increment = 1;
+                 /* And obviously an undetermined infinite makes even less sense */
+                 if (create->zones[i].base == 0) create->zones[i].base = 1;
                  if (i==0 && create->zones[i].frame > 0) {
                          for (j = 0; j < create->zones[i].frame && j < rc->num_frames; j++) {
                                  rc->stats[j].zone_mode = XVID_ZONE_WEIGHT;
                                  rc->stats[j].weight = 1.0;
                          }
-                         rc->avg_weight += create->zones[i].frame * 1.0;
                          n += create->zones[i].frame;
                  }
-Line 1068
+Line 1089
                                  rc->stats[j].weight = (double)create->zones[i].increment / (double)create->zones[i].base;
                          }
                          next -= create->zones[i].frame;
-                         rc->avg_weight += (double)(next * create->zones[i].increment) / (double)create->zones[i].base;
                          n += next;
                  } else{  /* XVID_ZONE_QUANT */
                          for (j = create->zones[i].frame; j < next && j < rc->num_frames; j++ ) {
-Line 1079
+Line 1099
                          }
                  }
          }
-         rc->avg_weight = n>0 ? rc->avg_weight/n : 1.0;
-         DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- center_weight:%f (for %d frames)  fixed_bytes:%d\n", rc->avg_weight, n, rc->tot_quant);
  }
-Line 1090
+Line 1107
  first_pass_scale_curve_internal(rc_2pass2_t *rc)
  {
          int64_t target;
-         int64_t pass1_length;
          int64_t total_invariant;
          double scaler;
          int i, num_MBs;
-Line 1109
+Line 1125
          target  = rc->target;
          target -= rc->tot_quant;
-         /* Do the same for the first pass data */
-         pass1_length  = rc->tot_length[XVID_TYPE_IVOP-1];
-         pass1_length += rc->tot_length[XVID_TYPE_PVOP-1];
-         pass1_length += rc->tot_length[XVID_TYPE_BVOP-1];
-         pass1_length -= rc->tot_quant;
          /* Let's compute a linear scaler in order to perform curve scaling */
-         scaler = (double)(target - total_invariant) / (double)(pass1_length - total_invariant);
+         scaler = (double)(target - total_invariant) / (double)(rc->tot_weighted);
- #ifdef PASS_SMALLER
+ #ifdef SMART_OVERFLOW_SETTING
-         if ((target - total_invariant) <= 0 ||
+         if (scaler > 0.9) {
-                 (pass1_length - total_invariant) <= 0 ||
+                 rc->param.max_overflow_degradation *= 5;
-                 target >= pass1_length) {
+                 rc->param.max_overflow_improvement *= 5;
-                 DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- WARNING: Undersize detected before correction\n");
+                 rc->param.overflow_control_strength *= 3;
-                 scaler = 1.0;
+         } else if (scaler > 0.6) {
+                 rc->param.max_overflow_degradation *= 2;
+                 rc->param.max_overflow_improvement *= 2;
+                 rc->param.overflow_control_strength *= 2;
+         } else {
+                 rc->min_quant = 2;
          }
  #endif
          /* Compute min frame lengths (for each frame type) according to the number
           * of MBs. We sum all block type counters of frame 0, this gives us the
           * number of MBs.
-Line 1167
+Line 1183
                  }
                  /* Compute the scaled length -- only non invariant data length is scaled */
-                 len = s->invariant + (int)((double)(s->length-s->invariant) * scaler * s->weight / rc->avg_weight);
+                 len = s->invariant + (int)((double)(s->length-s->invariant) * scaler * s->weight);
                  /* Compare with the computed minimum */
                  if (len < rc->min_length[s->type-1]) {
-Line 1179
+Line 1195
                           * total counters, as we prepare a second pass for 'regular'
                           * frames */
                          target -= s->scaled_length;
-                         pass1_length -= s->length;
                  } else {
                          /* Do nothing for now, we'll scale this later */
                          s->scaled_length = 0;
-Line 1190
+Line 1205
           * total counters. Now, it's possible to scale the 'regular' frames. */
          /* Scaling factor for 'regular' frames */
-         scaler = (double)(target - total_invariant) / (double)(pass1_length - total_invariant);
+         scaler = (double)(target - total_invariant) / (double)(rc->tot_weighted);
- #ifdef PASS_SMALLER
-         /* Detect undersizing */
-         if (target <= 0 || pass1_length <= 0 || target >= pass1_length) {
-                 DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- WARNING: Undersize detected after correction\n");
-                 scaler = 1.0;
-         }
- #endif
          /* Do another pass with the new scaler */
          for (i=0; i<rc->num_frames; i++) {
-Line 1206
+Line 1213
                  /* Ignore frame with forced frame sizes */
                  if (s->scaled_length == 0)
-                         s->scaled_length = s->invariant + (int)((double)(s->length-s->invariant) * scaler * s->weight / rc->avg_weight);
+                         s->scaled_length = s->invariant + (int)((double)(s->length-s->invariant) * scaler * s->weight);
          }
          /* Job done */

 Legend:



Removed from v.1.1.2.32
 


changed lines


 
Added in v.1.1.2.37
 Legend:



Removed from v.1.1.2.32
 


changed lines


 
Added in v.1.1.2.37
-Removed from v.1.1.2.32
+Added in v.1.1.2.37

No admin address has been configured	ViewVC Help
Powered by ViewVC 1.0.4