[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.80, Thu Sep 5 19:34:35 2002 UTC revision 1.88, Tue Nov 26 23:44:09 2002 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - Encoder main module -   *  - Encoder main module -
5   *   *
6   *  Copyright(C) 2002 Michael Militzer   *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
7     *               2002 Peter Ross <pross@xvid.org>
8     *               2002 Daniel Smith <danielsmith@astroboymail.com>
9   *   *
10   *  This program is an implementation of a part of one or more MPEG-4   *  This file is part of XviD, a free MPEG-4 video encoder/decoder
  *  Video tools as specified in ISO/IEC 14496-2 standard.  Those intending  
  *  to use this software module in hardware or software products are  
  *  advised that its use may infringe existing patents or copyrights, and  
  *  any such use would be at such party's own risk.  The original  
  *  developer of this software module and his/her company, and subsequent  
  *  editors and their companies, will have no liability for use of this  
  *  software or modifications or derivatives thereof.  
11   *   *
12   *  This program is free software; you can redistribute it and/or modify   *  XviD is free software; you can redistribute it and/or modify it
13   *  it under the terms of the GNU General Public License as published by   *  under the terms of the GNU General Public License as published by
14   *  the Free Software Foundation; either version 2 of the License, or   *  the Free Software Foundation; either version 2 of the License, or
15   *  (at your option) any later version.   *  (at your option) any later version.
16   *   *
# Line 28  Line 23 
23   *  along with this program; if not, write to the Free Software   *  along with this program; if not, write to the Free Software
24   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
25   *   *
26     *  Under section 8 of the GNU General Public License, the copyright
27     *  holders of XVID explicitly forbid distribution in the following
28     *  countries:
29     *
30     *    - Japan
31     *    - United States of America
32     *
33     *  Linking XviD statically or dynamically with other modules is making a
34     *  combined work based on XviD.  Thus, the terms and conditions of the
35     *  GNU General Public License cover the whole combination.
36     *
37     *  As a special exception, the copyright holders of XviD give you
38     *  permission to link XviD with independent modules that communicate with
39     *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
40     *  license terms of these independent modules, and to copy and distribute
41     *  the resulting combined work under terms of your choice, provided that
42     *  every copy of the combined work is accompanied by a complete copy of
43     *  the source code of XviD (the version of XviD used to produce the
44     *  combined work), being distributed under the terms of the GNU General
45     *  Public License plus this exception.  An independent module is a module
46     *  which is not derived from or based on XviD.
47     *
48     *  Note that people who make modified versions of XviD are not obligated
49     *  to grant this special exception for their modified versions; it is
50     *  their choice whether to do so.  The GNU General Public License gives
51     *  permission to release a modified version without this exception; this
52     *  exception also makes it possible to release a modified version which
53     *  carries forward this exception.
54     *
55   * $Id$   * $Id$
56   *   *
57   ****************************************************************************/   ****************************************************************************/
# Line 257  Line 281 
281          image_null(&pEnc->reference->image);          image_null(&pEnc->reference->image);
282          image_null(&pEnc->vInterH);          image_null(&pEnc->vInterH);
283          image_null(&pEnc->vInterV);          image_null(&pEnc->vInterV);
         image_null(&pEnc->vInterVf);  
284          image_null(&pEnc->vInterHV);          image_null(&pEnc->vInterHV);
         image_null(&pEnc->vInterHVf);  
285    
286  #ifdef _DEBUG_PSNR  #ifdef _DEBUG_PSNR
287          if (image_create          if (image_create
# Line 284  Line 306 
306                   pEnc->mbParam.edged_height) < 0)                   pEnc->mbParam.edged_height) < 0)
307                  goto xvid_err_memory3;                  goto xvid_err_memory3;
308          if (image_create          if (image_create
                 (&pEnc->vInterVf, pEnc->mbParam.edged_width,  
                  pEnc->mbParam.edged_height) < 0)  
                 goto xvid_err_memory3;  
         if (image_create  
309                  (&pEnc->vInterHV, pEnc->mbParam.edged_width,                  (&pEnc->vInterHV, pEnc->mbParam.edged_width,
310                   pEnc->mbParam.edged_height) < 0)                   pEnc->mbParam.edged_height) < 0)
311                  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;  
312    
313          pParam->handle = (void *) pEnc;          pParam->handle = (void *) pEnc;
314    
# Line 328  Line 342 
342                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
343          image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width,          image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width,
344                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
         image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width,  
                                   pEnc->mbParam.edged_height);  
345          image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width,          image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width,
346                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
         image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width,  
                                   pEnc->mbParam.edged_height);  
347    
348    xvid_err_memory2:    xvid_err_memory2:
349          xvid_free(pEnc->current->mbs);          xvid_free(pEnc->current->mbs);
# Line 375  Line 385 
385                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
386          image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width,          image_destroy(&pEnc->vInterV, pEnc->mbParam.edged_width,
387                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
         image_destroy(&pEnc->vInterVf, pEnc->mbParam.edged_width,  
                                   pEnc->mbParam.edged_height);  
388          image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width,          image_destroy(&pEnc->vInterHV, pEnc->mbParam.edged_width,
389                                    pEnc->mbParam.edged_height);                                    pEnc->mbParam.edged_height);
         image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width,  
                                   pEnc->mbParam.edged_height);  
390    
391  #ifdef _DEBUG_PSNR  #ifdef _DEBUG_PSNR
392          image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width,          image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width,
# Line 560  Line 566 
566          emms();          emms();
567    
568          if (pFrame->quant == 0) {          if (pFrame->quant == 0) {
569                  RateControlUpdate(&pEnc->rate_control, pEnc->current->quant,                  RateControlUpdate(&pEnc->rate_control, (int16_t)pEnc->current->quant,
570                                                    pFrame->length, pFrame->intra);                                                    pFrame->length, pFrame->intra);
571          }          }
572  #ifdef _DEBUG_PSNR  #ifdef _DEBUG_PSNR
# Line 697  Line 703 
703                                          pMB->pmvs[vec].x = pMB->mvs[vec].x - pred.x;                                          pMB->pmvs[vec].x = pMB->mvs[vec].x - pred.x;
704                                          pMB->pmvs[vec].y = pMB->mvs[vec].y - pred.y;                                          pMB->pmvs[vec].y = pMB->mvs[vec].y - pred.y;
705                                  }                                  }
706                          } else                          // intra / stuffing / not_coded                          } else                          /* intra / stuffing / not_coded */
707                          {                          {
708                                  for (vec = 0; vec < 4; ++vec) {                                  for (vec = 0; vec < 4; ++vec) {
709                                          pMB->mvs[vec].x = pMB->mvs[vec].y = 0;                                          pMB->mvs[vec].x = pMB->mvs[vec].y = 0;
# Line 870  Line 876 
876                  HintedMEGet(pEnc, 1);                  HintedMEGet(pEnc, 1);
877          }          }
878    
879          return 1;                                       // intra          return 1;                                       /* intra */
880  }  }
881    
882    
# Line 889  Line 895 
895          DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);          DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE);
896    
897          int iLimit;          int iLimit;
898          int x, y, k;          unsigned int x, y;
899          int iSearchRange;          int iSearchRange;
900          int bIntra;          int bIntra;
901    
# Line 898  Line 904 
904    
905          start_timer();          start_timer();
906          image_setedges(pRef, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,          image_setedges(pRef, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height,
907                                     pEnc->mbParam.width, pEnc->mbParam.height,                                     pEnc->mbParam.width, pEnc->mbParam.height);
                                    pEnc->current->global_flags & XVID_INTERLACING);  
908          stop_edges_timer();          stop_edges_timer();
909    
910          pEnc->mbParam.m_rounding_type = 1 - pEnc->mbParam.m_rounding_type;          pEnc->mbParam.m_rounding_type = 1 - pEnc->mbParam.m_rounding_type;
# Line 1000  Line 1005 
1005                                  CodeIntraMB(pEnc, pMB);                                  CodeIntraMB(pEnc, pMB);
1006                                  MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y,                                  MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y,
1007                                                                    dct_codes, qcoeff);                                                                    dct_codes, qcoeff);
                         }  
1008    
1009                          start_timer();                          start_timer();
1010                          MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff);                          MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff);
1011                          stop_prediction_timer();                          stop_prediction_timer();
1012                            }
1013    
1014                          if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) {                          if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) {
1015                                  pEnc->sStat.kblks++;                                  pEnc->sStat.kblks++;
# Line 1053  Line 1058 
1058          iSearchRange = 1 << (3 + pEnc->mbParam.m_fcode);          iSearchRange = 1 << (3 + pEnc->mbParam.m_fcode);
1059    
1060          if ((fSigma > iSearchRange / 3)          if ((fSigma > iSearchRange / 3)
1061                  && (pEnc->mbParam.m_fcode <= 3))        // maximum search range 128                  && (pEnc->mbParam.m_fcode <= 3))        /* maximum search range 128 */
1062          {          {
1063                  pEnc->mbParam.m_fcode++;                  pEnc->mbParam.m_fcode++;
1064                  iSearchRange *= 2;                  iSearchRange *= 2;
1065          } else if ((fSigma < iSearchRange / 6)          } else if ((fSigma < iSearchRange / 6)
1066                             && (pEnc->sStat.fMvPrevSigma >= 0)                             && (pEnc->sStat.fMvPrevSigma >= 0)
1067                             && (pEnc->sStat.fMvPrevSigma < iSearchRange / 6)                             && (pEnc->sStat.fMvPrevSigma < iSearchRange / 6)
1068                             && (pEnc->mbParam.m_fcode >= 2))     // minimum search range 16                             && (pEnc->mbParam.m_fcode >= 2))     /* minimum search range 16 */
1069          {          {
1070                  pEnc->mbParam.m_fcode--;                  pEnc->mbParam.m_fcode--;
1071                  iSearchRange /= 2;                  iSearchRange /= 2;
# Line 1070  Line 1075 
1075    
1076          *pBits = BitstreamPos(bs) - *pBits;          *pBits = BitstreamPos(bs) - *pBits;
1077    
1078          return 0;                                       // inter          return 0;                                       /* inter */
1079    
1080  }  }

Legend:
Removed from v.1.80  
changed lines
  Added in v.1.88

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