[Mplayer-cvslog] CVS: main divx4_vbr.h,NONE,1.1 Makefile,1.93,1.94 divx4_vbr.c,1.1,1.2

[Arpi of Ize]

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

Modified Files:
	Makefile divx4_vbr.c 
Added Files:
	divx4_vbr.h 
Log Message:
divx4_vbr -> mplayer integration

--- NEW FILE ---

// methods from class VbrControl

	void VbrControl_init_1pass_vbr(int quality, int crispness);
	int VbrControl_init_2pass_vbr_encoding(const char* filename, int bitrate, double framerate, int crispness, int quality);
	int VbrControl_init_2pass_vbr_analysis(const char* filename, int quality);

	void VbrControl_update_1pass_vbr();
	void VbrControl_update_2pass_vbr_encoding(int motion_bits, int texture_bits, int total_bits);
	void VbrControl_update_2pass_vbr_analysis(int is_key_frame, int motion_bits, int texture_bits, int total_bits, int quant);

	int VbrControl_get_quant();
	void VbrControl_set_quant(float q);
	int VbrControl_get_intra();
	short VbrControl_get_drop();
	void VbrControl_close();


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- Makefile	2 Nov 2001 10:26:58 -0000	1.93
+++ Makefile	2 Nov 2001 23:58:25 -0000	1.94
@@ -21,7 +21,7 @@
 # a BSD compatible 'install' program
 INSTALL = install
 
-SRCS_MENCODER = mencoder.c libvo/aclib.c libvo/img_format.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c codec-cfg.c cfgparser.c
+SRCS_MENCODER = divx4_vbr.c mencoder.c libvo/aclib.c libvo/img_format.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c codec-cfg.c cfgparser.c
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 
 SRCS_MPLAYER = mplayer.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c

Index: divx4_vbr.c
===================================================================
RCS file: /cvsroot/mplayer/main/divx4_vbr.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- divx4_vbr.c	2 Nov 2001 23:53:44 -0000	1.1
+++ divx4_vbr.c	2 Nov 2001 23:58:26 -0000	1.2
@@ -36,6 +36,7 @@
  
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -45,7 +46,10 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "transcode.h"
+
+#include "divx4_vbr.h"
+
+//#include "transcode.h"
 
 #define FALSE 0
 #define TRUE 1
@@ -82,39 +86,23 @@
 		short drop;
 	} entry;
 
-int m_iCount;
-int m_iQuant;
-int m_iCrispness;
-short m_bDrop;
-float m_fQuant;
-
-int64_t m_lEncodedBits;
-int64_t m_lExpectedBits;
-
-FILE  *m_pFile;
-
-entry    vFrame;
-entry *m_vFrames;
-long	lFrameStart;
-
-int	iNumFrames;
-int	dummy;
-
-// methods from class VbrControl
-
-	void VbrControl_init_1pass_vbr(int quality, int crispness);
-	int VbrControl_init_2pass_vbr_encoding(const char* filename, int bitrate, double framerate, int crispness, int quality);
-	int VbrControl_init_2pass_vbr_analysis(const char* filename, int quality);
-
-	void VbrControl_update_1pass_vbr();
-	void VbrControl_update_2pass_vbr_encoding(int motion_bits, int texture_bits, int total_bits);
-	void VbrControl_update_2pass_vbr_analysis(int is_key_frame, int motion_bits, int texture_bits, int total_bits, int quant);
-
-	int VbrControl_get_quant();
-	void VbrControl_set_quant(float q);
-	int VbrControl_get_intra();
-	short VbrControl_get_drop();
-	void VbrControl_close();
+static int m_iCount;
+static int m_iQuant;
+static int m_iCrispness;
+static short m_bDrop;
+static float m_fQuant;
+
+static int64_t m_lEncodedBits;
+static int64_t m_lExpectedBits;
+
+static FILE  *m_pFile;
+
+static entry    vFrame;
+static entry *m_vFrames;
+static long	lFrameStart;
+
+static int	iNumFrames;
+static int	dummy;
 
 
 void VbrControl_init_1pass_vbr(int quality, int crispness)
@@ -233,14 +221,14 @@
 		iNumFrames++;
 		average_complexity=complexity/iNumFrames;
 		
-		if (verbose & TC_DEBUG)	{
-		    fprintf(stderr, "(%s) frames %d, texture %lld, motion %lld, total %lld, complexity %lld\n", __FILE__, iNumFrames, text_bits, motion_bits, total_bits, complexity);
-		}
+//		if (verbose & TC_DEBUG)	{
+//		    fprintf(stderr, "(%s) frames %d, texture %lld, motion %lld, total %lld, complexity %lld\n", __FILE__, iNumFrames, text_bits, motion_bits, total_bits, complexity);
+//		}
 		
 		m_vFrames = (entry*)malloc(iNumFrames*sizeof(entry));
 		if (!m_vFrames) 
 		{	printf("out of memory");
-			return TC_EXPORT_ERROR;
+			return -2; //TC_EXPORT_ERROR;
 		}
 			
 	   fseek(m_pFile, lFrameStart, SEEK_SET);		// start again