diff options
author | Mike Melanson <mike@multimedia.cx> | 2004-03-14 04:04:08 +0000 |
---|---|---|
committer | Mike Melanson <mike@multimedia.cx> | 2004-03-14 04:04:08 +0000 |
commit | 3a278992bdd8138eeefc9df06878703480f27b1b (patch) | |
tree | 6891b1a6c885f6c5dd68843695739c53c8741c9b /libavformat | |
parent | 9eef2b77b29189606148e1fdf5d6c8d7b52b08b0 (diff) | |
download | ffmpeg-streaming-3a278992bdd8138eeefc9df06878703480f27b1b.zip ffmpeg-streaming-3a278992bdd8138eeefc9df06878703480f27b1b.tar.gz |
remove numerous definitions of BE_*/LE_* macros; convert FOURCC_TAG ->
MKTAG/MKBETAG
Originally committed as revision 2886 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/4xm.c | 45 | ||||
-rw-r--r-- | libavformat/flic.c | 6 | ||||
-rw-r--r-- | libavformat/idcin.c | 6 | ||||
-rw-r--r-- | libavformat/idroq.c | 6 | ||||
-rw-r--r-- | libavformat/ipmovie.c | 7 | ||||
-rw-r--r-- | libavformat/psxstr.c | 16 | ||||
-rw-r--r-- | libavformat/segafilm.c | 20 | ||||
-rw-r--r-- | libavformat/sgi.c | 7 | ||||
-rw-r--r-- | libavformat/wc3movie.c | 43 | ||||
-rw-r--r-- | libavformat/westwood.c | 42 |
10 files changed, 48 insertions, 150 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 2214e11..37cfb3b 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -27,35 +27,22 @@ #include "avformat.h" -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - -#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - ( (long)(unsigned char)(ch0) | \ - ( (long)(unsigned char)(ch1) << 8 ) | \ - ( (long)(unsigned char)(ch2) << 16 ) | \ - ( (long)(unsigned char)(ch3) << 24 ) ) - -#define RIFF_TAG FOURCC_TAG('R', 'I', 'F', 'F') -#define _4XMV_TAG FOURCC_TAG('4', 'X', 'M', 'V') -#define LIST_TAG FOURCC_TAG('L', 'I', 'S', 'T') -#define HEAD_TAG FOURCC_TAG('H', 'E', 'A', 'D') -#define TRK__TAG FOURCC_TAG('T', 'R', 'K', '_') -#define MOVI_TAG FOURCC_TAG('M', 'O', 'V', 'I') -#define VTRK_TAG FOURCC_TAG('V', 'T', 'R', 'K') -#define STRK_TAG FOURCC_TAG('S', 'T', 'R', 'K') -#define std__TAG FOURCC_TAG('s', 't', 'd', '_') -#define name_TAG FOURCC_TAG('n', 'a', 'm', 'e') -#define vtrk_TAG FOURCC_TAG('v', 't', 'r', 'k') -#define strk_TAG FOURCC_TAG('s', 't', 'r', 'k') -#define ifrm_TAG FOURCC_TAG('i', 'f', 'r', 'm') -#define pfrm_TAG FOURCC_TAG('p', 'f', 'r', 'm') -#define cfrm_TAG FOURCC_TAG('c', 'f', 'r', 'm') -#define snd__TAG FOURCC_TAG('s', 'n', 'd', '_') -#define _TAG FOURCC_TAG('', '', '', '') +#define RIFF_TAG MKTAG('R', 'I', 'F', 'F') +#define _4XMV_TAG MKTAG('4', 'X', 'M', 'V') +#define LIST_TAG MKTAG('L', 'I', 'S', 'T') +#define HEAD_TAG MKTAG('H', 'E', 'A', 'D') +#define TRK__TAG MKTAG('T', 'R', 'K', '_') +#define MOVI_TAG MKTAG('M', 'O', 'V', 'I') +#define VTRK_TAG MKTAG('V', 'T', 'R', 'K') +#define STRK_TAG MKTAG('S', 'T', 'R', 'K') +#define std__TAG MKTAG('s', 't', 'd', '_') +#define name_TAG MKTAG('n', 'a', 'm', 'e') +#define vtrk_TAG MKTAG('v', 't', 'r', 'k') +#define strk_TAG MKTAG('s', 't', 'r', 'k') +#define ifrm_TAG MKTAG('i', 'f', 'r', 'm') +#define pfrm_TAG MKTAG('p', 'f', 'r', 'm') +#define cfrm_TAG MKTAG('c', 'f', 'r', 'm') +#define snd__TAG MKTAG('s', 'n', 'd', '_') #define vtrk_SIZE 0x44 #define strk_SIZE 0x28 diff --git a/libavformat/flic.c b/libavformat/flic.c index cab689a..3f7faa6 100644 --- a/libavformat/flic.c +++ b/libavformat/flic.c @@ -31,12 +31,6 @@ #include "avformat.h" -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - #define FLIC_FILE_MAGIC_1 0xAF11 #define FLIC_FILE_MAGIC_2 0xAF12 #define FLIC_CHUNK_MAGIC_1 0xF1FA diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 9d13aa5..ccb1d4b 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -68,12 +68,6 @@ #include "avformat.h" -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - #define HUFFMAN_TABLE_SIZE (64 * 1024) #define FRAME_PTS_INC (90000 / 14) diff --git a/libavformat/idroq.c b/libavformat/idroq.c index d87cfb3..7d782c2 100644 --- a/libavformat/idroq.c +++ b/libavformat/idroq.c @@ -27,12 +27,6 @@ #include "avformat.h" -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - #define RoQ_MAGIC_NUMBER 0x1084 #define RoQ_CHUNK_PREAMBLE_SIZE 8 #define RoQ_AUDIO_SAMPLE_RATE 22050 diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 89ec674..8e4c4c00 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -42,13 +42,6 @@ static inline void debug_ipmovie(const char *format, ...) { } #endif - -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - #define IPMOVIE_SIGNATURE "Interplay MVE File\x1A\0" #define IPMOVIE_SIGNATURE_SIZE 20 #define CHUNK_PREAMBLE_SIZE 4 diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index 9b51407..88c44df 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -31,20 +31,8 @@ //#define PRINTSTUFF -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) - -#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - ( (long)(unsigned char)(ch0) | \ - ( (long)(unsigned char)(ch1) << 8 ) | \ - ( (long)(unsigned char)(ch2) << 16 ) | \ - ( (long)(unsigned char)(ch3) << 24 ) ) - -#define RIFF_TAG FOURCC_TAG('R', 'I', 'F', 'F') -#define CDXA_TAG FOURCC_TAG('C', 'D', 'X', 'A') +#define RIFF_TAG MKTAG('R', 'I', 'F', 'F') +#define CDXA_TAG MKTAG('C', 'D', 'X', 'A') #define RAW_CD_SECTOR_SIZE 2352 #define RAW_CD_SECTOR_DATA_SIZE 2304 diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 3d1b48b..fc54f30 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -27,22 +27,10 @@ #include "avformat.h" -#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) -#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ - (((uint8_t*)(x))[1] << 16) | \ - (((uint8_t*)(x))[2] << 8) | \ - ((uint8_t*)(x))[3]) - -#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - ( (long)(unsigned char)(ch3) | \ - ( (long)(unsigned char)(ch2) << 8 ) | \ - ( (long)(unsigned char)(ch1) << 16 ) | \ - ( (long)(unsigned char)(ch0) << 24 ) ) - -#define FILM_TAG FOURCC_TAG('F', 'I', 'L', 'M') -#define FDSC_TAG FOURCC_TAG('F', 'D', 'S', 'C') -#define STAB_TAG FOURCC_TAG('S', 'T', 'A', 'B') -#define CVID_TAG FOURCC_TAG('c', 'v', 'i', 'd') +#define FILM_TAG MKBETAG('F', 'I', 'L', 'M') +#define FDSC_TAG MKBETAG('F', 'D', 'S', 'C') +#define STAB_TAG MKBETAG('S', 'T', 'A', 'B') +#define CVID_TAG MKBETAG('c', 'v', 'i', 'd') typedef struct { int stream; diff --git a/libavformat/sgi.c b/libavformat/sgi.c index 11b6ab5..89ef721 100644 --- a/libavformat/sgi.c +++ b/libavformat/sgi.c @@ -22,13 +22,6 @@ /* #define DEBUG */ -#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) - -#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ - (((uint8_t*)(x))[1] << 16) | \ - (((uint8_t*)(x))[2] << 8) | \ - ((uint8_t*)(x))[3]) - /* sgi image file signature */ #define SGI_MAGIC 474 diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index fc4f37e..ada3466 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -27,38 +27,21 @@ #include "avformat.h" -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) -#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) -#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ - (((uint8_t*)(x))[1] << 16) | \ - (((uint8_t*)(x))[2] << 8) | \ - ((uint8_t*)(x))[3]) - #define WC3_PREAMBLE_SIZE 8 -#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - ( (long)(unsigned char)(ch0) | \ - ( (long)(unsigned char)(ch1) << 8 ) | \ - ( (long)(unsigned char)(ch2) << 16 ) | \ - ( (long)(unsigned char)(ch3) << 24 ) ) - -#define FORM_TAG FOURCC_TAG('F', 'O', 'R', 'M') -#define MOVE_TAG FOURCC_TAG('M', 'O', 'V', 'E') -#define _PC__TAG FOURCC_TAG('_', 'P', 'C', '_') -#define SOND_TAG FOURCC_TAG('S', 'O', 'N', 'D') -#define BNAM_TAG FOURCC_TAG('B', 'N', 'A', 'M') -#define SIZE_TAG FOURCC_TAG('S', 'I', 'Z', 'E') -#define PALT_TAG FOURCC_TAG('P', 'A', 'L', 'T') -#define INDX_TAG FOURCC_TAG('I', 'N', 'D', 'X') -#define BRCH_TAG FOURCC_TAG('B', 'R', 'C', 'H') -#define SHOT_TAG FOURCC_TAG('S', 'H', 'O', 'T') -#define VGA__TAG FOURCC_TAG('V', 'G', 'A', ' ') -#define TEXT_TAG FOURCC_TAG('T', 'E', 'X', 'T') -#define AUDI_TAG FOURCC_TAG('A', 'U', 'D', 'I') +#define FORM_TAG MKTAG('F', 'O', 'R', 'M') +#define MOVE_TAG MKTAG('M', 'O', 'V', 'E') +#define _PC__TAG MKTAG('_', 'P', 'C', '_') +#define SOND_TAG MKTAG('S', 'O', 'N', 'D') +#define BNAM_TAG MKTAG('B', 'N', 'A', 'M') +#define SIZE_TAG MKTAG('S', 'I', 'Z', 'E') +#define PALT_TAG MKTAG('P', 'A', 'L', 'T') +#define INDX_TAG MKTAG('I', 'N', 'D', 'X') +#define BRCH_TAG MKTAG('B', 'R', 'C', 'H') +#define SHOT_TAG MKTAG('S', 'H', 'O', 'T') +#define VGA__TAG MKTAG('V', 'G', 'A', ' ') +#define TEXT_TAG MKTAG('T', 'E', 'X', 'T') +#define AUDI_TAG MKTAG('A', 'U', 'D', 'I') /* video resolution unless otherwise specified */ #define WC3_DEFAULT_WIDTH 320 diff --git a/libavformat/westwood.c b/libavformat/westwood.c index af0777f..5d0848c 100644 --- a/libavformat/westwood.c +++ b/libavformat/westwood.c @@ -33,41 +33,25 @@ #include "avformat.h" -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define LE_32(x) ((((uint8_t*)(x))[3] << 24) | \ - (((uint8_t*)(x))[2] << 16) | \ - (((uint8_t*)(x))[1] << 8) | \ - ((uint8_t*)(x))[0]) -#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ - (((uint8_t*)(x))[1] << 16) | \ - (((uint8_t*)(x))[2] << 8) | \ - ((uint8_t*)(x))[3]) - #define AUD_HEADER_SIZE 12 #define AUD_CHUNK_PREAMBLE_SIZE 8 #define AUD_CHUNK_SIGNATURE 0x0000DEAF -#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - ( (long)(unsigned char)(ch3) | \ - ( (long)(unsigned char)(ch2) << 8 ) | \ - ( (long)(unsigned char)(ch1) << 16 ) | \ - ( (long)(unsigned char)(ch0) << 24 ) ) - -#define FORM_TAG FOURCC_TAG('F', 'O', 'R', 'M') -#define WVQA_TAG FOURCC_TAG('W', 'V', 'Q', 'A') -#define VQHD_TAG FOURCC_TAG('V', 'Q', 'H', 'D') -#define FINF_TAG FOURCC_TAG('F', 'I', 'N', 'F') -#define SND0_TAG FOURCC_TAG('S', 'N', 'D', '0') -#define SND2_TAG FOURCC_TAG('S', 'N', 'D', '2') -#define VQFR_TAG FOURCC_TAG('V', 'Q', 'F', 'R') +#define FORM_TAG MKBETAG('F', 'O', 'R', 'M') +#define WVQA_TAG MKBETAG('W', 'V', 'Q', 'A') +#define VQHD_TAG MKBETAG('V', 'Q', 'H', 'D') +#define FINF_TAG MKBETAG('F', 'I', 'N', 'F') +#define SND0_TAG MKBETAG('S', 'N', 'D', '0') +#define SND2_TAG MKBETAG('S', 'N', 'D', '2') +#define VQFR_TAG MKBETAG('V', 'Q', 'F', 'R') /* don't know what these tags are for, but acknowledge their existence */ -#define CINF_TAG FOURCC_TAG('C', 'I', 'N', 'F') -#define CINH_TAG FOURCC_TAG('C', 'I', 'N', 'H') -#define CIND_TAG FOURCC_TAG('C', 'I', 'N', 'D') -#define PINF_TAG FOURCC_TAG('P', 'I', 'N', 'F') -#define PINH_TAG FOURCC_TAG('P', 'I', 'N', 'H') -#define PIND_TAG FOURCC_TAG('P', 'I', 'N', 'D') +#define CINF_TAG MKBETAG('C', 'I', 'N', 'F') +#define CINH_TAG MKBETAG('C', 'I', 'N', 'H') +#define CIND_TAG MKBETAG('C', 'I', 'N', 'D') +#define PINF_TAG MKBETAG('P', 'I', 'N', 'F') +#define PINH_TAG MKBETAG('P', 'I', 'N', 'H') +#define PIND_TAG MKBETAG('P', 'I', 'N', 'D') #define VQA_HEADER_SIZE 0x2A #define VQA_FRAMERATE 15 |