danog/libtgvoip
1
0
Fork 0
mirror of https://github.com/danog/libtgvoip.git synced 2025-01-22 13:01:21 +01:00
Code Issues Projects Releases Wiki Activity

Backported WebRTC upstream patch with Big Endian support.

Browse Source 
Backported Fedora patch by Than Ngo with PowerPC and aarch64 build fixes.

Signed-off-by: Vitaly Zaitsev <vitaly@easycoding.org>
This commit is contained in:
Vitaly Zaitsev 2018-12-21 14:00:35 +01:00
parent fed3bb73ee
commit 243acfa6a5
No known key found for this signature in database
GPG Key ID: BF99FC6DD45AB90A
4 changed files with 94 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc_dsp/common_audio/wav_file.cc
View File

@ -93,9 +93,6 @@ size_t WavReader::num_samples() const {
}
size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) {
#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
#error "Need to convert samples to big-endian when reading from WAV file"
#endif
// There could be metadata after the audio; ensure we don't read it.
num_samples = std::min(num_samples, num_samples_remaining_);
const size_t read =
@ -104,6 +101,12 @@ size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) {
RTC_CHECK(read == num_samples || feof(file_handle_));
RTC_CHECK_LE(read, num_samples_remaining_);
num_samples_remaining_ -= read;
#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
//convert to big-endian
for(size_t idx = 0; idx < num_samples; idx++) {
samples[idx] = (samples[idx]<<8) | (samples[idx]>>8);
}
#endif
return read;
}
@ -178,10 +181,17 @@ size_t WavWriter::num_samples() const {
void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) {
#ifndef WEBRTC_ARCH_LITTLE_ENDIAN
#error "Need to convert samples to little-endian when writing to WAV file"
#endif
int16_t * le_samples = new int16_t[num_samples];
for(size_t idx = 0; idx < num_samples; idx++) {
le_samples[idx] = (samples[idx]<<8) | (samples[idx]>>8);
}
const size_t written =
fwrite(le_samples, sizeof(*le_samples), num_samples, file_handle_);
delete []le_samples;
#else
const size_t written =
fwrite(samples, sizeof(*samples), num_samples, file_handle_);
#endif
RTC_CHECK_EQ(num_samples, written);
num_samples_ += written;
RTC_CHECK(num_samples_ >= written); // detect size_t overflow

34
webrtc_dsp/common_audio/wav_header.cc
View File

@ -86,7 +86,39 @@ static inline std::string ReadFourCC(uint32_t x) {
return std::string(reinterpret_cast<char*>(&x), 4);
}
#else
#error "Write be-to-le conversion functions"
static inline void WriteLE16(uint16_t* f, uint16_t x) {
*f = ((x << 8) & 0xff00) | ( ( x >> 8) & 0x00ff);
}
static inline void WriteLE32(uint32_t* f, uint32_t x) {
*f = ( (x & 0x000000ff) << 24 )
| ((x & 0x0000ff00) << 8)
| ((x & 0x00ff0000) >> 8)
| ((x & 0xff000000) >> 24 );
}
static inline void WriteFourCC(uint32_t* f, char a, char b, char c, char d) {
*f = (static_cast<uint32_t>(a) << 24 )
| (static_cast<uint32_t>(b) << 16)
| (static_cast<uint32_t>(c) << 8)
| (static_cast<uint32_t>(d) );
}
static inline uint16_t ReadLE16(uint16_t x) {
return (( x & 0x00ff) << 8 )| ((x & 0xff00)>>8);
}
static inline uint32_t ReadLE32(uint32_t x) {
return ( (x & 0x000000ff) << 24 )
| ( (x & 0x0000ff00) << 8 )
| ( (x & 0x00ff0000) >> 8)
| ( (x & 0xff000000) >> 24 );
}
static inline std::string ReadFourCC(uint32_t x) {
x = ReadLE32(x);
return std::string(reinterpret_cast<char*>(&x), 4);
}
#endif
static inline uint32_t RiffChunkSize(size_t bytes_in_payload) {

24
webrtc_dsp/rtc_base/system/arch.h
View File

@ -47,8 +47,30 @@
#elif defined(__pnacl__)
#define WEBRTC_ARCH_32_BITS
#define WEBRTC_ARCH_LITTLE_ENDIAN
#elif defined(__powerpc64__)
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define WEBRTC_ARCH_LITTLE_ENDIAN
#else
#error Please add support for your architecture in typedefs.h
#define WEBRTC_ARCH_BIG_ENDIAN
#endif
#define WEBRTC_ARCH_64_BITS
#elif defined(__powerpc__)
#define WEBRTC_ARCH_BIG_ENDIAN
#define WEBRTC_ARCH_32_BITS
#else
/* instead of failing, use typical unix defines... */
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define WEBRTC_ARCH_LITTLE_ENDIAN
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define WEBRTC_ARCH_BIG_ENDIAN
#else
#error __BYTE_ORDER__ is not defined
#endif
#if defined(__LP64__)
#define WEBRTC_ARCH_64_BITS
#else
#define WEBRTC_ARCH_32_BITS
#endif
#endif
#if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))

24
webrtc_dsp/typedefs.h
View File

@ -47,8 +47,30 @@
#elif defined(__pnacl__)
#define WEBRTC_ARCH_32_BITS
#define WEBRTC_ARCH_LITTLE_ENDIAN
#elif defined(__powerpc64__)
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define WEBRTC_ARCH_LITTLE_ENDIAN
#else
#error Please add support for your architecture in typedefs.h
#define WEBRTC_ARCH_BIG_ENDIAN
#endif
#define WEBRTC_ARCH_64_BITS
#elif defined(__powerpc__)
#define WEBRTC_ARCH_BIG_ENDIAN
#define WEBRTC_ARCH_32_BITS
#else
/* instead of failing, use typical unix defines... */
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define WEBRTC_ARCH_LITTLE_ENDIAN
#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
#define WEBRTC_ARCH_BIG_ENDIAN
#else
#error __BYTE_ORDER__ is not defined
#endif
#if defined(__LP64__)
#define WEBRTC_ARCH_64_BITS
#else
#define WEBRTC_ARCH_32_BITS
#endif
#endif
#if !(defined(WEBRTC_ARCH_LITTLE_ENDIAN) ^ defined(WEBRTC_ARCH_BIG_ENDIAN))