[cvs] / xvidcore / src / encoder.c Repository:
ViewVC logotype

Diff of /xvidcore/src/encoder.c

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

revision 1.135, Fri Dec 24 13:20:07 2010 UTC revision 1.135.2.2, Wed Dec 29 22:29:51 2010 UTC
# Line 1645  Line 1645 
1645          int bound = 0, num_slices = pEnc->num_slices;          int bound = 0, num_slices = pEnc->num_slices;
1646          int num_threads = MAX(1, MIN(pEnc->num_threads, num_slices));          int num_threads = MAX(1, MIN(pEnc->num_threads, num_slices));
1647          int slices_per_thread = (num_slices*1024 / num_threads);          int slices_per_thread = (num_slices*1024 / num_threads);
         int mb_width = pEnc->mbParam.mb_width;  
1648          int mb_height = pEnc->mbParam.mb_height;          int mb_height = pEnc->mbParam.mb_height;
1649          void * status = NULL;          void * status = NULL;
1650          uint16_t k;          uint16_t k;
# Line 1755  Line 1754 
1754          FRAMEINFO *const current = pEnc->current;          FRAMEINFO *const current = pEnc->current;
1755          FRAMEINFO *const reference = pEnc->reference;          FRAMEINFO *const reference = pEnc->reference;
1756          MBParam * const pParam = &pEnc->mbParam;          MBParam * const pParam = &pEnc->mbParam;
         IMAGE *pRef = &reference->image;  
1757          int mb_width = pParam->mb_width;          int mb_width = pParam->mb_width;
1758          int mb_height = pParam->mb_height;          int mb_height = pParam->mb_height;
1759    
# Line 2285  Line 2283 
2283          IMAGE *b_ref = &pEnc->current->image;          IMAGE *b_ref = &pEnc->current->image;
2284    
2285          MBParam * const pParam = &pEnc->mbParam;          MBParam * const pParam = &pEnc->mbParam;
         int mb_width = pParam->mb_width;  
2286          int mb_height = pParam->mb_height;          int mb_height = pParam->mb_height;
2287    
2288          #ifdef BFRAMES_DEC_DEBUG          #ifdef BFRAMES_DEC_DEBUG
# Line 2305  Line 2302 
2302                  image_setedges(f_ref, pEnc->mbParam.edged_width,                  image_setedges(f_ref, pEnc->mbParam.edged_width,
2303                                             pEnc->mbParam.edged_height, pEnc->mbParam.width,                                             pEnc->mbParam.edged_height, pEnc->mbParam.width,
2304                                             pEnc->mbParam.height, 0);                                             pEnc->mbParam.height, 0);
2305                  pEnc->current->is_edged = 1;                  pEnc->reference->is_edged = 1;
2306          }          }
2307    
2308          if (pEnc->reference->is_interpolated != 0) {          if (pEnc->reference->is_interpolated != 0) {
# Line 2336  Line 2333 
2333    
2334          frame->coding_type = B_VOP;          frame->coding_type = B_VOP;
2335    
2336          if (pEnc->current->vop_flags & XVID_VOP_RD_PSNRHVSM) {          if ((frame->vop_flags & XVID_VOP_RD_PSNRHVSM) && (frame->vop_flags & XVID_VOP_RD_BVOP)) {
2337                  image_block_variance(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->current->mbs,                  image_block_variance(&frame->image, pEnc->mbParam.edged_width, frame->mbs,
2338                                       pEnc->mbParam.mb_width, pEnc->mbParam.mb_height);                                       pEnc->mbParam.mb_width, pEnc->mbParam.mb_height);
2339          }          }
2340    

Legend:
Removed from v.1.135  
changed lines
  Added in v.1.135.2.2

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