[svn] / trunk / xvidcore / vfw / src / codec.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/vfw/src/codec.c

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

revision 1495, Thu Jul 15 11:53:46 2004 UTC revision 1562, Mon Nov 22 10:40:03 2004 UTC
# Line 502  Line 502 
502                  pass2.kfthreshold = codec->config.kfthreshold;                  pass2.kfthreshold = codec->config.kfthreshold;
503                  pass2.container_frame_overhead = 24;    /* AVI */                  pass2.container_frame_overhead = 24;    /* AVI */
504    
505                    /* VBV */
506                    pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
507                    pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4;
508                    pass2.vbv_maxrate = 1000*profiles[codec->config.profile].max_bitrate;
509                    pass2.vbv_peakrate = 10000000; /* 10mbps -- fixme */
510    
511                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
512                  plugins[create.num_plugins].param = &pass2;                  plugins[create.num_plugins].param = &pass2;
513                  create.num_plugins++;                  create.num_plugins++;
# Line 742  Line 748 
748    
749          frame.motion |= pmvfast_presets[codec->config.motion_search];          frame.motion |= pmvfast_presets[codec->config.motion_search];
750    
751            if (codec->config.vhq_bframe) frame.vop_flags |= XVID_VOP_RD_BVOP;
752    
753    
754          switch (codec->config.vhq_mode)          switch (codec->config.vhq_mode)
755          {          {
756          case VHQ_MODE_DECISION :          case VHQ_MODE_DECISION :
# Line 1076  Line 1085 
1085                  frame.output.plane[0] = icd->lpOutput;                  frame.output.plane[0] = icd->lpOutput;
1086                  frame.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, icd->lpbiOutput->biBitCount);                  frame.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, icd->lpbiOutput->biBitCount);
1087                  if (frame.output.csp == XVID_CSP_I420 || frame.output.csp == XVID_CSP_YV12)                  if (frame.output.csp == XVID_CSP_I420 || frame.output.csp == XVID_CSP_YV12)
1088                          frame.output.stride[0] = (frame.output.stride[0]*2)/3;                          frame.output.stride[0] = CALC_BI_STRIDE(icd->lpbiOutput->biWidth, 8);
1089          }          }
1090          else          else
1091          {          {

Legend:
Removed from v.1495  
changed lines
  Added in v.1562

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