2504f60434
Remove redundant parentheses around == comparison operator
...
Bug: 28026175
Change-Id: I61be1ab98d7279d09250ea4b810c5f31886da048
2016-08-16 14:06:20 -07:00
2a9da6a10b
Merge "Disable warnings that are not easily fixable" am: 8192b1a am: 2a923c9 am: 00fc1c6
...
am: fb66dce
2016-04-20 23:59:17 +00:00
0d4fdaa2d2
Merge "Add default case for undefined pointer initialization" am: 9d0179c am: 27625f2 am: c3f7cf7
...
am: 0d9ca2d
2016-04-20 23:59:17 +00:00
b9a6836cca
Merge "Left shift of negative int is undefined" am: 6ae5480 am: 2b2e97b am: e34e2b9
...
am: e95a3bd
2016-04-20 23:59:17 +00:00
450151173c
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp am: 2809968
...
am: 18a9bb8
2016-04-20 23:59:17 +00:00
fb66dceae5
Merge "Disable warnings that are not easily fixable" am: 8192b1a am: 2a923c9
...
am: 00fc1c6
2016-04-20 23:44:28 +00:00
0d9ca2d051
Merge "Add default case for undefined pointer initialization" am: 9d0179c am: 27625f2
...
am: c3f7cf7
2016-04-20 23:44:28 +00:00
e95a3bd58f
Merge "Left shift of negative int is undefined" am: 6ae5480 am: 2b2e97b
...
am: e34e2b9
2016-04-20 23:44:27 +00:00
00fc1c66d5
Merge "Disable warnings that are not easily fixable" am: 8192b1a
...
am: 2a923c9
2016-04-20 23:40:45 +00:00
c3f7cf7f1b
Merge "Add default case for undefined pointer initialization" am: 9d0179c
...
am: 27625f2
2016-04-20 23:40:45 +00:00
e34e2b9d54
Merge "Left shift of negative int is undefined" am: 6ae5480
...
am: 2b2e97b
2016-04-20 23:40:45 +00:00
18a9bb8b6d
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp
...
am: 2809968
2016-04-20 23:40:28 +00:00
28099687b7
resolve merge conflicts of ad1e898 to nyc-dev-plus-aosp
...
Change-Id: If143807a233d47fb7fd269fd263a8a898109b060
2016-04-20 16:28:31 -07:00
2a923c9286
Merge "Disable warnings that are not easily fixable"
...
am: 8192b1a
2016-04-20 19:00:07 +00:00
27625f2706
Merge "Add default case for undefined pointer initialization"
...
am: 9d0179c
2016-04-20 19:00:06 +00:00
2b2e97b893
Merge "Left shift of negative int is undefined"
...
am: 6ae5480
2016-04-20 19:00:06 +00:00
ad1e8985d9
Merge "Remove redundant parentheses around == comparison operator"
...
am: 34fb053
2016-04-20 19:00:06 +00:00
8192b1a98f
Merge "Disable warnings that are not easily fixable"
2016-04-20 18:45:30 +00:00
9d0179c8a8
Merge "Add default case for undefined pointer initialization"
2016-04-20 18:45:18 +00:00
6ae54806ab
Merge "Left shift of negative int is undefined"
2016-04-20 18:45:09 +00:00
34fb05353b
Merge "Remove redundant parentheses around == comparison operator"
2016-04-20 18:44:59 +00:00
7342ab6568
Merge "Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 am: 9000e05228" into nyc-mr1-dev-plus-aosp
...
am: 268c63c4a5
2016-04-19 01:39:13 +00:00
41f5029091
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 am: be845a7fc2
...
am: e0700da0dd
2016-04-19 01:39:13 +00:00
268c63c4a5
Merge "Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9 am: 9000e05228" into nyc-mr1-dev-plus-aosp
2016-04-19 01:37:05 +00:00
e0700da0dd
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9
...
am: be845a7fc2
2016-04-19 01:37:00 +00:00
a5d2c03f7b
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a am: 9d4702f2d9
...
am: 9000e05228
2016-04-19 01:37:00 +00:00
be845a7fc2
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a
...
am: 9d4702f2d9
2016-04-19 01:34:40 +00:00
9000e05228
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01 am: 0cf3a7671a
...
am: 9d4702f2d9
2016-04-19 01:34:40 +00:00
9d4702f2d9
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f am: d110691d01
...
am: 0cf3a7671a
2016-04-19 01:32:26 +00:00
0cf3a7671a
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75 am: 1de50b286f
...
am: d110691d01
2016-04-19 01:30:15 +00:00
d110691d01
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241 am: 7147e71a75
...
am: 1de50b286f
2016-04-19 01:27:53 +00:00
1de50b286f
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871 am: 6318d60241
...
am: 7147e71a75
2016-04-19 01:25:09 +00:00
7147e71a75
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9 am: 0a20959871
...
am: 6318d60241
2016-04-19 01:00:01 +00:00
6318d60241
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638 am: 78653b30e9
...
am: 0a20959871
2016-04-19 00:57:44 +00:00
0a20959871
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f am: 1a54e8f638
...
am: 78653b30e9
2016-04-19 00:55:30 +00:00
78653b30e9
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425 am: b762ff3e4f
...
am: 1a54e8f638
2016-04-19 00:53:17 +00:00
1a54e8f638
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d am: be3ff35425
...
am: b762ff3e4f
2016-04-19 00:50:57 +00:00
b762ff3e4f
Fix aacDecoder_drcExtractAndMap() am: 97a1b8140d
...
am: be3ff35425
2016-04-19 00:48:42 +00:00
be3ff35425
Fix aacDecoder_drcExtractAndMap()
...
am: 97a1b8140d
2016-04-19 00:46:26 +00:00
32db3a45df
Disable warnings that are not easily fixable
...
Bug: 28026175
Change-Id: I6e9cfcd9efeb853caee01b54b241f24e64cf1e94
2016-04-18 16:11:27 -07:00
1dd7649666
Add default case for undefined pointer initialization
...
Bug: 28026175
Change-Id: I1b149bf1573296df18abbe44f737bd87ab3913f9
2016-04-18 16:11:16 -07:00
4bd4510b19
Left shift of negative int is undefined
...
Bug: 28026175
Change-Id: I9dc851b818262e95711033bdc03b7b7f30cff133
2016-04-18 16:11:01 -07:00
76b428d4b4
Remove redundant parentheses around == comparison operator
...
Bug: 28026175
Change-Id: I8ff9d8d1dd73933dc181f2745292a0a3398a2479
2016-04-18 16:10:57 -07:00
97a1b8140d
Fix aacDecoder_drcExtractAndMap()
...
Parse DVB DRC data only when numThreads is below
MAX_DRC_THREADS. The post-increment is necessary as
it is used in fill element DRC data section.
This solution parses as many DRC payloads as allowed by
MAX_DRC_THREADS and skips all remaining DRC elements in the stream.
Bug 27792766
Bug 26751339
Change-Id: Ie1641888bac1757c4d1491119f977fc5d436eaea
2016-04-15 08:14:50 -07:00
3b6fe4a90f
AAC/SBR decoder improvements and bugfixes am: 203e3f2
...
am: 3fbcee8
2016-04-09 05:44:33 +00:00
4a5a256a01
AAC/SBR encoder improvements am: 46ba367
...
am: 125815b
2016-04-09 05:44:33 +00:00
3fbcee8020
AAC/SBR decoder improvements and bugfixes
...
am: 203e3f2
2016-04-09 00:36:07 +00:00
125815b0ed
AAC/SBR encoder improvements
...
am: 46ba367
2016-04-09 00:36:07 +00:00
203e3f28fb
AAC/SBR decoder improvements and bugfixes
...
* AAC-Decoder
- Add support for AOT 20 (ER-AAC scalable) (base layer only)
- Add support for AAC as used in Digital Radio Mondiale (DRM30/DRM+)
Modified file(s):
libAACdec/src/aacdecoder.cpp
libAACdec/src/aacdecoder_lib.cpp
libFDK/src/FDK_core.cpp
libFDK/src/FDK_tools_rom.cpp
libMpegTPDec/src/tpdec_asc.cpp
libMpegTPDec/src/tpdec_lib.cpp
libMpegTPDec/src/version
libSBRdec/include/sbrdecoder.h
libSBRdec/src/env_extr.h
libSBRdec/src/sbrdecoder.cpp
Added file(s):
libMpegTPDec/src/tpdec_drm.cpp
libMpegTPDec/src/tpdec_drm.h
- Fix sanity check in HCR module that was performed at the wrong point in time.
Modified file(s):
libAACdec/src/aacdecoder_lib.cpp
libAACdec/src/block.cpp
- Extend core sampling rate support up to 96 kHz.
Modified file(s):
libAACdec/src/aac_rom.cpp
libAACdec/src/aacdecoder.cpp
libAACdec/src/aacdecoder_lib.cpp
- Return correct audio output channel description according number of output
channels.
Modified file(s):
libAACdec/src/aacdecoder_lib.cpp
- Indroduce decoder intern output buffer. This change allows to use framework
output buffer with the actual size of the deocder output channels.
Modified file(s):
libAACdec/include/aacdecoder_lib.h
libAACdec/src/aacdecoder.h
libAACdec/src/aacdecoder_lib.cpp
* SBR-Decoder
- Increase robustness for erroneous input data.
- Improve error concealment performance.
- Fix handling of lowest sub-band for LD-SBR
Modified file(s):
libAACdec/src/aacdecoder.cpp
libAACdec/src/aacdecoder_lib.cpp
libSBRdec/src/env_calc.cpp
libSBRdec/src/env_dec.cpp
libSBRdec/src/env_extr.cpp
libSBRdec/src/env_extr.h
libSBRdec/src/sbr_dec.cpp
libSBRdec/src/sbr_rom.cpp
libSBRdec/src/sbr_rom.h
libSBRdec/src/sbrdecoder.cpp
- Add QMF delay compensation for ELD v2 streams decoded with the complex
low delay filter-bank.
Modified file(s):
libSBRdec/src/sbr_dec.cpp
libSBRdec/src/sbr_dec.h
libSBRdec/src/sbrdecoder.cpp
- Introduce a different handling of frames to be flushed
dependent on whether there are delayed frames available or not.
Modified file(s):
libSBRdec/src/sbr_ram.h
libSBRdec/src/sbrdecoder.cpp
- Calculate the correct number of samples for dual-mono copy in case of no
available PS data.
Modified file(s):
libSBRdec/src/sbrdecoder.cpp
* SYS-Library
- Change include order of genericStds.h to prevent conflict with definitions
which are also used in math.h.
Modified file(s):
libSYS/src/genericStds.cpp
Change-Id: I3ecffbad85f39b056213107955cfadbeb3f4b6e1
2016-04-08 19:10:30 +00:00
46ba3676b8
AAC/SBR encoder improvements
...
* AAC-Encoder
- AAC-ELD core encoder audio quality tuning. Update tuning tables, configure
bitreservoir size and adapt afterburner iteration value.
Modified file(s):
libAACenc/src/aacenc.h
libAACenc/src/aacenc_lib.cpp
libAACenc/src/adj_thr.cpp
libAACenc/src/adj_thr.h
libAACenc/src/adj_thr_data.h
libAACenc/src/bandwidth.cpp
libAACenc/src/pnsparam.cpp
libAACenc/src/qc_main.cpp
- Introduze dead zone quantizer for ELD to improve audio quality at certain
configurations.
Modified file(s):
libAACenc/src/aacenc_lib.cpp
libAACenc/src/adj_thr.cpp
libAACenc/src/adj_thr.h
libAACenc/src/qc_data.h
libAACenc/src/qc_main.cpp
libAACenc/src/quantize.cpp
libAACenc/src/quantize.h
libAACenc/src/sf_estim.cpp
libAACenc/src/sf_estim.h
- Revise TNS module to improve ELD audio quality.
- Use new window function and separate prediction gain according TNS filters.
- Add missing memory initilization to TNS configuration.
Modified file(s):
libAACenc/src/aacenc_lib.cpp
libAACenc/src/aacenc_tns.cpp
libAACenc/src/aacenc_tns.h
libAACenc/src/psy_main.cpp
libAACenc/src/tns_func.h
* SBR-Encoder
- Revise frequency resolution calculation and handle differently depending
on number of envelopes and split frames decision.
- Add and adjust ELD SBR tuning tables.
Modified file(s):
libSBRenc/include/sbr_encoder.h
libSBRenc/src/bit_sbr.h
libSBRenc/src/env_est.cpp
libSBRenc/src/fram_gen.cpp
libSBRenc/src/fram_gen.h
libSBRenc/src/mh_det.cpp
libSBRenc/src/sbr_def.h
libSBRenc/src/sbr_encoder.cpp
libSBRenc/src/sbr_rom.cpp
libSBRenc/src/tran_det.cpp
- Replace ELD transient detector with fast implementation.
Modified file(s):
libSBRenc/src/env_est.cpp
libSBRenc/src/env_est.h
libSBRenc/src/fram_gen.cpp
libSBRenc/src/sbr_def.h
libSBRenc/src/sbr_encoder.cpp
libSBRenc/src/tran_det.cpp
libSBRenc/src/tran_det.h
* FDK-Library
- Introduce generic compare function in tools library.
Modified file(s):
libFDK/include/fixpoint_math.h
libFDK/src/FDK_core.cpp
* SBR-Encoder
- Revise ELD frame splitter to improve bit distribution.
Modified file(s):
libSBRenc/include/sbr_encoder.h
libSBRenc/src/bit_sbr.h
libSBRenc/src/env_est.cpp
libSBRenc/src/fram_gen.cpp
libSBRenc/src/fram_gen.h
libSBRenc/src/sbr_encoder.cpp
libSBRenc/src/tran_det.cpp
libSBRenc/src/tran_det.h
- Configure amplitude resolution according the tonality of the audio signal.
Modified file(s):
libSBRenc/include/sbr_encoder.h
libSBRenc/src/bit_sbr.h
libSBRenc/src/env_est.cpp
libSBRenc/src/nf_est.cpp
libSBRenc/src/nf_est.h
libSBRenc/src/sbr_def.h
libSBRenc/src/sbr_encoder.cpp
libSBRenc/src/ton_corr.cpp
libSBRenc/src/ton_corr.h
libSBRenc/src/tran_det.cpp
libSBRenc/src/tran_det.h
Change-Id: Ie0672b989a06ee63b50240616b8d1d4b790b6cb2
2016-04-08 10:52:42 -07:00
Glenn Kasten
Glenn Kasten
Jean-Michel Trivi
Android Build Merger (Role)