Skip to content

F
ffmpeg
Commit 63613fe6 authored by Måns Rullgård's avatar Måns Rullgård
Browse files
Options

Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN 

Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 84c04e25
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 44 deletions
configure
View file @ 63613fe6
......@@ -2591,11 +2591,6 @@ echo "HOSTLIBS=$host_libs" >> config.mak
echo "TARGET_EXEC=$target_exec" >> config.mak
echo "TARGET_PATH=$target_path" >> config.mak
if enabled bigendian; then
echo "WORDS_BIGENDIAN=yes" >> config.mak
echo "#define WORDS_BIGENDIAN 1" >> $TMPH
fi
if enabled sdl; then
echo "SDL_LIBS=$("${SDL_CONFIG}" --libs)" >> config.mak
echo "SDL_CFLAGS=$("${SDL_CONFIG}" --cflags)" >> config.mak
......
libavcodec/8bps.c
View file @ 63613fe6
......@@ -183,7 +183,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
case 32:
avctx->pix_fmt = PIX_FMT_RGB32;
c->planes = 4;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
c->planemap[0] = 1; // 1st plane is red
c->planemap[1] = 2; // 2nd plane is green
c->planemap[2] = 3; // 3rd plane is blue
......
libavcodec/cscd.c
View file @ 63613fe6
......@@ -59,7 +59,7 @@ static void add_frame_default(AVFrame *f, const uint8_t *src,
}
}
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
#define copy_frame_16 copy_frame_default
#define copy_frame_32 copy_frame_default
#define add_frame_16 add_frame_default
......
libavcodec/flacenc.c
View file @ 63613fe6
......@@ -1224,7 +1224,7 @@ static void output_frame_footer(FlacEncodeContext *s)
static void update_md5_sum(FlacEncodeContext *s, int16_t *samples)
{
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
int i;
for(i = 0; i < s->frame.blocksize*s->channels; i++) {
int16_t smp = le2me_16(samples[i]);
......
libavcodec/flicvideo.c
View file @ 63613fe6
......@@ -585,7 +585,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
* during decompression. So if it is required (i.e., this is not a LE target, we do
* a second pass over the line here, swapping the bytes.
*/
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
pixel_ptr = y_ptr;
pixel_countdown = s->avctx->width;
while (pixel_countdown > 0) {
......
libavcodec/h264.c
View file @ 63613fe6
......@@ -82,7 +82,7 @@ static void filter_mb_fast( H264Context *h, int mb_x, int mb_y, uint8_t *img_y,
static Picture * remove_long(H264Context *h, int i, int ref_mask);
static av_always_inline uint32_t pack16to32(int a, int b){
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
return (b&0xFFFF) + (a<<16);
#else
return (a&0xFFFF) + (b<<16);
......
libavcodec/huffyuv.c
View file @ 63613fe6
......@@ -35,7 +35,7 @@
#define VLC_BITS 11
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define B 3
#define G 2
#define R 1
......
libavcodec/imgconvert.c
View file @ 63613fe6
......@@ -548,7 +548,7 @@ static enum PixelFormat avcodec_get_pix_fmt_internal(const char *name)
return PIX_FMT_NONE;
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
# define X_NE(be, le) be
#else
# define X_NE(be, le) le
......
libavcodec/indeo3.c
View file @ 63613fe6
......@@ -576,7 +576,7 @@ static void iv_Decode_Chunk(Indeo3DecodeContext *s,
lv1 = ref_lp[0];
lv2 = ref_lp[1];
if(lp2 == 0 && flag1 != 0) {
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
lv1 = lv1 & 0xFF00FF00;
lv1 = (lv1 >> 8) | lv1;
lv2 = lv2 & 0xFF00FF00;
......
libavcodec/pcm.c
View file @ 63613fe6
......@@ -214,7 +214,7 @@ static int pcm_encode_frame(AVCodecContext *avctx,
*dst++ = v - 128;
}
break;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
case CODEC_ID_PCM_F64LE:
ENCODE(int64_t, le64, samples, dst, n, 0, 0)
break;
......@@ -244,7 +244,7 @@ static int pcm_encode_frame(AVCodecContext *avctx,
case CODEC_ID_PCM_F32LE:
case CODEC_ID_PCM_S32LE:
case CODEC_ID_PCM_S16LE:
#endif /* WORDS_BIGENDIAN */
#endif /* HAVE_BIGENDIAN */
case CODEC_ID_PCM_U8:
memcpy(dst, samples, n*sample_size);
dst += n*sample_size;
......@@ -422,7 +422,7 @@ static int pcm_decode_frame(AVCodecContext *avctx,
}
samples= (short*)dstu8;
break;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
case CODEC_ID_PCM_F64LE:
DECODE(int64_t, le64, src, samples, n, 0, 0)
break;
......@@ -452,7 +452,7 @@ static int pcm_decode_frame(AVCodecContext *avctx,
case CODEC_ID_PCM_F32LE:
case CODEC_ID_PCM_S32LE:
case CODEC_ID_PCM_S16LE:
#endif /* WORDS_BIGENDIAN */
#endif /* HAVE_BIGENDIAN */
case CODEC_ID_PCM_U8:
memcpy(samples, src, n*sample_size);
src += n*sample_size;
......
libavcodec/ptx.c
View file @ 63613fe6
......@@ -79,7 +79,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
stride = p->linesize[0];
for (y=0; y<h; y++) {
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
unsigned int x;
for (x=0; x<w*bytes_per_pixel; x+=bytes_per_pixel)
AV_WN16(ptr+x, AV_RL16(buf+x));
......
libavcodec/simple_idct.c
View file @ 63613fe6
......@@ -66,7 +66,7 @@ static inline void idctRowCondDC (DCTELEM * row)
#endif
#if HAVE_FAST_64BIT
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define ROW0_MASK 0xffff000000000000LL
#else
#define ROW0_MASK 0xffffLL
......
libavcodec/targa.c
View file @ 63613fe6
......@@ -199,7 +199,7 @@ static int decode_frame(AVCodecContext *avctx,
targa_decode_rle(avctx, s, buf, dst, avctx->width, avctx->height, stride, bpp);
else{
for(y = 0; y < s->height; y++){
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
if((s->bpp + 1) >> 3 == 2){
uint16_t *dst16 = (uint16_t*)dst;
for(x = 0; x < s->width; x++)
......
libavcodec/tiffenc.c
View file @ 63613fe6
......@@ -91,7 +91,7 @@ static void tnput(uint8_t ** p, int n, const uint8_t * val, enum TiffTypes type,
int flip)
{
int i;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
flip ^= ((int[]) {0, 0, 0, 1, 3, 3})[type];
#endif
for (i = 0; i < n * type_sizes2[type]; i++)
......
libavcodec/truemotion1.c
View file @ 63613fe6
......@@ -163,7 +163,7 @@ static void select_delta_tables(TrueMotion1Context *s, int delta_table_index)
}
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
static int make_ydt15_entry(int p2, int p1, int16_t *ydt)
#else
static int make_ydt15_entry(int p1, int p2, int16_t *ydt)
......@@ -178,7 +178,7 @@ static int make_ydt15_entry(int p1, int p2, int16_t *ydt)
return (lo + (hi << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
static int make_cdt15_entry(int p2, int p1, int16_t *cdt)
#else
static int make_cdt15_entry(int p1, int p2, int16_t *cdt)
......@@ -192,7 +192,7 @@ static int make_cdt15_entry(int p1, int p2, int16_t *cdt)
return (lo + (lo << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
static int make_ydt16_entry(int p2, int p1, int16_t *ydt)
#else
static int make_ydt16_entry(int p1, int p2, int16_t *ydt)
......@@ -207,7 +207,7 @@ static int make_ydt16_entry(int p1, int p2, int16_t *ydt)
return (lo + (hi << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
static int make_cdt16_entry(int p2, int p1, int16_t *cdt)
#else
static int make_cdt16_entry(int p1, int p2, int16_t *cdt)
......@@ -221,7 +221,7 @@ static int make_cdt16_entry(int p1, int p2, int16_t *cdt)
return (lo + (lo << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
static int make_ydt24_entry(int p2, int p1, int16_t *ydt)
#else
static int make_ydt24_entry(int p1, int p2, int16_t *ydt)
......@@ -234,7 +234,7 @@ static int make_ydt24_entry(int p1, int p2, int16_t *ydt)
return (lo + (hi << 8) + (hi << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
static int make_cdt24_entry(int p2, int p1, int16_t *cdt)
#else
static int make_cdt24_entry(int p1, int p2, int16_t *cdt)
......
libavdevice/alsa-audio.h
View file @ 63613fe6
......@@ -37,7 +37,7 @@
/* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in
other formats */
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define DEFAULT_CODEC_ID CODEC_ID_PCM_S16BE
#else
#define DEFAULT_CODEC_ID CODEC_ID_PCM_S16LE
......
libavdevice/beosaudio.cpp
View file @ 63613fe6
......@@ -439,7 +439,7 @@ AVOutputFormat audio_beos_muxer = {
"",
"",
sizeof(AudioData),
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
CODEC_ID_PCM_S16BE,
#else
CODEC_ID_PCM_S16LE,
......
libavdevice/jack_audio.c
View file @ 63613fe6
......@@ -238,7 +238,7 @@ static int audio_read_header(AVFormatContext *context, AVFormatParameters *param
}
stream->codec->codec_type = CODEC_TYPE_AUDIO;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
stream->codec->codec_id = CODEC_ID_PCM_F32BE;
#else
stream->codec->codec_id = CODEC_ID_PCM_F32LE;
......
libavdevice/oss_audio.c
View file @ 63613fe6
......@@ -89,7 +89,7 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi
/* select format : favour native format */
err = ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &tmp);
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
if (tmp & AFMT_S16_BE) {
tmp = AFMT_S16_BE;
} else if (tmp & AFMT_S16_LE) {
......@@ -335,7 +335,7 @@ AVOutputFormat oss_muxer = {
/* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in
other formats */
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
CODEC_ID_PCM_S16BE,
#else
CODEC_ID_PCM_S16LE,
......
libavformat/asfdec.c
View file @ 63613fe6
......@@ -364,7 +364,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* This is true for all paletted codecs implemented in ffmpeg */
if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]);
#else
......
libavformat/avidec.c
View file @ 63613fe6
......@@ -498,7 +498,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* This is true for all paletted codecs implemented in FFmpeg. */
if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) {
st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]);
#else
......
libavformat/flvdec.c
View file @ 63613fe6
......@@ -77,7 +77,7 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c
//no distinction between S16 and S8 PCM codec flags
case FLV_CODECID_PCM:
acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 :
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
CODEC_ID_PCM_S16BE;
#else
CODEC_ID_PCM_S16LE;
......
libavformat/mtv.c
View file @ 63613fe6
......@@ -129,7 +129,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
MTVDemuxContext *mtv = s->priv_data;
ByteIOContext *pb = s->pb;
int ret;
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
int i;
#endif
......@@ -150,7 +150,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
if(ret != mtv->img_segment_size)
return AVERROR(EIO);
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
/* pkt->data is GGGRRRR BBBBBGGG
* and we need RRRRRGGG GGGBBBBB
......
libavformat/raw.c
View file @ 63613fe6
......@@ -1103,7 +1103,7 @@ AVOutputFormat null_muxer = {
NULL,
NULL,
0,
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
CODEC_ID_PCM_S16BE,
#else
CODEC_ID_PCM_S16LE,
......@@ -1232,7 +1232,7 @@ AVOutputFormat pcm_ ## name ## _muxer = {\
#define PCMDEF(name, long_name, ext, codec)
#endif
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define BE_DEF(s) s
#define LE_DEF(s) NULL
#else
......
libavutil/bswap.h
View file @ 63613fe6
......@@ -80,7 +80,7 @@ static inline uint64_t av_const bswap_64(uint64_t x)
// be2me ... big-endian to machine-endian
// le2me ... little-endian to machine-endian
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define be2me_16(x) (x)
#define be2me_32(x) (x)
#define be2me_64(x) (x)
......
libavutil/intreadwrite.h
View file @ 63613fe6
......@@ -155,7 +155,7 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed));
((uint8_t*)(p))[7] = (d)>>56; } while(0)
#endif
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
# define AV_RN(s, p) AV_RB##s(p)
# define AV_WN(s, p, v) AV_WB##s(p, v)
#else
......@@ -189,7 +189,7 @@ struct unaligned_16 { uint16_t l; } __attribute__((packed));
# define AV_WN64(p, v) AV_WN(64, p, v)
#endif
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
# define AV_RB(s, p) AV_RN(s, p)
# define AV_WB(s, p, v) AV_WN(s, p, v)
# define AV_RL(s, p) bswap_##s(AV_RN(s, p))
......
libavutil/md5.c
View file @ 63613fe6
......@@ -93,7 +93,7 @@ static void body(uint32_t ABCD[4], uint32_t X[16]){
unsigned int c= ABCD[1];
unsigned int d= ABCD[0];
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
for(i=0; i<16; i++)
X[i]= bswap_32(X[i]);
#endif
......
libavutil/pixfmt.h
View file @ 63613fe6
......@@ -126,7 +126,7 @@ enum PixelFormat {
PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
};
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
# define PIX_FMT_NE(be, le) PIX_FMT_##be
#else
# define PIX_FMT_NE(be, le) PIX_FMT_##le
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment