RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 09:32:40 +00:00
Code Issues Releases Wiki Activity

Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-07-26 19:53:00 +00:00
parent c242fdbfd9
commit e5751ced4f
35 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DOCS/tech/colorspaces.txt
View File

@ -154,5 +154,5 @@ order followed by the number 32, the portable way to access it is to load
the pixel into an integer and use bitmasks.
When the above portable access methods are not used, you will need to write
2 versions of your code, and use #ifdef WORDS_BIGENDIAN to choose the correct
2 versions of your code, and use #if HAVE_BIGENDIAN to choose the correct
one.

2
gui/bitmap.c
View File

@ -108,7 +108,7 @@ static int conv24to32( txSample * bf )
static void Normalize( txSample * bf )
{
int i;
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i+3]=0;
#else
for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i]=0;

2
gui/wm/ws.c
View File

@ -1082,7 +1082,7 @@ int wsGetDepthOnScreen( void )
wsRedMask=mXImage->red_mask;
wsGreenMask=mXImage->green_mask;
wsBlueMask=mXImage->blue_mask;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
wsNonNativeOrder = mXImage->byte_order == LSBFirst;
#else
wsNonNativeOrder = mXImage->byte_order == MSBFirst;

2
liba52/bitstream.h
View File

@ -62,7 +62,7 @@ static inline uint32_t unaligned32(const void *v) {
#endif
/* (stolen from the kernel) */
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
# define swab32(x) (x)

2
liba52/liba52_changes.diff
View File

@ -116,7 +116,7 @@
+#endif
+
/* (stolen from the kernel) */
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
@@ -28,7 +68,7 @@

4
libaf/af_format.c
View File

@ -332,7 +332,7 @@ af_info_t af_info_format = {
};
static inline uint32_t load24bit(void* data, int pos) {
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
return (((uint32_t)((uint8_t*)data)[3*pos])<<24) |
(((uint32_t)((uint8_t*)data)[3*pos+1])<<16) |
(((uint32_t)((uint8_t*)data)[3*pos+2])<<8);
@ -344,7 +344,7 @@ static inline uint32_t load24bit(void* data, int pos) {
}
static inline void store24bit(void* data, int pos, uint32_t expanded_value) {
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
((uint8_t*)data)[3*pos]=expanded_value>>24;
((uint8_t*)data)[3*pos+1]=expanded_value>>16;
((uint8_t*)data)[3*pos+2]=expanded_value>>8;

4
libaf/af_format.h
View File

@ -30,7 +30,7 @@
#define AF_FORMAT_LE (1<<0) // Little Endian
#define AF_FORMAT_END_MASK (1<<0)
#ifdef WORDS_BIGENDIAN // Native endian of cpu
#if HAVE_BIGENDIAN // Native endian of cpu
#define AF_FORMAT_NE AF_FORMAT_BE
#else
#define AF_FORMAT_NE AF_FORMAT_LE
@ -83,7 +83,7 @@
#define AF_FORMAT_FLOAT_LE (AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_LE)
#define AF_FORMAT_FLOAT_BE (AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_BE)
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define AF_FORMAT_U16_NE AF_FORMAT_U16_BE
#define AF_FORMAT_S16_NE AF_FORMAT_S16_BE
#define AF_FORMAT_U24_NE AF_FORMAT_U24_BE

2
libaf/af_lavcac3enc.c
View File

@ -238,7 +238,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data)
int16_t *out = (int16_t *)buf;
int bsmod = dest[5] & 0x7;
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
int i;
char tmp;
for (i = 0; i < len; i += 2) {

4
libao2/ao_alsa.c
View File

@ -368,13 +368,13 @@ static int init(int rate_hz, int channels, int format, int flags)
case AF_FORMAT_U16_BE:
alsa_format = SND_PCM_FORMAT_U16_BE;
break;
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
case AF_FORMAT_AC3:
#endif
case AF_FORMAT_S16_LE:
alsa_format = SND_PCM_FORMAT_S16_LE;
break;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
case AF_FORMAT_AC3:
#endif
case AF_FORMAT_S16_BE:

4
libao2/ao_alsa5.c
View File

@ -101,13 +101,13 @@ static int init(int rate_hz, int channels, int format, int flags)
case AF_FORMAT_U16_BE:
alsa_format.format = SND_PCM_SFMT_U16_BE;
break;
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
case AF_FORMAT_AC3:
#endif
case AF_FORMAT_S16_LE:
alsa_format.format = SND_PCM_SFMT_S16_LE;
break;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
case AF_FORMAT_AC3:
#endif
case AF_FORMAT_S16_BE:

4
libao2/ao_coreaudio.c
View File

@ -345,7 +345,7 @@ int b_alive;
}
if ((format & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) {
// Currently ac3 input (comes from hwac3) is always in native byte-order.
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
inDesc.mFormatFlags |= kAudioFormatFlagIsBigEndian;
#endif
}
@ -669,7 +669,7 @@ static int OpenSPDIF(void)
/* FIXME: If output stream is not native byte-order, we need change endian somewhere. */
/* Although there's no such case reported. */
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
if (!(ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian))
#else
if (ao->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian)

2
libao2/ao_dxr2.c
View File

@ -207,7 +207,7 @@ static int play(void* data,int len,int flags){
int i;
//unsigned short *s=data;
uint16_t *s=data;
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
for(i=0;i<len/2;i++) s[i] = bswap_16(s[i]);
#endif
dxr2_send_lpcm_packet(data,len,0xA0,ao_data.pts-10000,freq_id);

2
libao2/ao_oss.c
View File

@ -306,7 +306,7 @@ ac3_retry:
ao_data.format=format;
oss_format=format2oss(format);
if (oss_format == -1) {
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
oss_format=AFMT_S16_BE;
#else
oss_format=AFMT_S16_LE;

2
libao2/ao_pcm.c
View File

@ -234,7 +234,7 @@ static int play(void* data,int len,int flags){
// let libaf to do the conversion...
#if 0
//#ifdef WORDS_BIGENDIAN
//#if HAVE_BIGENDIAN
if (ao_data.format == AFMT_S16_LE) {
unsigned short *buffer = (unsigned short *) data;
register int i;

2
libfaad2/common.h
View File

@ -245,7 +245,7 @@ char *strchr(), *strrchr();
#endif
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define ARCH_IS_BIG_ENDIAN
#endif

9
libfaad2/local_changes.diff
View File

@ -62,6 +62,15 @@
+
typedef float float32_t;
@@ -245,7 +245,7 @@
#endif
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
#define ARCH_IS_BIG_ENDIAN
#endif
@@ -289,7 +305,7 @@
}

4
libmpcodecs/ad_hwac3.c
View File

@ -180,7 +180,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
buf16[2] = 0x0001; // data-type ac3
buf16[2] |= (sh_audio->a_in_buffer[5] & 0x7) << 8; // bsmod
buf16[3] = len << 3; // number of bits in payload
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
memcpy(buf + 8, sh_audio->a_in_buffer, len);
#else
swab(sh_audio->a_in_buffer, buf + 8, len);
@ -524,7 +524,7 @@ static int decode_audio_dts(unsigned char *indata_ptr, int len, unsigned char *b
buf16[3] = fsize << 3;
if (!convert_16bits) {
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
/* BE stream */
if (indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f)
#else

2
libmpcodecs/img_format.h
View File

@ -25,7 +25,7 @@
#define IMGFMT_BGR24 (IMGFMT_BGR|24)
#define IMGFMT_BGR32 (IMGFMT_BGR|32)
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define IMGFMT_ABGR IMGFMT_RGB32
#define IMGFMT_BGRA (IMGFMT_RGB32|64)
#define IMGFMT_ARGB IMGFMT_BGR32

2
libmpcodecs/vd_ffmpeg.c
View File

@ -896,7 +896,7 @@ static mp_image_t *decode(sh_video_t *sh, void *data, int len, int flags){
mpi->stride[2]*=2;
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
// FIXME: this might cause problems for buffers with FF_BUFFER_HINTS_PRESERVE
if (mpi->bpp == 8)
swap_palette(mpi->planes[1]);

2
libmpcodecs/vf.c
View File

@ -233,7 +233,7 @@ void vf_mpi_clear(mp_image_t* mpi,int x0,int y0,int w,int h){
unsigned int* p=(unsigned int*) dst;
int size=(mpi->bpp>>3)*w/4;
int i;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define CLEAR_PACKEDYUV_PATTERN 0x00800080
#define CLEAR_PACKEDYUV_PATTERN_SWAPPED 0x80008000
#else

2
libmpcodecs/vf_scale.c
View File

@ -322,7 +322,7 @@ static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){
static void scale(struct SwsContext *sws1, struct SwsContext *sws2, uint8_t *src[MP_MAX_PLANES], int src_stride[MP_MAX_PLANES],
int y, int h, uint8_t *dst[MP_MAX_PLANES], int dst_stride[MP_MAX_PLANES], int interlaced){
uint8_t *src2[MP_MAX_PLANES]={src[0], src[1], src[2]};
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
uint32_t pal2[256];
if (src[1] && !src[2]){
int i;

6
libmpdemux/asf.h
View File

@ -19,7 +19,7 @@
#ifndef MPLAYER_ASF_H
#define MPLAYER_ASF_H
//#include "config.h" /* for WORDS_BIGENDIAN */
//#include "config.h" /* for HAVE_BIGENDIAN */
#include <inttypes.h>
#include "libavutil/common.h"
#include "mpbswap.h"
@ -105,7 +105,7 @@ typedef struct __attribute__((packed)) {
} ASF_stream_chunck_t;
// Definition of the stream type
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define ASF_STREAMING_CLEAR 0x2443 // $C
#define ASF_STREAMING_DATA 0x2444 // $D
#define ASF_STREAMING_END_TRANS 0x2445 // $E
@ -140,7 +140,7 @@ typedef struct {
* Some macros to swap little endian structures read from an ASF file
* into machine endian format
*/
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define le2me_ASF_obj_header_t(h) { \
(h)->size = le2me_64((h)->size); \
}

4
libmpdemux/aviheader.h
View File

@ -21,7 +21,7 @@
#include <sys/types.h>
#include <stdint.h>
#include "config.h" /* get correct definition of WORDS_BIGENDIAN */
#include "config.h" /* get correct definition of HAVE_BIGENDIAN */
#include "libavutil/common.h"
#include "mpbswap.h"
@ -227,7 +227,7 @@ typedef enum {
* Some macros to swap little endian structures read from an AVI file
* into machine endian format
*/
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define le2me_MainAVIHeader(h) { \
(h)->dwMicroSecPerFrame = le2me_32((h)->dwMicroSecPerFrame); \
(h)->dwMaxBytesPerSec = le2me_32((h)->dwMaxBytesPerSec); \

2
libmpdemux/demux_xmms.c
View File

@ -101,7 +101,7 @@ static int disk_open(AFormat fmt, int rate, int nch) {
xmms_afmt=AF_FORMAT_U16_LE;
break;
case FMT_U16_NE:
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
xmms_afmt=AF_FORMAT_U16_BE;
#else
xmms_afmt=AF_FORMAT_U16_LE;

2
libmpdemux/demuxer.h
View File

@ -384,7 +384,7 @@ stream_t* new_ds_stream(demux_stream_t *ds);
static inline int avi_stream_id(unsigned int id){
unsigned char *p=(unsigned char *)&id;
unsigned char a,b;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
a=p[3]-'0'; b=p[2]-'0';
#else
a=p[0]-'0'; b=p[1]-'0';

2
libmpdemux/ms_hdr.h
View File

@ -68,7 +68,7 @@ typedef struct {
#endif
#ifndef le2me_BITMAPINFOHEADER
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define le2me_BITMAPINFOHEADER(h) { \
(h)->biSize = le2me_32((h)->biSize); \
(h)->biWidth = le2me_32((h)->biWidth); \

2
libvo/osd_template.c
View File

@ -320,7 +320,7 @@ static inline void RENAME(vo_draw_alpha_rgb24)(int w,int h, unsigned char* src,
static inline void RENAME(vo_draw_alpha_rgb32)(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride){
int y;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
dstbase++;
#endif
#if HAVE_MMX

2
libvo/vo_svga.c
View File

@ -660,7 +660,7 @@ static int query_format(uint32_t format) {
if( (!IMGFMT_IS_RGB(format)) && (!IMGFMT_IS_BGR(format)) ) return 0;
// Reject different endian
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
if (IMGFMT_IS_BGR(format)) return 0;
#else
if (IMGFMT_IS_RGB(format)) return 0;

2
libvo/vo_tga.c
View File

@ -138,7 +138,7 @@ static int write_tga( char *file, int bpp, int dx, int dy, uint8_t *buf, int str
s = buf;
d = line_buff;
for(x = 0; x < dx; x++) {
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
d[0] = s[3];
d[1] = s[2];
d[2] = s[1];

4
libvo/vo_x11.c
View File

@ -267,7 +267,7 @@ static void freeMyXImage(void)
ImageData = NULL;
}
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define BO_NATIVE MSBFirst
#define BO_NONNATIVE LSBFirst
#else
@ -457,7 +457,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
// we can easily "emulate" them.
if (out_format & 64 && (IMGFMT_IS_RGB(out_format) || IMGFMT_IS_BGR(out_format))) {
out_format &= ~64;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
out_offset = 1;
#else
out_offset = -1;

4
mp3lib/decod386.c
View File

@ -50,11 +50,11 @@
* On a SPARC cpu, we fetch the low-order 32-bit from the second 32-bit
* word of the double fp value stored in memory. On an x86 cpu, we fetch it
* from the first 32-bit word.
* I'm not sure if the WORDS_BIGENDIAN feature test covers all possible memory
* I'm not sure if the HAVE_BIGENDIAN feature test covers all possible memory
* layouts of double floating point values an all cpu architectures. If
* it doesn't work for you, just enable the "old WRITE_SAMPLE" macro.
*/
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
#define MANTISSA_OFFSET 1
#else
#define MANTISSA_OFFSET 0

2
stream/stream_cdda.c
View File

@ -346,7 +346,7 @@ static int fill_buffer(stream_t* s, char* buffer, int max_len) {
if (!buf)
return 0;
#ifdef WORDS_BIGENDIAN
#if HAVE_BIGENDIAN
for(i=0;i<CD_FRAMESIZE_RAW/2;i++)
buf[i]=le2me_16(buf[i]);
#endif

2
tremor/misc.h
View File

@ -31,7 +31,7 @@
#include <sys/types.h>
#include "config.h"
#ifndef WORDS_BIGENDIAN
#if !HAVE_BIGENDIAN
union magic {
struct {
ogg_int32_t lo;

2
tremor/tremor.diff
View File

@ -7,7 +7,7 @@
+#include "config.h"
-#if BYTE_ORDER==LITTLE_ENDIAN
+#ifndef WORDS_BIGENDIAN
+#if !HAVE_BIGENDIAN
union magic {
struct {
ogg_int32_t lo;

2
vidix/radeon_vid.c
View File

@ -831,7 +831,7 @@ static void radeon_engine_restore( void )
(pitch64 << 22));
radeon_fifo_wait(1);
#if defined(WORDS_BIGENDIAN)
#if HAVE_BIGENDIAN
OUTREGP(DP_DATATYPE,
HOST_BIG_ENDIAN_EN, ~HOST_BIG_ENDIAN_EN);
#else