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

Diff of /xvidcore/src/utils/mbtransquant.c

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

revision 1.10, Mon Aug 19 19:19:40 2002 UTC revision 1.11.2.4, Sat Nov 9 13:23:51 2002 UTC
# Line 65  Line 65 
65  #include "../quant/quant_h263.h"  #include "../quant/quant_h263.h"
66  #include "../encoder.h"  #include "../encoder.h"
67    
68    MBFIELDTEST_PTR MBFieldTest;
69    
70  #define MIN(X, Y) ((X)<(Y)?(X):(Y))  #define MIN(X, Y) ((X)<(Y)?(X):(Y))
71  #define MAX(X, Y) ((X)>(Y)?(X):(Y))  #define MAX(X, Y) ((X)>(Y)?(X):(Y))
72    
73  #define TOOSMALL_LIMIT 3                /* skip blocks having a coefficient sum below this value */  #define TOOSMALL_LIMIT  1       /* skip blocks having a coefficient sum below this value */
74    
75  /* this isnt pretty, but its better than 20 ifdefs */  /* this isnt pretty, but its better than 20 ifdefs */
76    
# Line 105  Line 107 
107    
108          start_timer();          start_timer();
109          pMB->field_dct = 0;          pMB->field_dct = 0;
110          if ((frame->global_flags & XVID_INTERLACING)) {          if ((frame->global_flags & XVID_INTERLACING) &&
111                    (x_pos>0) && (x_pos<pParam->mb_width-1) &&
112                    (y_pos>0) && (y_pos<pParam->mb_height-1)) {
113                  pMB->field_dct = MBDecideFieldDCT(data);                  pMB->field_dct = MBDecideFieldDCT(data);
114          }          }
115          stop_interlacing_timer();          stop_interlacing_timer();
# Line 183  Line 187 
187    
188          start_timer();          start_timer();
189          pMB->field_dct = 0;          pMB->field_dct = 0;
190          if ((frame->global_flags & XVID_INTERLACING)) {          if ((frame->global_flags & XVID_INTERLACING) &&
191                    (x_pos>0) && (x_pos<pParam->mb_width-1) &&
192                    (y_pos>0) && (y_pos<pParam->mb_height-1)) {
193                  pMB->field_dct = MBDecideFieldDCT(data);                  pMB->field_dct = MBDecideFieldDCT(data);
194          }          }
195          stop_interlacing_timer();          stop_interlacing_timer();
# Line 572  Line 578 
578    
579    
580    
581  /* if sum(diff between field lines) < sum(diff between frame lines), use field dct */  /* permute block and return field dct choice */
582    
583    
584  uint32_t  uint32_t
585  MBDecideFieldDCT(int16_t data[6 * 64])  MBDecideFieldDCT(int16_t data[6 * 64])
586  {  {
587            uint32_t field = MBFieldTest(data);
588    
589            if (field) {
590                    MBFrameToField(data);
591            }
592    
593            return field;
594    }
595    
596    
597    /* if sum(diff between field lines) < sum(diff between frame lines), use field dct */
598    
599    uint32_t
600    MBFieldTest_c(int16_t data[6 * 64])
601    {
602          const uint8_t blocks[] =          const uint8_t blocks[] =
603                  { 0 * 64, 0 * 64, 0 * 64, 0 * 64, 2 * 64, 2 * 64, 2 * 64, 2 * 64 };                  { 0 * 64, 0 * 64, 0 * 64, 0 * 64, 2 * 64, 2 * 64, 2 * 64, 2 * 64 };
604          const uint8_t lines[] = { 0, 16, 32, 48, 0, 16, 32, 48 };          const uint8_t lines[] = { 0, 16, 32, 48, 0, 16, 32, 48 };
# Line 612  Line 632 
632                  }                  }
633          }          }
634    
635          if (frame > field) {          return (frame >= (field + 350));
                 MBFrameToField(data);  
         }  
   
         return (frame > field);  
636  }  }
637    
638    
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11.2.4
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4