[Mplayer-cvslog] CVS: main/libmpeg2 header.c, 1.15, 1.16 mpeg2_internal.h, 1.17, 1.18 slice.c, 1.11, 1.12

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

Update of /cvsroot/mplayer/main/libmpeg2
In directory mail:/var2/tmp/cvs-serv15199/libmpeg2

Modified Files:
	header.c mpeg2_internal.h slice.c 
Log Message:
forgotten libmpeg2 postprocessing

Index: header.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/header.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- header.c	2 Aug 2004 11:20:38 -0000	1.15
+++ header.c	2 Aug 2004 13:09:17 -0000	1.16
@@ -803,6 +803,7 @@
 	mpeg2dec->scaled[index] = mpeg2dec->q_scale_type;
 	for (i = 0; i < 32; i++) {
 	    k = mpeg2dec->q_scale_type ? non_linear_scale[i] : (i << 1);
+	    decoder->quantizer_scale = k;
 	    for (j = 0; j < 64; j++)
 		decoder->quantizer_prescale[index][i][j] =
 		    k * mpeg2dec->quantizer_matrix[index][j];

Index: mpeg2_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/mpeg2_internal.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mpeg2_internal.h	2 Aug 2004 11:20:38 -0000	1.17
+++ mpeg2_internal.h	2 Aug 2004 13:09:17 -0000	1.18
@@ -144,6 +144,11 @@
     int second_field;
 
     int mpeg1;
+
+    /* for MPlayer: */
+    int quantizer_scale;
+    char* quant_store;
+    int quant_stride;
 };
 
 typedef struct {

Index: slice.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpeg2/slice.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- slice.c	2 Aug 2004 11:20:38 -0000	1.11
+++ slice.c	2 Aug 2004 13:09:17 -0000	1.12
@@ -1564,6 +1564,9 @@
 
 #define NEXT_MACROBLOCK							\
 do {									\
+    if(decoder->quant_store)                                            \
+        decoder->quant_store[decoder->quant_stride*(decoder->v_offset>>4) \
+                    +(decoder->offset>>4)] = decoder->quantizer_scale;  \
     decoder->offset += 16;						\
     if (decoder->offset == decoder->width) {				\
 	do { /* just so we can use the break statement */		\