[svn] / branches / dev-api-4 / xvidcore / src / plugins / plugin_2pass2.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/plugins/plugin_2pass2.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1202, Sun Nov 9 20:49:21 2003 UTC revision 1293, Sun Dec 21 12:41:48 2003 UTC
# Line 25  Line 25 
25   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
26   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
27   *   *
28   * $Id: plugin_2pass2.c,v 1.1.2.24 2003-11-09 20:49:21 edgomez Exp $   * $Id: plugin_2pass2.c,v 1.1.2.32 2003-12-21 12:41:48 syskin Exp $
29   *   *
30   *****************************************************************************/   *****************************************************************************/
31    
32    #define BQUANT_PRESCALE
33  #undef COMPENSATE_FORMULA  #undef COMPENSATE_FORMULA
34    
35    /* forces second pass not to be bigger than first */
36    #undef PASS_SMALLER
37    
38  #include <stdio.h>  #include <stdio.h>
39  #include <math.h>  #include <math.h>
40  #include <limits.h>  #include <limits.h>
# Line 39  Line 43 
43  #include "../image/image.h"  #include "../image/image.h"
44    
45  /*****************************************************************************  /*****************************************************************************
46   * Some constants   * Some default settings
47   ****************************************************************************/   ****************************************************************************/
48    
49  #define DEFAULT_KEYFRAME_BOOST 0  #define DEFAULT_KEYFRAME_BOOST 0
50  #define DEFAULT_OVERFLOW_CONTROL_STRENGTH 10  #define DEFAULT_OVERFLOW_CONTROL_STRENGTH 10
51  #define DEFAULT_CURVE_COMPRESSION_HIGH 0  #define DEFAULT_CURVE_COMPRESSION_HIGH 0
52  #define DEFAULT_CURVE_COMPRESSION_LOW 0  #define DEFAULT_CURVE_COMPRESSION_LOW 0
53  #define DEFAULT_MAX_OVERFLOW_IMPROVEMENT 60  #define DEFAULT_MAX_OVERFLOW_IMPROVEMENT 10
54  #define DEFAULT_MAX_OVERFLOW_DEGRADATION 60  #define DEFAULT_MAX_OVERFLOW_DEGRADATION 10
55    
56  /* Keyframe settings */  /* Keyframe settings */
57  #define DEFAULT_KFREDUCTION 20  #define DEFAULT_KFREDUCTION 20
58  #define DEFAULT_MIN_KEY_INTERVAL 1  #define DEFAULT_KFTHRESHOLD 1
59    
60    /*****************************************************************************
61     * Some default constants (can be tuned)
62     ****************************************************************************/
63    
64    /* Specify the invariant part of the headers bits (header+MV)
65     * as  hlength/cst */
66    #define INVARIANT_HEADER_PART_IVOP 1 /* factor 1.0f   */
67    #define INVARIANT_HEADER_PART_PVOP 2 /* factor 0.5f   */
68    #define INVARIANT_HEADER_PART_BVOP 8 /* factor 0.125f */
69    
70  /*****************************************************************************  /*****************************************************************************
71   * Structures   * Structures
# Line 61  Line 75 
75  typedef struct {  typedef struct {
76          int type;               /* first pass type */          int type;               /* first pass type */
77          int quant;              /* first pass quant */          int quant;              /* first pass quant */
         int quant2;             /* Second pass quant */  
78          int blks[3];                    /* k,m,y blks */          int blks[3];                    /* k,m,y blks */
79          int length;             /* first pass length */          int length;             /* first pass length */
80            int invariant;          /* what we assume as being invariant between the two passes, it's a sub part of header + MV bits */
81          int scaled_length;      /* scaled length */          int scaled_length;      /* scaled length */
82          int desired_length;     /* desired length; calculated during encoding */          int desired_length;     /* desired length; calculated during encoding */
83          int error;          int error;
# Line 95  Line 109 
109    
110          /* Total length of each frame types (1st pass) */          /* Total length of each frame types (1st pass) */
111          uint64_t tot_length[3];          uint64_t tot_length[3];
112            uint64_t tot_invariant[3];
113    
114          /* Average length of each frame types (used first for 1st pass data and          /* Average length of each frame types (used first for 1st pass data and
115           * then for scaled averages */           * then for scaled averages */
# Line 124  Line 139 
139          double avg_weight;          double avg_weight;
140    
141          /* Total length used by XVID_ZONE_QUANT zones */          /* Total length used by XVID_ZONE_QUANT zones */
142          int64_t tot_quant;          uint64_t tot_quant;
143            uint64_t tot_quant_invariant;
144    
145          /*----------------------------------          /*----------------------------------
146           * Advanced settings helper ratios           * Advanced settings helper ratios
# Line 220  Line 236 
236  {  {
237          switch(opt) {          switch(opt) {
238          case XVID_PLG_INFO :          case XVID_PLG_INFO :
239            case XVID_PLG_FRAME :
240                  return 0;                  return 0;
241    
242          case XVID_PLG_CREATE :          case XVID_PLG_CREATE :
# Line 281  Line 298 
298    
299          /* Keyframe settings */          /* Keyframe settings */
300          _INIT(rc->param.kfreduction, DEFAULT_KFREDUCTION);          _INIT(rc->param.kfreduction, DEFAULT_KFREDUCTION);
301          _INIT(rc->param.min_key_interval, DEFAULT_MIN_KEY_INTERVAL);          _INIT(rc->param.kfthreshold, DEFAULT_KFTHRESHOLD);
302  #undef _INIT  #undef _INIT
303    
304          /* Initialize some stuff to zero */          /* Initialize some stuff to zero */
# Line 332  Line 349 
349          /* Compute the target filesize */          /* Compute the target filesize */
350          if (rc->param.bitrate<0) {          if (rc->param.bitrate<0) {
351                  /* if negative, bitrate equals the target (in kbytes) */                  /* if negative, bitrate equals the target (in kbytes) */
352                  rc->target = (-rc->param.bitrate) * 1024;                  rc->target = ((uint64_t)(-rc->param.bitrate)) * 1024;
353          } else if (rc->num_frames  < create->fbase/create->fincr) {          } else if (rc->num_frames  < create->fbase/create->fincr) {
354                  /* Source sequence is less than 1s long, we do as if it was 1s long */                  /* Source sequence is less than 1s long, we do as if it was 1s long */
355                  rc->target = rc->param.bitrate / 8;                  rc->target = rc->param.bitrate / 8;
# Line 366  Line 383 
383           *  - count how many times each frame type has been used.           *  - count how many times each frame type has been used.
384           *     rc->count[]           *     rc->count[]
385           *  - total bytes used per frame type           *  - total bytes used per frame type
386           *     rc->total[]           *     rc->tot_length[]
387             *  - total bytes considered invariant between the 2 passes
388           *  - store keyframe location           *  - store keyframe location
389           *     rc->keyframe_locations[]           *     rc->keyframe_locations[]
390           */           */
# Line 375  Line 393 
393          /* When bitrate is not given it means it has been scaled by an external          /* When bitrate is not given it means it has been scaled by an external
394           * application */           * application */
395          if (rc->param.bitrate) {          if (rc->param.bitrate) {
396                  /* Apply zone settings */                  /* Apply zone settings
397                     * - set rc->tot_quant which represents the total num of bytes spent in
398                     *   fixed quant zones
399                     * - set rc->tot_quant_invariant which represents the total num of bytes spent
400                     *   in fixed quant zones for headers */
401                  zone_process(rc, create);                  zone_process(rc, create);
402                  /* Perform internal curve scaling */                  /* Perform internal curve scaling */
403                  first_pass_scale_curve_internal(rc);                  first_pass_scale_curve_internal(rc);
# Line 435  Line 457 
457          if (data->quant > 0)          if (data->quant > 0)
458                  return(0);                  return(0);
459    
460          /* Second case: We are in a Quant zone */          /* Second case: insufficent stats data */
461            if (data->frame_num >= rc->num_frames) {
462                    DPRINTF(XVID_DEBUG_RC,"[xvid rc] -- stats file too short (now processing frame %d)",
463                            data->frame_num);
464                    return(0);
465            }
466    
467            /* Third case: We are in a Quant zone */
468          if (s->zone_mode == XVID_ZONE_QUANT) {          if (s->zone_mode == XVID_ZONE_QUANT) {
469                  rc->fq_error += s->weight;                  rc->fq_error += s->weight;
470                  data->quant = (int)rc->fq_error;                  data->quant = (int)rc->fq_error;
# Line 446  Line 475 
475                  return(0);                  return(0);
476          }          }
477    
         /* Third case: insufficent stats data */  
         if (data->frame_num >= rc->num_frames)  
                 return(0);  
478    
479          /*************************************************************************/          /*************************************************************************/
480          /*************************************************************************/          /*************************************************************************/
# Line 466  Line 492 
492    
493          /* IFrame user settings*/          /* IFrame user settings*/
494          if (s->type == XVID_TYPE_IVOP) {          if (s->type == XVID_TYPE_IVOP) {
   
495                  /* Keyframe boosting -- All keyframes benefit from it */                  /* Keyframe boosting -- All keyframes benefit from it */
496                  dbytes += dbytes*rc->param.keyframe_boost / 100;                  dbytes += dbytes*rc->param.keyframe_boost / 100;
497    
498                  /* Applies keyframe penalties, but not the first frame */  #if 0 /* ToDo: decide how to apply kfthresholding */
499                  if (rc->KF_idx) {  #endif
                         int penalty_distance;  
   
                         /* Minimum keyframe distance penalties */  
                         penalty_distance  = rc->param.min_key_interval;  
                         penalty_distance -= rc->keyframe_locations[rc->KF_idx];  
                         penalty_distance += rc->keyframe_locations[rc->KF_idx-1];  
   
                         /* Ah ah ! guilty keyframe, you're under arrest ! */  
                         if (penalty_distance > 0)  
                                 dbytes -= dbytes*penalty_distance*rc->param.kfreduction/100;  
                 }  
500          } else {          } else {
501    
502                  /* P/S/B frames must reserve some bits for iframe boosting */                  /* P/S/B frames must reserve some bits for iframe boosting */
# Line 524  Line 538 
538           *-----------------------------------------------------------------------*/           *-----------------------------------------------------------------------*/
539    
540          /* Compute the overflow we should compensate */          /* Compute the overflow we should compensate */
541          if (s->type != XVID_TYPE_IVOP) {          if (s->type != XVID_TYPE_IVOP || rc->overflow > 0) {
542                  double frametype_factor;                  double frametype_factor;
543                  double framesize_factor;                  double framesize_factor;
544    
# Line 555  Line 569 
569                  /* Apply the overflow strength imposed by the user */                  /* Apply the overflow strength imposed by the user */
570                  overflow *= (rc->param.overflow_control_strength/100.0f);                  overflow *= (rc->param.overflow_control_strength/100.0f);
571          } else {          } else {
572                  /* no overflow applied in IFrames because:                  /* no negative overflow applied in IFrames because:
573                   *  - their role is important as they're references for P/BFrames.                   *  - their role is important as they're references for P/BFrames.
574                   *  - there aren't much in typical sequences, so if an IFrame overflows too                   *  - there aren't much in typical sequences, so if an IFrame overflows too
575                   *    much, this overflow may impact the next IFrame too much and generate                   *    much, this overflow may impact the next IFrame too much and generate
# Line 587  Line 601 
601           * pass nor smaller than the allowed minimum.           * pass nor smaller than the allowed minimum.
602           *-----------------------------------------------------------------------*/           *-----------------------------------------------------------------------*/
603    
604    #ifdef PASS_SMALLER
605          if (dbytes > s->length) {          if (dbytes > s->length) {
606                  dbytes = s->length;                  dbytes = s->length;
607          } else if (dbytes < rc->min_length[s->type-1]) {          } else
608    #endif
609                    if (dbytes < rc->min_length[s->type-1]) {
610                  dbytes = rc->min_length[s->type-1];                  dbytes = rc->min_length[s->type-1];
611          } else if (dbytes > rc->max_length) {          } else if (dbytes > rc->max_length) {
612                  /* ToDo: this condition is always wrong as max_length == maximum frame                  /* ToDo: this condition is always wrong as max_length == maximum frame
# Line 605  Line 622 
622           * Desired frame length <-> quantizer mapping           * Desired frame length <-> quantizer mapping
623           *-----------------------------------------------------------------------*/           *-----------------------------------------------------------------------*/
624    
625          /* For bframes we must retrieve the original quant used (sent to xvidcore)  #ifdef BQUANT_PRESCALE
626           * as core applies the bquant formula before writing the stat log entry */          /* For bframes we prescale the quantizer to avoid too high quant scaling */
627          if(s->type == XVID_TYPE_BVOP) {          if(s->type == XVID_TYPE_BVOP) {
628    
629                  twopass_stat_t *b_ref = s;                  twopass_stat_t *b_ref = s;
# Line 616  Line 633 
633                          b_ref--;                          b_ref--;
634    
635                  /* Compute the original quant */                  /* Compute the original quant */
636                  s->quant  = 100*s->quant - data->bquant_offset;                  s->quant  = 2*(100*s->quant - data->bquant_offset);
637                  s->quant += data->bquant_ratio - 1; /* to avoid rouding issues */                  s->quant += data->bquant_ratio - 1; /* to avoid rounding issues */
638                  s->quant  = s->quant/data->bquant_ratio - b_ref->quant;                  s->quant  = s->quant/data->bquant_ratio - b_ref->quant;
639          }          }
640    #endif
641    
642          /* Don't laugh at this very 'simple' quant<->filesize relationship, it          /* Don't laugh at this very 'simple' quant<->size relationship, it
643           * proves to be acurate enough for our algorithm */           * proves to be acurate enough for our algorithm */
644          scaled_quant = (double)s->quant*(double)s->length/(double)dbytes;          scaled_quant = (double)s->quant*(double)s->length/(double)dbytes;
645    
# Line 709  Line 727 
727          /* Don't forget to force 1st pass frame type ;-) */          /* Don't forget to force 1st pass frame type ;-) */
728          data->type = s->type;          data->type = s->type;
729    
         /* Store the quantizer into the statistics -- Used to compensate the double  
          * formula symptom */  
         s->quant2 = data->quant;  
   
730          return 0;          return 0;
731  }  }
732    
# Line 774  Line 788 
788                  rc->KFoverflow -= rc->KFoverflow_partial;                  rc->KFoverflow -= rc->KFoverflow_partial;
789          }          }
790    
791          rc->overflow += s->error = s->desired_length - data->length;          rc->overflow += (s->error = s->desired_length - data->length);
792          rc->real_total += data->length;          rc->real_total += data->length;
793    
794          DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- frame:%d type:%c quant:%d stats:%d scaled:%d desired:%d actual:%d error:%d overflow:%.2f\n",          DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- frame:%d type:%c quant:%d stats:%d scaled:%d desired:%d actual:%d error:%d overflow:%.2f\n",
# Line 823  Line 837 
837    
838                  char *ptr;                  char *ptr;
839                  char type;                  char type;
840                  int fields, nouse;                  int fields;
841    
842                  lines++;                  lines++;
843    
844                  /* We skip spaces */                  /* We skip spaces */
845                  ptr = skipspaces(line);                  ptr = skipspaces(line);
846    
847                  /* Skip coment lines */                  /* Skip coment lines or empty lines */
848                  if(iscomment(ptr)) {                  if(iscomment(ptr) || *ptr == '\0') {
849                          free(line);                          free(line);
850                          continue;                          continue;
851                  }                  }
852    
853                  /* Read the stat line from buffer */                  /* Read the stat line from buffer */
854                  fields = sscanf(ptr,                  fields = sscanf(ptr, "%c", &type);
                                                 "%c %d %d %d %d %d",  
                                                 &type, &nouse, &nouse, &nouse, &nouse, &nouse);  
855    
856                  /* Valid stats files have at least 6 fields */                  /* Valid stats files have at least 7 fields */
857                  if (fields == 6) {                  if (fields == 1) {
858                          switch(type) {                          switch(type) {
859                          case 'i':                          case 'i':
860                          case 'I':                          case 'I':
# Line 863  Line 875 
875                  } else {                  } else {
876                                  DPRINTF(XVID_DEBUG_RC,                                  DPRINTF(XVID_DEBUG_RC,
877                                                  "[xvid rc] -- WARNING: L%d misses some stat fields (%d).\n",                                                  "[xvid rc] -- WARNING: L%d misses some stat fields (%d).\n",
878                                                  lines, 6-fields);                                                  lines, 7-fields);
879                  }                  }
880    
881                  /* Free the line buffer */                  /* Free the line buffer */
# Line 901  Line 913 
913                  /* We skip spaces */                  /* We skip spaces */
914                  ptr = skipspaces(line);                  ptr = skipspaces(line);
915    
916                  /* Skip comment lines */                  /* Skip comment lines or empty lines */
917                  if(iscomment(ptr)) {                  if(iscomment(ptr) || *ptr == '\0') {
918                          free(line);                          free(line);
919                          continue;                          continue;
920                  }                  }
# Line 912  Line 924 
924    
925                  /* Convert the fields */                  /* Convert the fields */
926                  fields = sscanf(ptr,                  fields = sscanf(ptr,
927                                                  "%c %d %d %d %d %d %d\n",                                                  "%c %d %d %d %d %d %d %d\n",
928                                                  &type,                                                  &type,
929                                                  &s->quant,                                                  &s->quant,
930                                                  &s->blks[0], &s->blks[1], &s->blks[2],                                                  &s->blks[0], &s->blks[1], &s->blks[2],
931                                                  &s->length,                                                  &s->length, &s->invariant /* not really yet */,
932                                                  &s->scaled_length);                                                  &s->scaled_length);
933    
934                  /* Free line buffer, we don't need it anymore */                  /* Free line buffer, we don't need it anymore */
# Line 924  Line 936 
936    
937                  /* Fail silently, this has probably been warned in                  /* Fail silently, this has probably been warned in
938                   * statsfile_count_frames */                   * statsfile_count_frames */
939                  if(fields != 6 && fields != 7)                  if(fields != 7 && fields != 8)
940                          continue;                          continue;
941    
942                  /* Convert frame type */                  /* Convert frame type and compute the invariant length part */
943                  switch(type) {                  switch(type) {
944                  case 'i':                  case 'i':
945                  case 'I':                  case 'I':
946                          s->type = XVID_TYPE_IVOP;                          s->type = XVID_TYPE_IVOP;
947                            s->invariant /= INVARIANT_HEADER_PART_IVOP;
948                          break;                          break;
949                  case 'p':                  case 'p':
950                  case 'P':                  case 'P':
951                  case 's':                  case 's':
952                  case 'S':                  case 'S':
953                          s->type = XVID_TYPE_PVOP;                          s->type = XVID_TYPE_PVOP;
954                            s->invariant /= INVARIANT_HEADER_PART_PVOP;
955                          break;                          break;
956                  case 'b':                  case 'b':
957                  case 'B':                  case 'B':
958                          s->type = XVID_TYPE_BVOP;                          s->type = XVID_TYPE_BVOP;
959                            s->invariant /= INVARIANT_HEADER_PART_BVOP;
960                          break;                          break;
961                  default:                  default:
962                          /* Same as before, fail silently */                          /* Same as before, fail silently */
# Line 972  Line 987 
987          for (i=0; i<3; i++) {          for (i=0; i<3; i++) {
988                  rc->count[i]=0;                  rc->count[i]=0;
989                  rc->tot_length[i] = 0;                  rc->tot_length[i] = 0;
990                    rc->tot_invariant[i] = 0;
991                  rc->min_length[i] = INT_MAX;                  rc->min_length[i] = INT_MAX;
992          }          }
993    
# Line 984  Line 1000 
1000    
1001                  rc->count[s->type-1]++;                  rc->count[s->type-1]++;
1002                  rc->tot_length[s->type-1] += s->length;                  rc->tot_length[s->type-1] += s->length;
1003                    rc->tot_invariant[s->type-1] += s->invariant;
1004    
1005                  if (s->length < rc->min_length[s->type-1]) {                  if (s->length < rc->min_length[s->type-1]) {
1006                          rc->min_length[s->type-1] = s->length;                          rc->min_length[s->type-1] = s->length;
# Line 1020  Line 1037 
1037    
1038          rc->avg_weight = 0.0;          rc->avg_weight = 0.0;
1039          rc->tot_quant = 0;          rc->tot_quant = 0;
1040            rc->tot_quant_invariant = 0;
1041    
1042          if (create->num_zones == 0) {          if (create->num_zones == 0) {
1043                  for (j = 0; j < rc->num_frames; j++) {                  for (j = 0; j < rc->num_frames; j++) {
# Line 1058  Line 1075 
1075                                  rc->stats[j].zone_mode = XVID_ZONE_QUANT;                                  rc->stats[j].zone_mode = XVID_ZONE_QUANT;
1076                                  rc->stats[j].weight = (double)create->zones[i].increment / (double)create->zones[i].base;                                  rc->stats[j].weight = (double)create->zones[i].increment / (double)create->zones[i].base;
1077                                  rc->tot_quant += rc->stats[j].length;                                  rc->tot_quant += rc->stats[j].length;
1078                                    rc->tot_quant_invariant += rc->stats[j].invariant;
1079                          }                          }
1080                  }                  }
1081          }          }
# Line 1073  Line 1091 
1091  {  {
1092          int64_t target;          int64_t target;
1093          int64_t pass1_length;          int64_t pass1_length;
1094            int64_t total_invariant;
1095          double scaler;          double scaler;
1096          int i, num_MBs;          int i, num_MBs;
1097    
1098          /* We remove the bytes used by the fixed quantizer zones          /* We only scale texture data ! */
1099           * ToDo: this approach is flawed, the same amount of bytes is removed from          total_invariant  = rc->tot_invariant[XVID_TYPE_IVOP-1];
1100           *       target and first pass data, this has no sense, zone_process should          total_invariant += rc->tot_invariant[XVID_TYPE_PVOP-1];
1101           *       give us two results one for unscaled data (1pass) and the other          total_invariant += rc->tot_invariant[XVID_TYPE_BVOP-1];
1102           *       one for scaled data and we should then write:          /* don't forget to substract header bytes used in quant zones, otherwise we
1103           *       target = rc->target - rc->tot_quant_scaled;           * counting them twice */
1104           *       pass1_length = rc->i+p+b - rc->tot_quant_firstpass */          total_invariant -= rc->tot_quant_invariant;
1105          target = rc->target - rc->tot_quant;  
1106            /* We remove the bytes used by the fixed quantizer zones during first pass
1107             * with the same quants, so we know very precisely how much that
1108             * represents */
1109            target  = rc->target;
1110            target -= rc->tot_quant;
1111    
1112          /* Do the same for the first pass data */          /* Do the same for the first pass data */
1113          pass1_length  = rc->tot_length[XVID_TYPE_IVOP-1];          pass1_length  = rc->tot_length[XVID_TYPE_IVOP-1];
# Line 1092  Line 1116 
1116          pass1_length -= rc->tot_quant;          pass1_length -= rc->tot_quant;
1117    
1118          /* Let's compute a linear scaler in order to perform curve scaling */          /* Let's compute a linear scaler in order to perform curve scaling */
1119          scaler = (double)target / (double)pass1_length;          scaler = (double)(target - total_invariant) / (double)(pass1_length - total_invariant);
1120    
1121          if (target <= 0 || pass1_length <= 0 || target >= pass1_length) {  #ifdef PASS_SMALLER
1122            if ((target - total_invariant) <= 0 ||
1123                    (pass1_length - total_invariant) <= 0 ||
1124                    target >= pass1_length) {
1125                  DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- WARNING: Undersize detected before correction\n");                  DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- WARNING: Undersize detected before correction\n");
1126                  scaler = 1.0;                  scaler = 1.0;
1127          }          }
1128    #endif
1129          /* Compute min frame lengths (for each frame type) according to the number          /* Compute min frame lengths (for each frame type) according to the number
1130           * of MBs. We sum all block type counters of frame 0, this gives us the           * of MBs. We sum all block type counters of frame 0, this gives us the
1131           * number of MBs.           * number of MBs.
# Line 1139  Line 1166 
1166                          continue;                          continue;
1167                  }                  }
1168    
1169                  /* Compute the scaled length */                  /* Compute the scaled length -- only non invariant data length is scaled */
1170                  len = (int)((double)s->length * scaler * s->weight / rc->avg_weight);                  len = s->invariant + (int)((double)(s->length-s->invariant) * scaler * s->weight / rc->avg_weight);
1171    
1172                  /* Compare with the computed minimum */                  /* Compare with the computed minimum */
1173                  if (len < rc->min_length[s->type-1]) {                  if (len < rc->min_length[s->type-1]) {
# Line 1163  Line 1190 
1190           * total counters. Now, it's possible to scale the 'regular' frames. */           * total counters. Now, it's possible to scale the 'regular' frames. */
1191    
1192          /* Scaling factor for 'regular' frames */          /* Scaling factor for 'regular' frames */
1193          scaler = (double)target / (double)pass1_length;          scaler = (double)(target - total_invariant) / (double)(pass1_length - total_invariant);
1194    
1195    #ifdef PASS_SMALLER
1196          /* Detect undersizing */          /* Detect undersizing */
1197          if (target <= 0 || pass1_length <= 0 || target >= pass1_length) {          if (target <= 0 || pass1_length <= 0 || target >= pass1_length) {
1198                  DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- WARNING: Undersize detected after correction\n");                  DPRINTF(XVID_DEBUG_RC, "[xvid rc] -- WARNING: Undersize detected after correction\n");
1199                  scaler = 1.0;                  scaler = 1.0;
1200          }          }
1201    #endif
1202    
1203          /* Do another pass with the new scaler */          /* Do another pass with the new scaler */
1204          for (i=0; i<rc->num_frames; i++) {          for (i=0; i<rc->num_frames; i++) {
# Line 1177  Line 1206 
1206    
1207                  /* Ignore frame with forced frame sizes */                  /* Ignore frame with forced frame sizes */
1208                  if (s->scaled_length == 0)                  if (s->scaled_length == 0)
1209                          s->scaled_length = (int)((double)s->length * scaler * s->weight / rc->avg_weight);                          s->scaled_length = s->invariant + (int)((double)(s->length-s->invariant) * scaler * s->weight / rc->avg_weight);
1210          }          }
1211    
1212          /* Job done */          /* Job done */
# Line 1192  Line 1221 
1221  scaled_curve_apply_advanced_parameters(rc_2pass2_t * rc)  scaled_curve_apply_advanced_parameters(rc_2pass2_t * rc)
1222  {  {
1223          int i;          int i;
1224          uint64_t ivop_boost_total;          int64_t ivop_boost_total;
1225    
1226          /* Reset the rate controller (per frame type) total byte counters */          /* Reset the rate controller (per frame type) total byte counters */
1227          for (i=0; i<3; i++) rc->tot_scaled_length[i] = 0;          for (i=0; i<3; i++) rc->tot_scaled_length[i] = 0;
# Line 1215  Line 1244 
1244    
1245                  /* Some more work is needed for I frames */                  /* Some more work is needed for I frames */
1246                  if (s->type == XVID_TYPE_IVOP) {                  if (s->type == XVID_TYPE_IVOP) {
                         int penalty_distance;  
1247                          int ivop_boost;                          int ivop_boost;
1248    
1249                          /* Accumulate bytes needed for keyframe boosting */                          /* Accumulate bytes needed for keyframe boosting */
1250                          ivop_boost = s->scaled_length*rc->param.keyframe_boost/100;                          ivop_boost = s->scaled_length*rc->param.keyframe_boost/100;
1251    
1252                          if (rc->KF_idx) {  #if 0 /* ToDo: decide how to apply kfthresholding */
1253                                  /* Minimum keyframe distance penalties */  #endif
                                 penalty_distance  = rc->param.min_key_interval;  
                                 penalty_distance -= rc->keyframe_locations[rc->KF_idx];  
                                 penalty_distance += rc->keyframe_locations[rc->KF_idx-1];  
   
                                 /* Ah ah ! guilty keyframe, you're under arrest ! */  
                                 if (penalty_distance > 0)  
                                          ivop_boost -= (s->scaled_length + ivop_boost)*penalty_distance*rc->param.kfreduction/100;  
                         }  
   
1254                          /* If the frame size drops under the minimum length, then cap ivop_boost */                          /* If the frame size drops under the minimum length, then cap ivop_boost */
1255                          if (ivop_boost + s->scaled_length < rc->min_length[XVID_TYPE_IVOP-1])                          if (ivop_boost + s->scaled_length < rc->min_length[XVID_TYPE_IVOP-1])
1256                                  ivop_boost = rc->min_length[XVID_TYPE_IVOP-1] - s->scaled_length;                                  ivop_boost = rc->min_length[XVID_TYPE_IVOP-1] - s->scaled_length;
# Line 1261  Line 1280 
1280    
1281          /* Compute the ratio described above          /* Compute the ratio described above
1282           *     taxed_total = sum(0, n, tax*scaled_length)           *     taxed_total = sum(0, n, tax*scaled_length)
1283           * <=> taxed_total = tax.sum(0, n, tax*scaled_length)           * <=> taxed_total = tax.sum(0, n, scaled_length)
1284           * <=> tax = taxed_total / original_total */           * <=> tax = taxed_total / original_total */
1285          rc->pb_iboost_tax_ratio =          rc->pb_iboost_tax_ratio =
1286                  (rc->pb_iboost_tax_ratio - ivop_boost_total) /                  (rc->pb_iboost_tax_ratio - ivop_boost_total) /
# Line 1278  Line 1297 
1297                  } else {                  } else {
1298                          rc->avg_length[i] = rc->tot_scaled_length[i];                          rc->avg_length[i] = rc->tot_scaled_length[i];
1299    
1300                          if (i == XVID_TYPE_IVOP) {                          if (i == (XVID_TYPE_IVOP-1)) {
1301                                  /* I Frames total has to be added the boost total */                                  /* I Frames total has to be added the boost total */
1302                                  rc->avg_length[i] += ivop_boost_total;                                  rc->avg_length[i] += ivop_boost_total;
1303                          } else {                          } else {
Legend:
Removed from v.1202  
changed lines
  Added in v.1293
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4