diff options
Diffstat (limited to 'k9decmpeg')
| -rwxr-xr-x | k9decmpeg/header.cpp | 4 | ||||
| -rwxr-xr-x | k9decmpeg/mpeg2_internal.h | 2 | ||||
| -rwxr-xr-x | k9decmpeg/slice.cpp | 4 | ||||
| -rwxr-xr-x | k9decmpeg/vlc.h | 14 |
4 files changed, 12 insertions, 12 deletions
diff --git a/k9decmpeg/header.cpp b/k9decmpeg/header.cpp index e3757c1..785f9a4 100755 --- a/k9decmpeg/header.cpp +++ b/k9decmpeg/header.cpp @@ -35,7 +35,7 @@ #define SETQ_EXT 2 #define SETQ_DISPLAY_EXT 4 -#define TQUANT_MATRIX_EXT 8 +#define QUANT_MATRIX_EXT 8 #define COPYRIGHT_EXT 0x10 #define PIC_DISPLAY_EXT 0x80 #define PIC_CODING_EXT 0x100 @@ -570,7 +570,7 @@ static int picture_coding_ext (mpeg2dec_t * mpeg2dec) PIC_MASK_COMPOSITE_DISPLAY) | PIC_FLAG_COMPOSITE_DISPLAY; picture->flags = flags; - mpeg2dec->ext_state = PIC_DISPLAY_EXT | COPYRIGHT_EXT | TQUANT_MATRIX_EXT; + mpeg2dec->ext_state = PIC_DISPLAY_EXT | COPYRIGHT_EXT | QUANT_MATRIX_EXT; return 0; } diff --git a/k9decmpeg/mpeg2_internal.h b/k9decmpeg/mpeg2_internal.h index 8eecf37..7e6c1df 100755 --- a/k9decmpeg/mpeg2_internal.h +++ b/k9decmpeg/mpeg2_internal.h @@ -26,7 +26,7 @@ #define MACROBLOCK_PATTERN 2 #define MACROBLOCK_MOTION_BACKWARD 4 #define MACROBLOCK_MOTION_FORWARD 8 -#define MACROBLOCK_TQUANT 16 +#define MACROBLOCK_QUANT 16 #define DCT_TYPE_INTERLACED 32 /* motion_type */ #define MOTION_TYPE_SHIFT 6 diff --git a/k9decmpeg/slice.cpp b/k9decmpeg/slice.cpp index 55c3d03..2c25bb1 100755 --- a/k9decmpeg/slice.cpp +++ b/k9decmpeg/slice.cpp @@ -1797,8 +1797,8 @@ void mpeg2_slice (mpeg2_decoder_t * const decoder, const int code, macroblock_modes = get_macroblock_modes (decoder); - /* maybe integrate MACROBLOCK_TQUANT test into get_macroblock_modes ? */ - if (macroblock_modes & MACROBLOCK_TQUANT) + /* maybe integrate MACROBLOCK_QUANT test into get_macroblock_modes ? */ + if (macroblock_modes & MACROBLOCK_QUANT) get_quantizer_scale (decoder); if (macroblock_modes & MACROBLOCK_INTRA) { diff --git a/k9decmpeg/vlc.h b/k9decmpeg/vlc.h index 61b2a50..f82e595 100755 --- a/k9decmpeg/vlc.h +++ b/k9decmpeg/vlc.h @@ -96,17 +96,17 @@ typedef struct { #define INTRA MACROBLOCK_INTRA -#define TQUANT MACROBLOCK_TQUANT +#define QUANT MACROBLOCK_QUANT static const MBtab MB_I [] = { - {INTRA|TQUANT, 2}, {INTRA, 1} + {INTRA|QUANT, 2}, {INTRA, 1} }; #define MC MACROBLOCK_MOTION_FORWARD #define CODED MACROBLOCK_PATTERN static const MBtab MB_P [] = { - {INTRA|TQUANT, 6}, {CODED|TQUANT, 5}, {MC|CODED|TQUANT, 5}, {INTRA, 5}, + {INTRA|QUANT, 6}, {CODED|QUANT, 5}, {MC|CODED|QUANT, 5}, {INTRA, 5}, {MC, 3}, {MC, 3}, {MC, 3}, {MC, 3}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, @@ -121,9 +121,9 @@ static const MBtab MB_P [] = { #define INTER MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD static const MBtab MB_B [] = { - {0, 0}, {INTRA|TQUANT, 6}, - {BWD|CODED|TQUANT, 6}, {FWD|CODED|TQUANT, 6}, - {INTER|CODED|TQUANT, 5}, {INTER|CODED|TQUANT, 5}, + {0, 0}, {INTRA|QUANT, 6}, + {BWD|CODED|QUANT, 6}, {FWD|CODED|QUANT, 6}, + {INTER|CODED|QUANT, 5}, {INTER|CODED|QUANT, 5}, {INTRA, 5}, {INTRA, 5}, {FWD, 4}, {FWD, 4}, {FWD, 4}, {FWD, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, @@ -142,7 +142,7 @@ static const MBtab MB_B [] = { }; #undef INTRA -#undef TQUANT +#undef QUANT #undef MC #undef CODED #undef FWD |