diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-02 23:58:26 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-02 23:58:26 +0000 |
commit | 4418193191e2de50812da239c9cc9754f52a7807 (patch) | |
tree | ed0070c9a53410ae7981cb66279f0477a9f98f5f /divx4_vbr.c | |
parent | 0ba80be6032dd415d2dad41d8fc3a0412e284919 (diff) | |
download | mpv-4418193191e2de50812da239c9cc9754f52a7807.tar.bz2 mpv-4418193191e2de50812da239c9cc9754f52a7807.tar.xz |
divx4_vbr -> mplayer integration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2643 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'divx4_vbr.c')
-rw-r--r-- | divx4_vbr.c | 56 |
1 files changed, 22 insertions, 34 deletions
diff --git a/divx4_vbr.c b/divx4_vbr.c index b4918c6e22..6298e904a8 100644 --- a/divx4_vbr.c +++ b/divx4_vbr.c @@ -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 @@ typedef struct entry_s 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; +static int m_iCount; +static int m_iQuant; +static int m_iCrispness; +static short m_bDrop; +static float m_fQuant; -entry vFrame; -entry *m_vFrames; -long lFrameStart; +static int64_t m_lEncodedBits; +static int64_t m_lExpectedBits; -int iNumFrames; -int dummy; +static FILE *m_pFile; -// methods from class VbrControl +static entry vFrame; +static entry *m_vFrames; +static long lFrameStart; - 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 iNumFrames; +static int dummy; void VbrControl_init_1pass_vbr(int quality, int crispness) @@ -233,14 +221,14 @@ int VbrControl_init_2pass_vbr_encoding(const char *filename, int bitrate, double 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 |