[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.3, Fri Dec 31 10:20:22 2010 UTC
# Line 1609  Line 1609 
1609                  memcpy((void *)((ptr_t)bs->start + pos),                  memcpy((void *)((ptr_t)bs->start + pos),
1610                             (void *)((ptr_t)pEnc->smpData[k].bs->start), len);                             (void *)((ptr_t)pEnc->smpData[k].bs->start), len);
1611    
1612                  current->length = pos += len;                  current->length += len;
1613                    pos += len;
1614    
1615                  /* collect stats */                  /* collect stats */
1616                  current->sStat.iTextBits += pEnc->smpData[k].sStat->iTextBits;                  current->sStat.iTextBits += pEnc->smpData[k].sStat->iTextBits;
# Line 1645  Line 1646 
1646          int bound = 0, num_slices = pEnc->num_slices;          int bound = 0, num_slices = pEnc->num_slices;
1647          int num_threads = MAX(1, MIN(pEnc->num_threads, num_slices));          int num_threads = MAX(1, MIN(pEnc->num_threads, num_slices));
1648          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;  
1649          int mb_height = pEnc->mbParam.mb_height;          int mb_height = pEnc->mbParam.mb_height;
1650          void * status = NULL;          void * status = NULL;
1651          uint16_t k;          uint16_t k;
# Line 1755  Line 1755 
1755          FRAMEINFO *const current = pEnc->current;          FRAMEINFO *const current = pEnc->current;
1756          FRAMEINFO *const reference = pEnc->reference;          FRAMEINFO *const reference = pEnc->reference;
1757          MBParam * const pParam = &pEnc->mbParam;          MBParam * const pParam = &pEnc->mbParam;
         IMAGE *pRef = &reference->image;  
1758          int mb_width = pParam->mb_width;          int mb_width = pParam->mb_width;
1759          int mb_height = pParam->mb_height;          int mb_height = pParam->mb_height;
1760    
# Line 2285  Line 2284 
2284          IMAGE *b_ref = &pEnc->current->image;          IMAGE *b_ref = &pEnc->current->image;
2285    
2286          MBParam * const pParam = &pEnc->mbParam;          MBParam * const pParam = &pEnc->mbParam;
         int mb_width = pParam->mb_width;  
2287          int mb_height = pParam->mb_height;          int mb_height = pParam->mb_height;
2288    
2289          #ifdef BFRAMES_DEC_DEBUG          #ifdef BFRAMES_DEC_DEBUG
# Line 2305  Line 2303 
2303                  image_setedges(f_ref, pEnc->mbParam.edged_width,                  image_setedges(f_ref, pEnc->mbParam.edged_width,
2304                                             pEnc->mbParam.edged_height, pEnc->mbParam.width,                                             pEnc->mbParam.edged_height, pEnc->mbParam.width,
2305                                             pEnc->mbParam.height, 0);                                             pEnc->mbParam.height, 0);
2306                  pEnc->current->is_edged = 1;                  pEnc->reference->is_edged = 1;
2307          }          }
2308    
2309          if (pEnc->reference->is_interpolated != 0) {          if (pEnc->reference->is_interpolated != 0) {
# Line 2336  Line 2334 
2334    
2335          frame->coding_type = B_VOP;          frame->coding_type = B_VOP;
2336    
2337          if (pEnc->current->vop_flags & XVID_VOP_RD_PSNRHVSM) {          if ((frame->vop_flags & XVID_VOP_RD_PSNRHVSM) && (frame->vop_flags & XVID_VOP_RD_BVOP)) {
2338                  image_block_variance(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->current->mbs,                  image_block_variance(&frame->image, pEnc->mbParam.edged_width, frame->mbs,
2339                                       pEnc->mbParam.mb_width, pEnc->mbParam.mb_height);                                       pEnc->mbParam.mb_width, pEnc->mbParam.mb_height);
2340          }          }
2341    

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

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