[Mplayer-cvslog] CVS: main/libmpeg2 Makefile,1.7,1.8 mpeg2_internal.h,1.12,1.13 slice.c,1.6,1.7

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpeg2
In directory mplayer:/var/tmp.root/cvs-serv19440

Modified Files:
	Makefile mpeg2_internal.h slice.c 
Log Message:
quant_store moved to frame struct

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	24 Aug 2001 16:20:04 -0000	1.7
+++ Makefile	7 Apr 2002 16:32:04 -0000	1.8
@@ -5,7 +5,7 @@
 
 SRCS	= header.c idct.c idct_mmx.c idct_mlib.c \
 		motion_comp.c motion_comp_mmx.c motion_comp_mlib.c \
-		slice.c stats.c decode.c
+		slice.c stats.c # decode.c
 OBJS	= $(SRCS:.c=.o)
 INCLUDE = -I. -I../libvo -I.. $(EXTRA_INC) $(MLIB_INC)
 CFLAGS  = $(OPTFLAGS) $(INCLUDE) -DMPG12PLAY

Index: mpeg2_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/mpeg2_internal.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mpeg2_internal.h	3 Apr 2002 11:54:14 -0000	1.12
+++ mpeg2_internal.h	7 Apr 2002 16:32:04 -0000	1.13
@@ -56,6 +56,12 @@
     void (* copy) (struct vo_frame_s * frame, uint8_t ** src);
     void* vo;
     void* mpi;
+#ifdef MPEG12_POSTPROC
+#define MPEG2_MBC 120
+#define MPEG2_MBR 72
+    int quant_store[MPEG2_MBR+1][MPEG2_MBC+1];
+#endif
+
 //    int slice;
 //    void (* field) (struct vo_frame_s * frame, int flags);
 //    void (* draw) (struct vo_frame_s * frame);
@@ -219,7 +225,3 @@
 void mpeg2_free_image_buffers (picture_t * picture);
 
 
-#ifdef MPEG12_POSTPROC
-#define MPEG2_MBC 120
-#define MPEG2_MBR 72
-#endif

Index: slice.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/slice.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slice.c	7 Nov 2001 01:59:28 -0000	1.6
+++ slice.c	7 Apr 2002 16:32:04 -0000	1.7
@@ -32,9 +32,9 @@
 extern void (* idct_block_copy) (int16_t * block, uint8_t * dest, int stride);
 extern void (* idct_block_add) (int16_t * block, uint8_t * dest, int stride);
 
-#ifdef MPEG12_POSTPROC
-extern int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review]
-#endif
+//#ifdef MPEG12_POSTPROC
+//extern int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review]
+//#endif
 
 #include "vlc.h"
 
@@ -1753,7 +1753,7 @@
 	}
 
 #ifdef MPEG12_POSTPROC
-	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
+	picture->current_frame->quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
 #endif
 	offset += 16;
 	CHECK_DISPLAY;
@@ -1785,7 +1785,7 @@
 			MOTION (motion_fi_zero, MACROBLOCK_MOTION_FORWARD);
 
 #ifdef MPEG12_POSTPROC
-	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
+	picture->current_frame->quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
 #endif
 
 		    offset += 16;
@@ -1801,7 +1801,7 @@
 			MOTION (motion_fi_reuse, macroblock_modes);
 
 #ifdef MPEG12_POSTPROC
-	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
+	picture->current_frame->quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
 #endif
 
 		    offset += 16;