[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 477, Thu Sep 12 18:53:35 2002 UTC revision 541, Wed Sep 25 23:37:09 2002 UTC
# Line 28  Line 28 
28   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
29   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
30   *   *
31   * $Id: encoder.c,v 1.83 2002-09-12 18:53:35 edgomez Exp $   * $Id: encoder.c,v 1.84 2002-09-25 23:37:08 h Exp $
32   *   *
33   ****************************************************************************/   ****************************************************************************/
34    
# Line 257  Line 257 
257          image_null(&pEnc->reference->image);          image_null(&pEnc->reference->image);
258          image_null(&pEnc->vInterH);          image_null(&pEnc->vInterH);
259          image_null(&pEnc->vInterV);          image_null(&pEnc->vInterV);
         image_null(&pEnc->vInterVf);  
260          image_null(&pEnc->vInterHV);          image_null(&pEnc->vInterHV);
         image_null(&pEnc->vInterHVf);  
261    
262  #ifdef _DEBUG_PSNR  #ifdef _DEBUG_PSNR
263          if (image_create          if (image_create
# Line 284  Line 282 
282                   pEnc->mbParam.edged_height) < 0)                   pEnc->mbParam.edged_height) < 0)
283                  goto xvid_err_memory3;                  goto xvid_err_memory3;
284          if (image_create          if (image_create
                 (&pEnc->vInterVf, pEnc->mbParam.edged_width,  
                  pEnc->mbParam.edged_height) < 0)  
                 goto xvid_err_memory3;  
         if (image_create  
285                  (&pEnc->vInterHV, pEnc->mbParam.edged_width,                  (&pEnc->vInterHV, pEnc->mbParam.edged_width,
286                   pEnc->mbParam.edged_height) < 0)                   pEnc->mbParam.edged_height) < 0)
287                  goto xvid_err_memory3;                  goto xvid_err_memory3;
         if (image_create  
                 (&pEnc->vInterHVf, pEnc->mbParam.edged_width,  
                  pEnc->mbParam.edged_height) < 0)  
                 goto xvid_err_memory3;  
288    
289          pParam->handle = (void *) pEnc;          pParam->handle = (void *) pEnc;
290    
# Line 328  Line 318 
318                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
319          image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width,          image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width,
320                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
         image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width,  
                                   pEnc->mbParam.edged_height);  
321          image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width,          image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width,
322                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
         image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width,  
                                   pEnc->mbParam.edged_height);  
323    
324    xvid_err_memory2:    xvid_err_memory2:
325          xvid_free(pEnc->current->mbs);          xvid_free(pEnc->current->mbs);
# Line 375  Line 361 
361                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
362          image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width,          image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width,
363                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
         image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width,  
                                   pEnc->mbParam.edged_height);  
364          image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width,          image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width,
365                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
         image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width,  
                                   pEnc->mbParam.edged_height);  
366    
367  #ifdef _DEBUG_PSNR  #ifdef _DEBUG_PSNR
368          image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width,          image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width,
# Line 898  Line 880 
880    
881          start_timer();          start_timer();
882          image_setedges(pRef, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,          image_setedges(pRef, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
883                                     pEnc->mbParam.width, pEnc->mbParam.height,                                     pEnc->mbParam.width, pEnc->mbParam.height);
                                    pEnc->current->global_flags & XVID_INTERLACING);  
884          stop_edges_timer();          stop_edges_timer();
885    
886          pEnc->mbParam.m_rounding_type = 1 - pEnc->mbParam.m_rounding_type;          pEnc->mbParam.m_rounding_type = 1 - pEnc->mbParam.m_rounding_type;

Legend:
Removed from v.477  
changed lines
  Added in v.541

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