[svn] / branches / release-1_3-branch / xvidcore / vfw / src / codec.c Repository:
ViewVC logotype

Diff of /branches/release-1_3-branch/xvidcore/vfw/src/codec.c

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

revision 1592, Mon Jan 10 05:01:01 2005 UTC revision 1887, Mon May 10 13:50:46 2010 UTC
# Line 421  Line 421 
421          xvid_plugin_single_t single;          xvid_plugin_single_t single;
422          xvid_plugin_2pass1_t pass1;          xvid_plugin_2pass1_t pass1;
423          xvid_plugin_2pass2_t pass2;          xvid_plugin_2pass2_t pass2;
424            xvid_plugin_lumimasking_t masking;
425        xvid_gbl_info_t info;
426          int i;          int i;
427          HANDLE hFile;          HANDLE hFile;
428      const quality_t* quality_preset = (codec->config.quality==quality_table_num) ?
429        &codec->config.quality_user : &quality_table[codec->config.quality];
430    
431          CONFIG tmpCfg; /* if we want to alter config to suit our needs, it shouldn't be visible to user later */          CONFIG tmpCfg; /* if we want to alter config to suit our needs, it shouldn't be visible to user later */
432          memcpy(&tmpCfg, &codec->config, sizeof(CONFIG));          memcpy(&tmpCfg, &codec->config, sizeof(CONFIG));
# Line 440  Line 444 
444          init.debug = codec->config.debug;          init.debug = codec->config.debug;
445          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
446    
447            memset(&info, 0, sizeof(info));
448            info.version = XVID_VERSION;
449            codec->xvid_global_func(0, XVID_GBL_INFO, &info, NULL);
450    
451          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
452          create.version = XVID_VERSION;          create.version = XVID_VERSION;
453    
# Line 504  Line 512 
512    
513                  /* VBV */                  /* VBV */
514                  pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;                  pass2.vbv_size = profiles[codec->config.profile].max_vbv_size;
515                  pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4;                  pass2.vbv_initial = (profiles[codec->config.profile].max_vbv_size*3)/4; /* 75% */
516                  pass2.vbv_maxrate = 1000*profiles[codec->config.profile].max_bitrate;                  pass2.vbv_maxrate = profiles[codec->config.profile].max_bitrate;
517                  pass2.vbv_peakrate = 10000000; /* 10mbps -- fixme */  
518        // XXX: xvidcore current provides a "peak bits over 3secs" constraint.
519        //      according to the latest dxn literature, a 1sec constraint is now used
520        pass2.vbv_peakrate = profiles[codec->config.profile].vbv_peakrate * 3;
521    
522                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;                  plugins[create.num_plugins].func = codec->xvid_plugin_2pass2_func;
523                  plugins[create.num_plugins].param = &pass2;                  plugins[create.num_plugins].param = &pass2;
# Line 536  Line 547 
547          }          }
548    
549          /* lumimasking plugin */          /* lumimasking plugin */
550          if ((profiles[codec->config.profile].flags & PROFILE_ADAPTQUANT) && codec->config.lum_masking) {          if ((profiles[codec->config.profile].flags & PROFILE_ADAPTQUANT) && (codec->config.lum_masking>0)) {
551                    memset(&masking, 0, sizeof(masking));
552                    masking.method = (codec->config.lum_masking==2);
553                  plugins[create.num_plugins].func = codec->xvid_plugin_lumimasking_func;                  plugins[create.num_plugins].func = codec->xvid_plugin_lumimasking_func;
554                  plugins[create.num_plugins].param = NULL;                  plugins[create.num_plugins].param = &masking;
555                  create.num_plugins++;                  create.num_plugins++;
556          }          }
557    
# Line 553  Line 566 
566          create.fincr = codec->fincr;          create.fincr = codec->fincr;
567          create.fbase = codec->fbase;          create.fbase = codec->fbase;
568    
569          create.max_key_interval = codec->config.max_key_interval;          create.max_key_interval = quality_preset->max_key_interval;
570    
571          create.min_quant[0] = codec->config.min_iquant;          create.min_quant[0] = quality_preset->min_iquant;
572          create.max_quant[0] = codec->config.max_iquant;          create.max_quant[0] = quality_preset->max_iquant;
573          create.min_quant[1] = codec->config.min_pquant;          create.min_quant[1] = quality_preset->min_pquant;
574          create.max_quant[1] = codec->config.max_pquant;          create.max_quant[1] = quality_preset->max_pquant;
575          create.min_quant[2] = codec->config.min_bquant;          create.min_quant[2] = quality_preset->min_bquant;
576          create.max_quant[2] = codec->config.max_bquant;          create.max_quant[2] = quality_preset->max_bquant;
577    
578          if ((profiles[codec->config.profile].flags & PROFILE_BVOP) && codec->config.use_bvop) {          if ((profiles[codec->config.profile].flags & PROFILE_BVOP) && codec->config.use_bvop) {
579    
580        /* dxn: prevent bframes usage if interlacing is selected */
581        if (!((profiles[codec->config.profile].flags & PROFILE_EXTRA) && codec->config.interlacing)) {
582                  create.max_bframes = codec->config.max_bframes;                  create.max_bframes = codec->config.max_bframes;
583                  create.bquant_ratio = codec->config.bquant_ratio;                  create.bquant_ratio = codec->config.bquant_ratio;
584                  create.bquant_offset = codec->config.bquant_offset;                  create.bquant_offset = codec->config.bquant_offset;
# Line 572  Line 588 
588    
589                  create.global |= XVID_GLOBAL_CLOSED_GOP;                  create.global |= XVID_GLOBAL_CLOSED_GOP;
590    
591          }        /* restrict max bframes */
592          if ((create.max_bframes > profiles[codec->config.profile].xvid_max_bframes) && (profiles[codec->config.profile].xvid_max_bframes >= 0))
593            create.max_bframes = profiles[codec->config.profile].xvid_max_bframes;
594    
595          create.frame_drop_ratio = codec->config.frame_drop_ratio;        /* DXN: enable packed bframes */
596          if ((profiles[codec->config.profile].flags & PROFILE_PACKED)) {
597            create.global |= XVID_GLOBAL_PACKED;
598          }
599        }
600            }
601    
602        /* dxn: always write divx5 userdata */
603        if ((profiles[codec->config.profile].flags & PROFILE_EXTRA))
604          create.global |= XVID_GLOBAL_DIVX5_USERDATA;
605    
606            create.frame_drop_ratio = quality_preset->frame_drop_ratio;
607    
608        /* Encoder threads */
609        if (codec->config.num_threads == 0)
610            create.num_threads = info.num_threads; /* Autodetect */
611        else if (codec->config.num_threads == 1)
612            create.num_threads = -1; /* Single-threaded, disable SMP */
613        else
614          create.num_threads = codec->config.num_threads;          create.num_threads = codec->config.num_threads;
615    
616    
617          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))          switch(codec->xvid_encore_func(0, XVID_ENC_CREATE, &create, NULL))
618          {          {
619          case XVID_ERR_FAIL :          case XVID_ERR_FAIL :
# Line 609  Line 645 
645    
646  LRESULT compress_end(CODEC * codec)  LRESULT compress_end(CODEC * codec)
647  {  {
648      if (codec==NULL)
649        return ICERR_OK;
650    
651          if (codec->m_hdll != NULL) {          if (codec->m_hdll != NULL) {
652                  if (codec->ehandle != NULL) {                  if (codec->ehandle != NULL) {
653                          codec->xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);                          codec->xvid_encore_func(codec->ehandle, XVID_ENC_DESTROY, NULL, NULL);
# Line 662  Line 701 
701          xvid_enc_frame_t frame;          xvid_enc_frame_t frame;
702          xvid_enc_stats_t stats;          xvid_enc_stats_t stats;
703          int length;          int length;
704      const quality_t* quality_preset = (codec->config.quality==quality_table_num) ?
705        &codec->config.quality_user : &quality_table[codec->config.quality];
706    
707          memset(&frame, 0, sizeof(frame));          memset(&frame, 0, sizeof(frame));
708          frame.version = XVID_VERSION;          frame.version = XVID_VERSION;
# Line 697  Line 738 
738          if ((profiles[codec->config.profile].flags & PROFILE_INTERLACE) && codec->config.interlacing)          if ((profiles[codec->config.profile].flags & PROFILE_INTERLACE) && codec->config.interlacing)
739                  frame.vol_flags |= XVID_VOL_INTERLACING;                  frame.vol_flags |= XVID_VOL_INTERLACING;
740    
741          if (codec->config.ar_mode == 0) { /* PAR */    /* dxn: force 1:1 picture aspect ration */
742      if ((profiles[codec->config.profile].flags & PROFILE_EXTRA)) {
743        frame.par = XVID_PAR_11_VGA;
744      } else if (codec->config.ar_mode == 0) { /* PAR */
745                  if (codec->config.display_aspect_ratio != 5) {                  if (codec->config.display_aspect_ratio != 5) {
746                          frame.par = codec->config.display_aspect_ratio + 1;                          frame.par = codec->config.display_aspect_ratio + 1;
747                  } else {                  } else {
# Line 724  Line 768 
768          if (codec->config.vop_debug)          if (codec->config.vop_debug)
769                  frame.vop_flags |= XVID_VOP_DEBUG;                  frame.vop_flags |= XVID_VOP_DEBUG;
770    
771          if (codec->config.trellis_quant) {          if (quality_preset->trellis_quant) {
772                  frame.vop_flags |= XVID_VOP_TRELLISQUANT;                  frame.vop_flags |= XVID_VOP_TRELLISQUANT;
773          }          }
774    
775          if (codec->config.motion_search > 4)    if ((profiles[codec->config.profile].flags & PROFILE_4MV)) {
776              if (quality_preset->motion_search > 4)
777                  frame.vop_flags |= XVID_VOP_INTER4V;                  frame.vop_flags |= XVID_VOP_INTER4V;
778      }
779    
780          if (codec->config.chromame)          if (quality_preset->chromame)
781                  frame.motion |= XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP;                  frame.motion |= XVID_ME_CHROMA_PVOP + XVID_ME_CHROMA_BVOP;
782    
783          if (codec->config.turbo)          if (quality_preset->turbo)
784                  frame.motion |= XVID_ME_FASTREFINE16 | XVID_ME_FASTREFINE8 |                  frame.motion |= XVID_ME_FASTREFINE16 | XVID_ME_FASTREFINE8 |
785                                                  XVID_ME_SKIP_DELTASEARCH | XVID_ME_FAST_MODEINTERPOLATE |                                                  XVID_ME_SKIP_DELTASEARCH | XVID_ME_FAST_MODEINTERPOLATE |
786                                                  XVID_ME_BFRAME_EARLYSTOP;                                                  XVID_ME_BFRAME_EARLYSTOP;
787    
788          frame.motion |= pmvfast_presets[codec->config.motion_search];          frame.motion |= pmvfast_presets[quality_preset->motion_search];
789    
790          if (codec->config.vhq_bframe) frame.vop_flags |= XVID_VOP_RD_BVOP;          if (quality_preset->vhq_bframe) frame.vop_flags |= XVID_VOP_RD_BVOP;
791    
792    
793          switch (codec->config.vhq_mode)          switch (quality_preset->vhq_mode)
794          {          {
795          case VHQ_MODE_DECISION :          case VHQ_MODE_DECISION :
796                  frame.vop_flags |= XVID_VOP_MODEDECISION_RD;                  frame.vop_flags |= XVID_VOP_MODEDECISION_RD;
# Line 802  Line 848 
848          }          }
849    
850          // force keyframe spacing in 2-pass 1st pass          // force keyframe spacing in 2-pass 1st pass
851          if (codec->config.motion_search == 0)          if (quality_preset->motion_search == 0)
852                  frame.type = XVID_TYPE_IVOP;                  frame.type = XVID_TYPE_IVOP;
853    
854          /* frame-based stuff */          /* frame-based stuff */
# Line 962  Line 1008 
1008          memset(&init, 0, sizeof(init));          memset(&init, 0, sizeof(init));
1009          init.version = XVID_VERSION;          init.version = XVID_VERSION;
1010          init.cpu_flags = codec->config.cpu;          init.cpu_flags = codec->config.cpu;
1011      init.debug = codec->config.debug;
1012          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);          codec->xvid_global_func(0, XVID_GBL_INIT, &init, NULL);
1013    
1014          memset(&create, 0, sizeof(create));          memset(&create, 0, sizeof(create));
# Line 989  Line 1036 
1036          RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey);          RegOpenKeyEx(XVID_REG_KEY, XVID_REG_PARENT "\\" XVID_REG_CHILD, 0, KEY_READ, &hKey);
1037    
1038          REG_GET_N("Brightness", pp_brightness, 0);          REG_GET_N("Brightness", pp_brightness, 0);
1039          REG_GET_N("Deblock_Y",  pp_dy, 0)          REG_GET_N("Deblock_Y",  pp_dy, 0);
1040          REG_GET_N("Deblock_UV", pp_duv, 0)          REG_GET_N("Deblock_UV", pp_duv, 0);
1041          REG_GET_N("Dering_Y",  pp_dry, 0)          REG_GET_N("Dering_Y",  pp_dry, 0);
1042          REG_GET_N("Dering_UV", pp_druv, 0)          REG_GET_N("Dering_UV", pp_druv, 0);
1043          REG_GET_N("FilmEffect", pp_fe, 0)          REG_GET_N("FilmEffect", pp_fe, 0);
1044    
1045          RegCloseKey(hKey);          RegCloseKey(hKey);
1046    
Legend:
Removed from v.1592  
changed lines
  Added in v.1887
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4