diff options
Diffstat (limited to 'converter/ppm/ppmtompeg/headers')
26 files changed, 239 insertions, 238 deletions
diff --git a/converter/ppm/ppmtompeg/headers/all.h b/converter/ppm/ppmtompeg/headers/all.h index 8f095d8e..242ffe98 100644 --- a/converter/ppm/ppmtompeg/headers/all.h +++ b/converter/ppm/ppmtompeg/headers/all.h @@ -1,8 +1,8 @@ /*===========================================================================* - * all.h * - * * - * stuff included from ALL source files * - * * + * all.h * + * * + * stuff included from ALL source files * + * * *===========================================================================*/ /* @@ -26,7 +26,7 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /u/smoot/md/mpeg_encode/headers/RCS/all.h,v 1.9 1995/06/05 21:11:06 smoot Exp $ * $Log: all.h,v $ * Revision 1.9 1995/06/05 21:11:06 smoot diff --git a/converter/ppm/ppmtompeg/headers/bitio.h b/converter/ppm/ppmtompeg/headers/bitio.h index 931bcdd9..c74116f5 100644 --- a/converter/ppm/ppmtompeg/headers/bitio.h +++ b/converter/ppm/ppmtompeg/headers/bitio.h @@ -1,8 +1,8 @@ /*===========================================================================* - * bitio.h * - * * - * bitwise input/output * - * * + * bitio.h * + * * + * bitwise input/output * + * * *===========================================================================*/ /* @@ -26,7 +26,7 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /n/charlie-brown/project/mm/mpeg/mpeg_dist/mpeg_encode/headers/RCS/bitio.h,v 1.8 1995/01/19 23:54:37 eyhung Exp $ * $Log: bitio.h,v $ * Revision 1.8 1995/01/19 23:54:37 eyhung @@ -70,9 +70,9 @@ *===========*/ #define WORDS_PER_BUCKET 128 -#define MAXBITS_PER_BUCKET (WORDS_PER_BUCKET * 32) -#define MAX_BUCKETS 128 -#define MAX_BITS MAX_BUCKETS*MAXBITS_PER_BUCKET +#define MAXBITS_PER_BUCKET (WORDS_PER_BUCKET * 32) +#define MAX_BUCKETS 128 +#define MAX_BITS MAX_BUCKETS*MAXBITS_PER_BUCKET /*=======================* @@ -87,8 +87,8 @@ typedef struct bitBucket { typedef struct _BitBucket { int totalbits; - int cumulativeBits; - int bitsWritten; + int cumulativeBits; + int bitsWritten; FILE *filePtr; ActualBucket *firstPtr; ActualBucket *lastPtr; @@ -99,20 +99,20 @@ typedef struct _BitBucket { * MACROS * *========*/ -#define SET_ITH_BIT(bits, i) (bits |= (1 << (i))) -#define GET_ITH_BIT(bits, i) (bits & (1 << (i))) +#define SET_ITH_BIT(bits, i) (bits |= (1 << (i))) +#define GET_ITH_BIT(bits, i) (bits & (1 << (i))) /*===============================* * EXTERNAL PROCEDURE prototypes * *===============================*/ -void +void Bitio_Free(BitBucket * const bbPtr); void -Bitio_Write(BitBucket * const bbPtr, - uint32 const bits, +Bitio_Write(BitBucket * const bbPtr, + uint32 const bits, int const nbits); void @@ -131,7 +131,7 @@ void Bitio_Close(BitBucket * const bbPtr); void -Bitio_WriteToSocket(BitBucket * const bbPtr, +Bitio_WriteToSocket(BitBucket * const bbPtr, int const socket); #endif /* BIT_IO_INCLUDED */ diff --git a/converter/ppm/ppmtompeg/headers/byteorder.h b/converter/ppm/ppmtompeg/headers/byteorder.h index e2d8030c..9376b576 100644 --- a/converter/ppm/ppmtompeg/headers/byteorder.h +++ b/converter/ppm/ppmtompeg/headers/byteorder.h @@ -1,8 +1,8 @@ /*===========================================================================* - * byteorder.h * - * * - * stuff to handle different byte order * - * * + * byteorder.h * + * * + * stuff to handle different byte order * + * * *===========================================================================*/ /* @@ -26,7 +26,7 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /u/smoot/md/mpeg_encode/headers/RCS/byteorder.h,v 1.3 1995/01/19 23:54:39 eyhung Exp $ * $Log: byteorder.h,v $ * Revision 1.3 1995/01/19 23:54:39 eyhung @@ -60,17 +60,17 @@ * constant; thus, this is not for general use, but works with bitio.c */ #define htonl(x) \ - ((((unsigned char *)(&x))[0] << 24) | \ - (((unsigned char *)(&x))[1] << 16) | \ - (((unsigned char *)(&x))[2] << 8) | \ + ((((unsigned char *)(&x))[0] << 24) | \ + (((unsigned char *)(&x))[1] << 16) | \ + (((unsigned char *)(&x))[2] << 8) | \ (((unsigned char *)(&x))[3])) #define ntohl(x) htonl(x) #define htons(x) \ - ((((unsigned char *)(&x))[0] << 8) | \ + ((((unsigned char *)(&x))[0] << 8) | \ ((unsigned char *)(&x))[1]) #define ntohs(x) htons(x) #else - /* let in.h handle it, if possible */ + /* let in.h handle it, if possible */ #include <sys/types.h> #if !defined(WIN32) || defined(__CYGWIN__) #include <netinet/in.h> diff --git a/converter/ppm/ppmtompeg/headers/combine.h b/converter/ppm/ppmtompeg/headers/combine.h index e28c6dee..c99d9dbe 100644 --- a/converter/ppm/ppmtompeg/headers/combine.h +++ b/converter/ppm/ppmtompeg/headers/combine.h @@ -2,7 +2,7 @@ struct inputSource; void GOPsToMPEG(struct inputSource * const inputSourceP, - const char * const outputFileName, + const char * const outputFileName, FILE * const outputFilePtr); typedef void (*fileAcquisitionFn)(void * const handle, @@ -14,7 +14,7 @@ typedef void (*fileDispositionFn)(void * const handle, unsigned int const frameNumber); void -FramesToMPEG(FILE * const outputFile, +FramesToMPEG(FILE * const outputFile, void * const inputHandle, fileAcquisitionFn acquireInputFile, fileDispositionFn disposeInputFile); diff --git a/converter/ppm/ppmtompeg/headers/dct.h b/converter/ppm/ppmtompeg/headers/dct.h index 3b824cf0..3c4780cd 100644 --- a/converter/ppm/ppmtompeg/headers/dct.h +++ b/converter/ppm/ppmtompeg/headers/dct.h @@ -1,8 +1,8 @@ /*===========================================================================* - * dct.h * - * * - * DCT procedures * - * * + * dct.h * + * * + * DCT procedures * + * * *===========================================================================*/ /* @@ -43,7 +43,7 @@ typedef DCTELEM DCTBLOCK[DCTSIZE2]; typedef DCTELEM DCTBLOCK_2D[DCTSIZE][DCTSIZE]; -/* +/* * from mfwddct.c: */ void init_fdct (void); diff --git a/converter/ppm/ppmtompeg/headers/frame.h b/converter/ppm/ppmtompeg/headers/frame.h index e1f587a2..993359bc 100644 --- a/converter/ppm/ppmtompeg/headers/frame.h +++ b/converter/ppm/ppmtompeg/headers/frame.h @@ -1,8 +1,8 @@ /*===========================================================================* - * frame.h * - * * - * basic frames procedures * - * * + * frame.h * + * * + * basic frames procedures * + * * *===========================================================================*/ /* @@ -40,9 +40,9 @@ /*===========* * CONSTANTS * *===========*/ -#define TYPE_IFRAME 2 -#define TYPE_PFRAME 3 -#define TYPE_BFRAME 4 +#define TYPE_IFRAME 2 +#define TYPE_PFRAME 3 +#define TYPE_BFRAME 4 /*=======================* @@ -54,11 +54,11 @@ typedef struct mpegFrame { char inputFileName[256]; int id; /* the frame number -- starts at 0 */ bool inUse; - /* this frame is currently being used (if not, any data here can be + /* this frame is currently being used (if not, any data here can be thrashed) */ - /* + /* * now, the YCrCb data. All pixel information is stored in unsigned * 8-bit pieces. We separate y, cr, and cb because cr and cb are * subsampled by a factor of 2. @@ -68,16 +68,16 @@ typedef struct mpegFrame { uint8_t **orig_y, **orig_cr, **orig_cb; /* now, the decoded data -- relevant only if - * referenceFrame == DECODED_FRAME + * referenceFrame == DECODED_FRAME * - * if decoded_y is NULL, then decoded_cr, decoded_cb are undefined + * if decoded_y is NULL, then decoded_cr, decoded_cb are undefined */ uint8_t **decoded_y, **decoded_cr, **decoded_cb; /* reference data */ uint8_t **ref_y, **ref_cr, **ref_cb; - /* + /* * these are the Blocks which will ultimately compose MacroBlocks. * A Block is in a format that mp_fwddct() can crunch. * if y_blocks is NULL, then cr_blocks, cb_blocks are undefined @@ -92,8 +92,8 @@ typedef struct mpegFrame { bool halfComputed; /* TRUE iff half-pixels already computed */ struct mpegFrame *next; /* points to the next B-frame to be encoded, if - * stdin is used as the input. - */ + * stdin is used as the input. + */ } MpegFrame; diff --git a/converter/ppm/ppmtompeg/headers/frames.h b/converter/ppm/ppmtompeg/headers/frames.h index 2ec11d69..88638690 100644 --- a/converter/ppm/ppmtompeg/headers/frames.h +++ b/converter/ppm/ppmtompeg/headers/frames.h @@ -1,8 +1,8 @@ /*===========================================================================* - * frames.h - * - * stuff dealing with frames - * + * frames.h + * + * stuff dealing with frames + * *===========================================================================*/ #ifndef FRAMES_INCLUDED @@ -72,7 +72,7 @@ typedef struct FrameTableStruct { int number; int bFrameNumber; /* actual frame number, if a b-frame */ - + } FrameTable; @@ -125,6 +125,8 @@ MotionToFrameCoord(int const by, *xP = bx * DCTSIZE + mx; } + + #define COORD_IN_FRAME(fy,fx, type) \ ((type == LUM_BLOCK) ? \ ((fy >= 0) && (fx >= 0) && (fy < Fsize_y) && (fx < Fsize_x)) : \ @@ -175,6 +177,7 @@ encodeMotionVector(int const x, } + #define DoQuant(bit, src, dest) \ if (pattern & bit) { \ switch (Mpost_QuantZigBlock(src, dest, QScale, FALSE)) { \ @@ -234,13 +237,13 @@ float BFrameTotalTime(void); void -ShowPFrameSummary(unsigned int const inputFrameBits, - unsigned int const totalBits, +ShowPFrameSummary(unsigned int const inputFrameBits, + unsigned int const totalBits, FILE * const fpointer); void -ShowBFrameSummary(unsigned int const inputFrameBits, - unsigned int const totalBits, +ShowBFrameSummary(unsigned int const inputFrameBits, + unsigned int const totalBits, FILE * const fpointer); /*==================* @@ -291,7 +294,7 @@ extern int TIME_RATE; * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /n/picasso/project/mpeg/mpeg_dist/mpeg_encode/headers/RCS/frames.h,v 1.13 1995/08/15 23:43:04 smoot Exp $ * $Log: frames.h,v $ * Revision 1.13 1995/08/15 23:43:04 smoot diff --git a/converter/ppm/ppmtompeg/headers/frametype.h b/converter/ppm/ppmtompeg/headers/frametype.h index 33b604e6..3e319c40 100644 --- a/converter/ppm/ppmtompeg/headers/frametype.h +++ b/converter/ppm/ppmtompeg/headers/frametype.h @@ -7,7 +7,7 @@ FType_Type(unsigned int const frameNum); unsigned int FType_FutureRef(unsigned int const currFrameNum); -int FType_PastRef (int currFrameNum); +int FType_PastRef (int currFrameNum); void SetFramePattern(const char * const pattern); diff --git a/converter/ppm/ppmtompeg/headers/fsize.h b/converter/ppm/ppmtompeg/headers/fsize.h index 6a1c910e..5f57e4f2 100644 --- a/converter/ppm/ppmtompeg/headers/fsize.h +++ b/converter/ppm/ppmtompeg/headers/fsize.h @@ -1,8 +1,8 @@ /*===========================================================================* - * fsize.h * - * * - * procedures to deal with frame size * - * * + * fsize.h * + * * + * procedures to deal with frame size * + * * *===========================================================================*/ /* diff --git a/converter/ppm/ppmtompeg/headers/general.h b/converter/ppm/ppmtompeg/headers/general.h index 59c33c73..45d3db17 100644 --- a/converter/ppm/ppmtompeg/headers/general.h +++ b/converter/ppm/ppmtompeg/headers/general.h @@ -1,8 +1,8 @@ /*===========================================================================* - * general.h * - * * - * very general stuff * - * * + * general.h * + * * + * very general stuff * + * * *===========================================================================*/ /* @@ -26,7 +26,7 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /n/picasso/project/mpeg/mpeg_dist/mpeg_encode/headers/RCS/general.h,v 1.7 1995/08/04 23:34:13 smoot Exp $ * $Log: general.h,v $ * Revision 1.7 1995/08/04 23:34:13 smoot @@ -62,7 +62,7 @@ * if your /usr/include headers do not have these, then pass -DMISSING_PROTOS * to your compiler * - */ + */ #ifdef MISSING_PROTOS int fprintf(); int fwrite(); @@ -114,7 +114,7 @@ int pclose(); typedef int boolean; /* In the following, we need the "signed" in order to make these typedefs - match those in AIX system header files. Otherwise, compile fails on + match those in AIX system header files. Otherwise, compile fails on AIX. 2000.09.11. */ typedef unsigned char uint8; @@ -139,10 +139,10 @@ typedef signed short int16; */ /* LONG_32 should only be defined iff - * 1) long's are 32 bits and - * 2) int's are not + * 1) long's are 32 bits and + * 2) int's are not */ -#ifdef LONG_32 +#ifdef LONG_32 typedef unsigned long uint32; typedef long int32; #else diff --git a/converter/ppm/ppmtompeg/headers/huff.h b/converter/ppm/ppmtompeg/headers/huff.h index a6379248..8b46a8b8 100644 --- a/converter/ppm/ppmtompeg/headers/huff.h +++ b/converter/ppm/ppmtompeg/headers/huff.h @@ -19,18 +19,18 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /n/charlie-brown/project/mm/mpeg/mpeg_dist/mpeg_encode/headers/RCS/huff.h,v 1.3 1995/01/19 23:54:51 eyhung Exp $ */ -/* +/* * THIS FILE WAS ORIGINALLY MACHINE GENERATED */ #include "general.h" -#define HUFF_MAXRUN 32 -#define HUFF_MAXLEVEL 41 +#define HUFF_MAXRUN 32 +#define HUFF_MAXLEVEL 41 extern int huff_maxlevel[]; extern uint32 *huff_table[]; diff --git a/converter/ppm/ppmtompeg/headers/iframe.h b/converter/ppm/ppmtompeg/headers/iframe.h index c4f77c74..fb8d508c 100644 --- a/converter/ppm/ppmtompeg/headers/iframe.h +++ b/converter/ppm/ppmtompeg/headers/iframe.h @@ -19,7 +19,7 @@ int GetIQScale(void); void -GenIFrame(BitBucket * const bb, +GenIFrame(BitBucket * const bb, MpegFrame * const current); void @@ -30,8 +30,8 @@ IFrameTotalTime(void); void -ShowIFrameSummary(unsigned int const inputFrameBits, - unsigned int const totalBits, +ShowIFrameSummary(unsigned int const inputFrameBits, + unsigned int const totalBits, FILE * const fpointer); void diff --git a/converter/ppm/ppmtompeg/headers/mheaders.h b/converter/ppm/ppmtompeg/headers/mheaders.h index edd9552d..43df26a5 100644 --- a/converter/ppm/ppmtompeg/headers/mheaders.h +++ b/converter/ppm/ppmtompeg/headers/mheaders.h @@ -1,8 +1,8 @@ /*===========================================================================* - * mheaders.h * - * * - * MPEG headers * - * * + * mheaders.h * + * * + * MPEG headers * + * * *===========================================================================*/ /* @@ -26,7 +26,7 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /n/picasso/project/mm/mpeg/mpeg_dist/mpeg_encode/headers/RCS/mheaders.h,v 1.4 1995/03/27 19:29:24 smoot Exp $ * $Log: mheaders.h,v $ * Revision 1.4 1995/03/27 19:29:24 smoot @@ -61,40 +61,40 @@ * EXTERNAL PROCEDURE prototypes * *===============================*/ -void SetGOPStartTime (int index); +void SetGOPStartTime (int index); void -Mhead_GenSequenceHeader(BitBucket * const bbPtr, - uint32 const hsize, +Mhead_GenSequenceHeader(BitBucket * const bbPtr, + uint32 const hsize, uint32 const vsize, - int32 const pratio, - int32 const pict_rate, + int32 const pratio, + int32 const pict_rate, int32 const bit_rate_arg, - int32 const buf_size_arg, - int32 const c_param_flag_arg, - const int32 * const iq_matrix, + int32 const buf_size_arg, + int32 const c_param_flag_arg, + const int32 * const iq_matrix, const int32 * const niq_matrix, - uint8 * const ext_data, - int32 const ext_data_size, + uint8 * const ext_data, + int32 const ext_data_size, uint8 * const user_data, int32 const user_data_size); -void Mhead_GenSequenceEnder (BitBucket *bbPtr); -void Mhead_GenGOPHeader (BitBucket *bbPtr, - int32 drop_frame_flag, +void Mhead_GenSequenceEnder (BitBucket *bbPtr); +void Mhead_GenGOPHeader (BitBucket *bbPtr, + int32 drop_frame_flag, int32 tc_hrs, int32 tc_min, int32 tc_sec, int32 tc_pict, int32 closed_gop, int32 broken_link, uint8 *ext_data, int32 ext_data_size, uint8 *user_data, int32 user_data_size); -void Mhead_GenPictureHeader (BitBucket *bbPtr, int frameType, - int pictCount, int f_code); -void Mhead_GenSliceHeader (BitBucket *bbPtr, uint32 slicenum, - uint32 qscale, uint8 *extra_info, - uint32 extra_info_size); -void Mhead_GenSliceEnder (BitBucket *bbPtr); -void Mhead_GenMBHeader (BitBucket *bbPtr, - uint32 pict_code_type, uint32 addr_incr, +void Mhead_GenPictureHeader (BitBucket *bbPtr, int frameType, + int pictCount, int f_code); +void Mhead_GenSliceHeader (BitBucket *bbPtr, uint32 slicenum, + uint32 qscale, uint8 *extra_info, + uint32 extra_info_size); +void Mhead_GenSliceEnder (BitBucket *bbPtr); +void Mhead_GenMBHeader (BitBucket *bbPtr, + uint32 pict_code_type, uint32 addr_incr, uint32 q_scale, uint32 forw_f_code, uint32 back_f_code, uint32 horiz_forw_r, uint32 vert_forw_r, diff --git a/converter/ppm/ppmtompeg/headers/motion_search.h b/converter/ppm/ppmtompeg/headers/motion_search.h index d00509c4..0cb5370b 100644 --- a/converter/ppm/ppmtompeg/headers/motion_search.h +++ b/converter/ppm/ppmtompeg/headers/motion_search.h @@ -40,7 +40,7 @@ if ( stepSize == 2 ) { \ rightMY++; \ rightMX++; \ } - + #define VALID_MOTION(m) \ (((m).y >= leftMY) && ((m).y < rightMY) && \ ((m).x >= leftMX) && ((m).x < rightMX) ) @@ -50,9 +50,9 @@ if ( stepSize == 2 ) { \ * EXTERNAL PROCEDURE prototypes * *===============================*/ -void +void SetPSearchAlg(const char * const alg); -void +void SetBSearchAlg(const char * const alg); const char * BSearchName(void); @@ -94,9 +94,9 @@ PTwoLevelSearch(const LumBlock * const currentBlockP, int const searchRange); void PMotionSearch(const LumBlock * const currentBlockP, - MpegFrame * const prev, + MpegFrame * const prev, int const by, - int const bx, + int const bx, vector * const motionP); void @@ -129,7 +129,7 @@ extern int psearchAlg; * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /n/picasso/project/mpeg/mpeg_dist/mpeg_encode/headers/RCS/search.h,v 1.6 1995/08/15 23:43:36 smoot Exp $ * $Log: search.h,v $ * Revision 1.6 1995/08/15 23:43:36 smoot diff --git a/converter/ppm/ppmtompeg/headers/mpeg.h b/converter/ppm/ppmtompeg/headers/mpeg.h index fbfaaf2c..d258cde4 100644 --- a/converter/ppm/ppmtompeg/headers/mpeg.h +++ b/converter/ppm/ppmtompeg/headers/mpeg.h @@ -1,8 +1,8 @@ /*===========================================================================* - * mpeg.h * - * * - * no comment * - * * + * mpeg.h * + * * + * no comment * + * * *===========================================================================*/ /* @@ -47,13 +47,13 @@ enum frameContext {CONTEXT_WHOLESTREAM, CONTEXT_GOP, CONTEXT_JUSTFRAMES}; void GenMPEGStream(struct inputSource * const inputSourceP, - enum frameContext const context, - unsigned int const frameStart, - unsigned int const frameEnd, - int32 const qtable[], - int32 const niqtable[], + enum frameContext const context, + unsigned int const frameStart, + unsigned int const frameEnd, + int32 const qtable[], + int32 const niqtable[], bool const childProcess, - FILE * const ofp, + FILE * const ofp, const char * const outputFileName, bool const wantVbvUnderflowWarning, bool const wantVbvOverflowWarning, @@ -61,38 +61,38 @@ GenMPEGStream(struct inputSource * const inputSourceP, unsigned int * const totalBitsP); void -PrintStartStats(time_t const startTime, +PrintStartStats(time_t const startTime, bool const specificFrames, - unsigned int const firstFrame, + unsigned int const firstFrame, unsigned int const lastFrame, struct inputSource * const inputSourceP); void PrintEndStats(time_t const startTime, time_t const endTime, - unsigned int const inputFrameBits, + unsigned int const inputFrameBits, unsigned int const totalBits); void -ComputeGOPFrames(int const whichGOP, - unsigned int * const firstFrameP, - unsigned int * const lastFrameP, +ComputeGOPFrames(int const whichGOP, + unsigned int * const firstFrameP, + unsigned int * const lastFrameP, unsigned int const numFrames); -extern void IncrementTCTime (void); +extern void IncrementTCTime (void); void SetReferenceFrameType(const char * const type); boolean NonLocalRefFrame(int const id); void -ReadDecodedRefFrame(MpegFrame * const frameP, +ReadDecodedRefFrame(MpegFrame * const frameP, unsigned int const frameNumber); void SetBitRateFileName(const char * const fileName); -extern void SetFrameRate (void); +extern void SetFrameRate (void); /*==================* @@ -100,11 +100,11 @@ extern void SetFrameRate (void); *==================*/ extern MpegFrame *frameMemory[3]; -extern int32 tc_hrs, tc_min, tc_sec, tc_pict, tc_extra; -extern int totalFramesSent; -extern int gopSize; -extern char *framePattern; -extern int framePatternLen; +extern int32 tc_hrs, tc_min, tc_sec, tc_pict, tc_extra; +extern int totalFramesSent; +extern int gopSize; +extern char *framePattern; +extern int framePatternLen; extern int32 qtable[]; extern int32 niqtable[]; extern int32 *customQtable; diff --git a/converter/ppm/ppmtompeg/headers/mproto.h b/converter/ppm/ppmtompeg/headers/mproto.h index 5b003b2e..22b3ba2b 100644 --- a/converter/ppm/ppmtompeg/headers/mproto.h +++ b/converter/ppm/ppmtompeg/headers/mproto.h @@ -1,8 +1,8 @@ /*===========================================================================* - * mproto.h * - * * - * basically a lot of miscellaneous prototypes * - * * + * mproto.h * + * * + * basically a lot of miscellaneous prototypes * + * * *===========================================================================*/ /* @@ -26,7 +26,7 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /n/picasso/project/mm/mpeg/mpeg_dist/mpeg_encode/headers/RCS/mproto.h,v 1.12 1995/03/29 20:14:29 smoot Exp $ * $Log: mproto.h,v $ * Revision 1.12 1995/03/29 20:14:29 smoot @@ -82,7 +82,7 @@ typedef DCTELEM DCTBLOCK[DCTSIZE2]; * EXTERNAL PROCEDURE prototypes * *===============================*/ -/* +/* * from mbasic.c: */ void mp_reset (void); @@ -90,13 +90,13 @@ void mp_free (MpegFrame *mf); MpegFrame *mp_new (int fnumber, char type, MpegFrame *oldFrame); void mp_ycc_calc (MpegFrame *mf); void mp_dct_blocks (MpegFrame *mf); -void AllocDecoded (MpegFrame *frame); +void AllocDecoded (MpegFrame *frame); -/* +/* * from moutput.c: */ boolean mp_quant_zig_block (Block in, FlatBlock out, int qscale, int iblock); -void UnQuantZig (FlatBlock in, Block out, int qscale, boolean iblock); +void UnQuantZig (FlatBlock in, Block out, int qscale, boolean iblock); void mp_rle_huff_block (FlatBlock in, BitBucket *out); void mp_rle_huff_pblock (FlatBlock in, BitBucket *out); void mp_create_blocks (MpegFrame *mf); @@ -104,12 +104,12 @@ void mp_create_blocks (MpegFrame *mf); -void ReadEYUV (MpegFrame * mf, FILE *fpointer, int width, - int height); -boolean ReadPPM (MpegFrame *mf, FILE *fpointer); +void ReadEYUV (MpegFrame * mf, FILE *fpointer, int width, + int height); +boolean ReadPPM (MpegFrame *mf, FILE *fpointer); void PPMtoYCC (MpegFrame * mf); -void ComputeHalfPixelData (MpegFrame *frame); +void ComputeHalfPixelData (MpegFrame *frame); void mp_validate_size (int *x, int *y); void AllocYCC (MpegFrame * mf); diff --git a/converter/ppm/ppmtompeg/headers/mtypes.h b/converter/ppm/ppmtompeg/headers/mtypes.h index a44ce680..bf56a110 100644 --- a/converter/ppm/ppmtompeg/headers/mtypes.h +++ b/converter/ppm/ppmtompeg/headers/mtypes.h @@ -1,7 +1,7 @@ /*===========================================================================* * mtypes.h * - * MPEG data types + * MPEG data types * *===========================================================================*/ @@ -18,12 +18,12 @@ * CONSTANTS * *===========*/ -#define TYPE_BOGUS 0 /* for the header of the circular list */ -#define TYPE_VIRGIN 1 +#define TYPE_BOGUS 0 /* for the header of the circular list */ +#define TYPE_VIRGIN 1 -#define STATUS_EMPTY 0 -#define STATUS_LOADED 1 -#define STATUS_WRITTEN 2 +#define STATUS_EMPTY 0 +#define STATUS_LOADED 1 +#define STATUS_WRITTEN 2 typedef struct vector { @@ -40,15 +40,15 @@ typedef struct motion { * TYPE DEFINITIONS * *==================*/ -/* +/* * your basic Block type */ typedef int16_t Block[DCTSIZE][DCTSIZE]; typedef int16_t FlatBlock[DCTSIZE_SQ]; -typedef struct { +typedef struct { int32_t l[2*DCTSIZE][2*DCTSIZE]; } LumBlock; -typedef int32_t ChromBlock[DCTSIZE][DCTSIZE]; +typedef int32_t ChromBlock[DCTSIZE][DCTSIZE]; /*========* * MACROS * diff --git a/converter/ppm/ppmtompeg/headers/opts.h b/converter/ppm/ppmtompeg/headers/opts.h index 1756334e..887c9723 100644 --- a/converter/ppm/ppmtompeg/headers/opts.h +++ b/converter/ppm/ppmtompeg/headers/opts.h @@ -23,7 +23,7 @@ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. */ -/* +/* * $Header: /n/picasso/project/mpeg/mpeg_dist/mpeg_encode/headers/RCS/opts.h,v 1.3 1995/08/15 23:43:43 smoot Exp $ * $Log: opts.h,v $ * Revision 1.3 1995/08/15 23:43:43 smoot @@ -109,10 +109,10 @@ extern int LaplaceNum, LaplaceCnum; extern boolean BSkipBlocks; /* Procedures Prototypes */ -int GetIQScale (void); -int GetPQScale (void); -int GetBQScale (void); -void Tune_Init (void); +int GetIQScale (void); +int GetPQScale (void); +int GetBQScale (void); +void Tune_Init (void); int CalcRLEHuffLength (FlatBlock in); void ParseTuneParam(const char * const charPtr); int mse (Block blk1, Block blk2); diff --git a/converter/ppm/ppmtompeg/headers/parallel.h b/converter/ppm/ppmtompeg/headers/parallel.h index 0a31fac2..b5407cea 100644 --- a/converter/ppm/ppmtompeg/headers/parallel.h +++ b/converter/ppm/ppmtompeg/headers/parallel.h @@ -1,8 +1,8 @@ /*===========================================================================* - * parallel.h - * - * parallel encoding - * + * parallel.h + * + * parallel encoding + * *===========================================================================*/ /* @@ -42,33 +42,33 @@ struct inputSource; void MasterServer(struct inputSource * const inputSourceP, - const char * const paramFileName, + const char * const paramFileName, const char * const outputFileName); void -NotifyMasterDone(const char * const hostName, - int const portNum, - int const machineNumber, - unsigned int const seconds, +NotifyMasterDone(const char * const hostName, + int const portNum, + int const machineNumber, + unsigned int const seconds, boolean * const moreWorkToDoP, int * const frameStartP, int * const frameEndP); void IoServer(struct inputSource * const inputSourceP, - const char * const parallelHostName, + const char * const parallelHostName, int const portNum); void -CombineServer(int const numInputFiles, - const char * const masterHostName, +CombineServer(int const numInputFiles, + const char * const masterHostName, int const masterPortNum, const char* const outputFileName); void -DecodeServer(int const numInputFiles, - const char * const decodeFileName, - const char * const parallelHostName, +DecodeServer(int const numInputFiles, + const char * const decodeFileName, + const char * const parallelHostName, int const portNum); void @@ -91,20 +91,20 @@ SetIOConvert(boolean const separate); void SetRemoteShell(const char * const shell); -void +void NotifyDecodeServerReady(int const id); -void +void WaitForDecodedFrame(int id); -void +void SendDecodedFrame(MpegFrame * const frameP); -void +void GetRemoteDecodedRefFrame(MpegFrame * const frameP, int const frameNumber); -void +void SetParallelPerfect(boolean val); diff --git a/converter/ppm/ppmtompeg/headers/param.h b/converter/ppm/ppmtompeg/headers/param.h index 46a544b3..103f03b5 100644 --- a/converter/ppm/ppmtompeg/headers/param.h +++ b/converter/ppm/ppmtompeg/headers/param.h @@ -33,7 +33,7 @@ struct params { void -ReadParamFile(const char * const fileName, +ReadParamFile(const char * const fileName, majorProgramFunction const function, struct params * const paramP); diff --git a/converter/ppm/ppmtompeg/headers/postdct.h b/converter/ppm/ppmtompeg/headers/postdct.h index 3f3b51fe..e426f05a 100644 --- a/converter/ppm/ppmtompeg/headers/postdct.h +++ b/converter/ppm/ppmtompeg/headers/postdct.h @@ -1,8 +1,8 @@ /*===========================================================================* - * postdct.h * - * * - * MPEG post-DCT processing * - * * + * postdct.h * + * * + * MPEG post-DCT processing * + * * *===========================================================================*/ /* @@ -30,10 +30,10 @@ int Mpost_QuantZigBlock (Block in, FlatBlock out, int qscale, int iblock); -void Mpost_UnQuantZigBlock (FlatBlock in, Block out, +void Mpost_UnQuantZigBlock (FlatBlock in, Block out, int qscale, boolean iblock); -void Mpost_RLEHuffIBlock (FlatBlock in, BitBucket *out); -void Mpost_RLEHuffPBlock (FlatBlock in, BitBucket *out); +void Mpost_RLEHuffIBlock (FlatBlock in, BitBucket *out); +void Mpost_RLEHuffPBlock (FlatBlock in, BitBucket *out); #define MPOST_ZERO 0 #define MPOST_NON_ZERO 1 diff --git a/converter/ppm/ppmtompeg/headers/psocket.h b/converter/ppm/ppmtompeg/headers/psocket.h index 214f5dce..26e11db2 100644 --- a/converter/ppm/ppmtompeg/headers/psocket.h +++ b/converter/ppm/ppmtompeg/headers/psocket.h @@ -22,8 +22,8 @@ WriteBytes(int const fd, unsigned int const nbyte); void -ConnectToSocket(const char * const machineName, - int const portNum, +ConnectToSocket(const char * const machineName, + int const portNum, struct hostent ** const hostEnt, int * const socketFdP, const char ** const errorP); diff --git a/converter/ppm/ppmtompeg/headers/rate.h b/converter/ppm/ppmtompeg/headers/rate.h index a5f5076f..d11a4b77 100644 --- a/converter/ppm/ppmtompeg/headers/rate.h +++ b/converter/ppm/ppmtompeg/headers/rate.h @@ -1,22 +1,22 @@ /*===========================================================================* - * rate.h * - * * - * Procedures concerned with rate control - * * - * EXPORTED PROCEDURES: * + * rate.h * + * * + * Procedures concerned with rate control + * * + * EXPORTED PROCEDURES: * * getRateMode() * setBitRate() * getBitRate() * setBufferSize() * getBufferSize() - * initRateControl() - * targetRateControl() - * updateRateControl() - * MB_RateOut() - * * + * initRateControl() + * targetRateControl() + * updateRateControl() + * MB_RateOut() + * * *===========================================================================*/ -/* COPYRIGHT INFO HERE */ +/* COPYRIGHT INFO HERE */ #define VARIABLE_RATE 0 #define FIXED_RATE 1 @@ -41,7 +41,7 @@ extern int rc_quantOverride; * * initRateControl * - * initialize the allocation parameters. + * initialize the allocation parameters. *===========================================================================*/ int initRateControl(bool const wantUnderflowWarning, @@ -64,7 +64,7 @@ targetRateControl(MpegFrame * const frameP); * MB_RateOut * * Prints out sampling of MB rate control data. Every "nth" block - * stats are printed, with "n" controlled by global RC_MB_SAMPLE_RATE + * stats are printed, with "n" controlled by global RC_MB_SAMPLE_RATE * * RETURNS: nothing *===========================================================================*/ @@ -137,7 +137,7 @@ extern void SetRateControl (char *charPtr); * * RETURNS: nothing *===========================================================================*/ -extern void +extern void setBufferSize(const char * const charPtr); @@ -164,7 +164,7 @@ extern int getBufferSize (void); * * SIDE EFFECTS: global variables *===========================================================================*/ -extern void +extern void setBitRate(const char * const charPtr); diff --git a/converter/ppm/ppmtompeg/headers/readframe.h b/converter/ppm/ppmtompeg/headers/readframe.h index 3a6876b1..3c203e8a 100644 --- a/converter/ppm/ppmtompeg/headers/readframe.h +++ b/converter/ppm/ppmtompeg/headers/readframe.h @@ -1,8 +1,8 @@ /*===========================================================================* - * readframe.h * - * * - * stuff dealing with reading frames * - * * + * readframe.h * + * * + * stuff dealing with reading frames * + * * *===========================================================================*/ /* @@ -32,15 +32,15 @@ * CONSTANTS * *===========*/ -#define PPM_FILE_TYPE 0 -#define YUV_FILE_TYPE 2 -#define ANY_FILE_TYPE 3 -#define BASE_FILE_TYPE 4 -#define PNM_FILE_TYPE 5 -#define SUB4_FILE_TYPE 6 -#define JPEG_FILE_TYPE 7 +#define PPM_FILE_TYPE 0 +#define YUV_FILE_TYPE 2 +#define ANY_FILE_TYPE 3 +#define BASE_FILE_TYPE 4 +#define PNM_FILE_TYPE 5 +#define SUB4_FILE_TYPE 6 +#define JPEG_FILE_TYPE 7 #define JMOVIE_FILE_TYPE 8 -#define Y_FILE_TYPE 9 +#define Y_FILE_TYPE 9 struct inputSource; @@ -52,7 +52,7 @@ ReadFrameFile(MpegFrame * const frameP, bool * const eofP); void -ReadFrame(MpegFrame * const frameP, +ReadFrame(MpegFrame * const frameP, struct inputSource * const inputSourceP, unsigned int const frameNumber, const char * const conversion, @@ -62,8 +62,8 @@ FILE * ReadIOConvert(struct inputSource * const inputSourceP, unsigned int const frameNumber); -extern void SetFileType(const char * const conversion); -extern void SetFileFormat(const char * const format); -extern void SetResize(bool const set); +extern void SetFileType(const char * const conversion); +extern void SetFileFormat(const char * const format); +extern void SetResize(bool const set); -extern int baseFormat; +extern int baseFormat; diff --git a/converter/ppm/ppmtompeg/headers/rgbtoycc.h b/converter/ppm/ppmtompeg/headers/rgbtoycc.h index 52159963..d7aa017c 100644 --- a/converter/ppm/ppmtompeg/headers/rgbtoycc.h +++ b/converter/ppm/ppmtompeg/headers/rgbtoycc.h @@ -1,8 +1,8 @@ /*===========================================================================* - * rgbtoycc.h * - * * - * Procedures to convert from RGB space to YUV space * - * * + * rgbtoycc.h * + * * + * Procedures to convert from RGB space to YUV space * + * * *===========================================================================*/ /* diff --git a/converter/ppm/ppmtompeg/headers/specifics.h b/converter/ppm/ppmtompeg/headers/specifics.h index 4f5c7074..552193d8 100644 --- a/converter/ppm/ppmtompeg/headers/specifics.h +++ b/converter/ppm/ppmtompeg/headers/specifics.h @@ -1,5 +1,3 @@ - - /*===========* * TYPES * *===========*/ @@ -19,7 +17,7 @@ typedef struct detail_def { } Slice_Specifics; typedef struct fsl_def { - int framenum; + int framenum; int frametype; char qscale; Slice_Specifics *slc; @@ -28,8 +26,8 @@ typedef struct fsl_def { } FrameSpecList; -void Specifics_Init (void); +void Specifics_Init (void); int SpecLookup (int fn, int typ, int num, - BlockMV **info, int start_qs); + BlockMV **info, int start_qs); int SpecTypeLookup (int fn); |