comparison libmpeg2/slice.c @ 5515:0cdc1388f02f

quant_store moved to frame struct
author arpi
date Sun, 07 Apr 2002 16:32:54 +0000
parents b4d0cc1fd14b
children 4d36307f12aa
comparison
equal deleted inserted replaced
5514:127f2a84e933 5515:0cdc1388f02f
30 30
31 extern mc_functions_t mc_functions; 31 extern mc_functions_t mc_functions;
32 extern void (* idct_block_copy) (int16_t * block, uint8_t * dest, int stride); 32 extern void (* idct_block_copy) (int16_t * block, uint8_t * dest, int stride);
33 extern void (* idct_block_add) (int16_t * block, uint8_t * dest, int stride); 33 extern void (* idct_block_add) (int16_t * block, uint8_t * dest, int stride);
34 34
35 #ifdef MPEG12_POSTPROC 35 //#ifdef MPEG12_POSTPROC
36 extern int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review] 36 //extern int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review]
37 #endif 37 //#endif
38 38
39 #include "vlc.h" 39 #include "vlc.h"
40 40
41 static int non_linear_quantizer_scale [] = { 41 static int non_linear_quantizer_scale [] = {
42 0, 1, 2, 3, 4, 5, 6, 7, 42 0, 1, 2, 3, 4, 5, 6, 7,
1751 picture->dc_dct_pred[0] = picture->dc_dct_pred[1] = 1751 picture->dc_dct_pred[0] = picture->dc_dct_pred[1] =
1752 picture->dc_dct_pred[2] = 1 << (picture->intra_dc_precision+7); 1752 picture->dc_dct_pred[2] = 1 << (picture->intra_dc_precision+7);
1753 } 1753 }
1754 1754
1755 #ifdef MPEG12_POSTPROC 1755 #ifdef MPEG12_POSTPROC
1756 quant_store[code][(offset>>4)+1] = picture->quantizer_scale; 1756 picture->current_frame->quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
1757 #endif 1757 #endif
1758 offset += 16; 1758 offset += 16;
1759 CHECK_DISPLAY; 1759 CHECK_DISPLAY;
1760 1760
1761 NEEDBITS (bit_buf, bits, bit_ptr); 1761 NEEDBITS (bit_buf, bits, bit_ptr);
1783 MOTION (motion_fr_zero, MACROBLOCK_MOTION_FORWARD); 1783 MOTION (motion_fr_zero, MACROBLOCK_MOTION_FORWARD);
1784 else 1784 else
1785 MOTION (motion_fi_zero, MACROBLOCK_MOTION_FORWARD); 1785 MOTION (motion_fi_zero, MACROBLOCK_MOTION_FORWARD);
1786 1786
1787 #ifdef MPEG12_POSTPROC 1787 #ifdef MPEG12_POSTPROC
1788 quant_store[code][(offset>>4)+1] = picture->quantizer_scale; 1788 picture->current_frame->quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
1789 #endif 1789 #endif
1790 1790
1791 offset += 16; 1791 offset += 16;
1792 CHECK_DISPLAY; 1792 CHECK_DISPLAY;
1793 } while (--mba_inc); 1793 } while (--mba_inc);
1799 MOTION (motion_fr_reuse, macroblock_modes); 1799 MOTION (motion_fr_reuse, macroblock_modes);
1800 else 1800 else
1801 MOTION (motion_fi_reuse, macroblock_modes); 1801 MOTION (motion_fi_reuse, macroblock_modes);
1802 1802
1803 #ifdef MPEG12_POSTPROC 1803 #ifdef MPEG12_POSTPROC
1804 quant_store[code][(offset>>4)+1] = picture->quantizer_scale; 1804 picture->current_frame->quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
1805 #endif 1805 #endif
1806 1806
1807 offset += 16; 1807 offset += 16;
1808 CHECK_DISPLAY; 1808 CHECK_DISPLAY;
1809 } while (--mba_inc); 1809 } while (--mba_inc);