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

Diff of /trunk/xvidcore/src/encoder.c

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

revision 1928, Tue Dec 28 19:19:57 2010 UTC revision 1931, Wed Dec 29 22:39:35 2010 UTC
# Line 21  Line 21 
21   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24   * $Id: encoder.c,v 1.136 2010-12-28 19:19:43 Isibaar Exp $   * $Id: encoder.c,v 1.137 2010-12-29 22:39:35 Isibaar Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 2302  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 2333  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.1928  
changed lines
  Added in v.1931

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