Ticket #1024: endian.try2.diff
File endian.try2.diff, 4.8 KB (added by , 18 years ago) |
---|
-
mythmusic/mythmusic/vorbisdecoder.cpp
1 1 #include <stdio.h> 2 2 #include <stdlib.h> 3 3 #include <iostream> 4 4 #include <string> … … 240 240 seekTime = -1.0; 241 241 } 242 242 243 #if __BYTE_ORDER == __LITTLE_ENDIAN 243 244 len = ov_read(&oggfile, (char *) (output_buf + output_at), bks, 0, 2, 1, 244 245 §ion); 246 #else 247 len = ov_read(&oggfile, (char *) (output_buf + output_at), bks, 1, 2, 1, 248 §ion); 249 #endif 245 250 251 246 252 if (len > 0) { 247 253 bitrate = ov_bitrate_instant(&oggfile) / 1000; 248 254 -
mythmusic/mythmusic/flacdecoder.h
4 4 #define HAVE_INTTYPES_H 5 5 #include <FLAC/all.h> 6 6 7 extern "C" { 8 #include <endian.h> 9 } 10 7 11 #include "decoder.h" 8 12 9 13 class Metadata; -
mythmusic/mythmusic/flacdecoder.cpp
102 102 for (channel = 0; channel < chan; channel++) 103 103 { 104 104 sample = (FLAC__int8)buffer[channel][cursamp]; 105 106 #if __BYTE_ORDER == __LITTLE_ENDIAN 105 107 *(output_buf + output_at++) = ((sample >> 0) & 0xff); 108 #else 109 *(output_buf + output_at++) = ((sample >> 8) & 0xff); 110 #endif 106 111 output_bytes += 1; 107 112 } 108 113 } … … 113 118 { 114 119 for (channel = 0; channel < chan; channel++) 115 120 { 116 sample = (FLAC__int16)buffer[channel][cursamp]; 121 sample = (FLAC__int16)buffer[channel][cursamp]; 122 #if __BYTE_ORDER == __LITTLE_ENDIAN 117 123 *(output_buf + output_at++) = ((sample >> 0) & 0xff); 118 124 *(output_buf + output_at++) = ((sample >> 8) & 0xff); 125 #else 126 *(output_buf + output_at++) = ((sample >> 8) & 0xff); 127 *(output_buf + output_at++) = ((sample >> 0) & 0xff); 128 #endif 119 129 output_bytes += 2; 120 130 } 121 131 } -
mythmusic/mythmusic/maddecoder.h
5 5 6 6 extern "C" { 7 7 #include <mad.h> 8 #include <endian.h> 8 9 } 9 10 10 11 class Metadata; -
mythmusic/mythmusic/vorbisdecoder.h
4 4 #include "decoder.h" 5 5 6 6 #include <vorbis/vorbisfile.h> 7 extern "C" { 8 #include <endian.h> 9 } 7 10 8 11 class Metadata; 9 12 -
mythmusic/mythmusic/maddecoder.cpp
483 483 flush(); 484 484 } 485 485 sample = fix_sample(16, *left++); 486 #if __BYTE_ORDER == __LITTLE_ENDIAN 486 487 *(output_buf + output_at++) = ((sample >> 0) & 0xff); 487 488 *(output_buf + output_at++) = ((sample >> 8) & 0xff); 489 #else 490 *(output_buf + output_at++) = ((sample >> 8) & 0xff); 491 *(output_buf + output_at++) = ((sample >> 0) & 0xff); 492 #endif 488 493 output_bytes += 2; 489 494 490 495 if (channels == 2) 491 496 { 492 497 sample = fix_sample(16, *right++); 498 #if __BYTE_ORDER == __LITTLE_ENDIAN 493 499 *(output_buf + output_at++) = ((sample >> 0) & 0xff); 494 500 *(output_buf + output_at++) = ((sample >> 8) & 0xff); 501 #else 502 *(output_buf + output_at++) = ((sample >> 8) & 0xff); 503 *(output_buf + output_at++) = ((sample >> 0) & 0xff); 504 #endif 495 505 output_bytes += 2; 496 506 } 497 507 } -
settings.pro
2 2 CONFIG += release 3 3 4 4 isEmpty( PREFIX ) { 5 PREFIX = /usr /local5 PREFIX = /usr 6 6 } 7 7 8 8 LIBVERSION = 0.18.2 … … 17 17 DEFINES += PREFIX=\"$${PREFIX}\" 18 18 19 19 # Remove for x86-64 20 DEFINES += HAVE_MMX 20 #DEFINES += HAVE_MMX 21 DEFINES += FPM_PPC 21 22 22 23 release { 23 QMAKE_CXXFLAGS_RELEASE = -O3 - march=pentiumpro -fomit-frame-pointer24 QMAKE_CXXFLAGS_RELEASE = -O3 -fomit-frame-pointer 24 25 macx { 25 26 # Don't use -O3, it causes some Qt moc methods to go missing 26 27 QMAKE_CXXFLAGS_RELEASE = -O2