wrapper/libxaac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimisation changes in ixheaacd_samples_sat

Browse source 
Changed 64-bit operations used for saturating the
output pcm to 32 bit operations targeted towards
32-bit/armv7 architecture.

Bug: 154143053
Test: xaacdec

Change-Id: I3914f5a92feee592626fb53ca7e24b60dda59db4
This commit is contained in:
Sushanth Patil 2019-10-29 10:41:29 +05:30 • committed by Ray Essick
parent 05c7402a06
commit 92bec05d2d
2 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
decoder/ixheaacd_constants.h
View file

@ -63,6 +63,9 @@
#define MAX_16 (WORD16)0x7fff #define MAX_16 (WORD16)0x7fff
#define MIN_16 (WORD16)0x8000 #define MIN_16 (WORD16)0x8000
#define MAX_24 (WORD32)0x007fffff
#define MIN_24 (WORD32)0xff800000
#define NULLPTR ((VOID *)0) #define NULLPTR ((VOID *)0)
#define IT_NULL ((VOID *)0) #define IT_NULL ((VOID *)0)

32
decoder/ixheaacd_decode_main.c
View file

@ -20,6 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "ixheaacd_type_def.h" #include "ixheaacd_type_def.h"
#include "ixheaacd_constants.h"
#include "ixheaacd_error_standards.h" #include "ixheaacd_error_standards.h"
#include "ixheaacd_memory_standards.h" #include "ixheaacd_memory_standards.h"
#include "ixheaacd_sbrdecsettings.h" #include "ixheaacd_sbrdecsettings.h"
@ -69,7 +70,7 @@ VOID ixheaacd_samples_sat(WORD8 *outbuffer, WORD32 num_samples_out,
WORD32 *out_bytes, WORD32 num_channel_out) { WORD32 *out_bytes, WORD32 num_channel_out) {
WORD32 num; WORD32 num;
WORD32 i; WORD32 i;
WORD64 write_local; FLOAT32 sample;
WORD16 *out_buf = (WORD16 *)outbuffer; WORD16 *out_buf = (WORD16 *)outbuffer;
@ -77,31 +78,30 @@ VOID ixheaacd_samples_sat(WORD8 *outbuffer, WORD32 num_samples_out,
if (pcmsize == 16) { if (pcmsize == 16) {
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
write_local = sample = (out_samples[i % num_channel_out][i / num_channel_out]);
((WORD64)(out_samples[i % num_channel_out][i / num_channel_out]));
if (write_local > 32767) { if (sample > MAX_16) {
write_local = 32767; sample = MAX_16;
} else if (sample < MIN_16) {
sample = MIN_16;
} }
if (write_local < -32768) { out_buf[i] = (WORD16)sample;
write_local = -32768;
}
out_buf[i] = (WORD16)write_local;
} }
*out_bytes = num * sizeof(WORD16); *out_bytes = num * sizeof(WORD16);
} else { } else {
WORD8 *out_24bit = (WORD8 *)out_buf; WORD8 *out_24bit = (WORD8 *)out_buf;
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
write_local = ((WORD64)( WORD32 write_local;
out_samples[i % num_channel_out][i / num_channel_out] * 256)); sample = (out_samples[i % num_channel_out][i / num_channel_out] * 256);
if (write_local > 8388607) { if (sample > MAX_24) {
write_local = 8388607; sample = MAX_24;
} } else if (sample < MIN_24) {
if (write_local < -8388608) { sample = MIN_24;
write_local = -8388608;
} }
write_local = (WORD32)sample;
*out_24bit++ = (WORD32)write_local & 0xff; *out_24bit++ = (WORD32)write_local & 0xff;
*out_24bit++ = ((WORD32)write_local >> 8) & 0xff; *out_24bit++ = ((WORD32)write_local >> 8) & 0xff;
*out_24bit++ = ((WORD32)write_local >> 16) & 0xff; *out_24bit++ = ((WORD32)write_local >> 16) & 0xff;