| 1e73885bceac69f2b08987e36aad651c824fbd65 |
|
06-Jun-2017 |
Ram Mohan <ram.mohan@ittiam.com> |
enumerate component input and output port format
add support for index type 'OMX_IndexParamAudioPortFormat'
Test: Small CtsMediaTestCases
Bug: 62723536
Change-Id: Id5134a549eb05fbc5495bccd2123636efd3d5578
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 2dbccf8f9178e138e23a68060cc0680be0ed4289 |
|
15-Jun-2016 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "AAC decoder supports ER-AAC-Scalable"
|
| 87765026fec265d4eae6b298992af28728378e30 |
|
11-Jun-2016 |
Marco Nelissen <marcone@google.com> |
Merge \\\\\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836 am: b232a6be76 am: fa35d94564 am: 96deca7752 am: 12d3f3801d am: 6cd7aa7349
am: 54aaaae60f
Change-Id: Id5109e2f59b2badc596b7cf2729e68b2eb6c2f82
|
| 54aaaae60f248a033ddec8d7333f2d1796ef8f79 |
|
11-Jun-2016 |
Marco Nelissen <marcone@google.com> |
Merge \\\\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836 am: b232a6be76 am: fa35d94564 am: 96deca7752 am: 12d3f3801d
am: 6cd7aa7349
Change-Id: Id252d1cb02445a5881bd48b212e092ac13a3610a
|
| fa35d9456414757565eeee848adff1868b0971a1 |
|
11-Jun-2016 |
Marco Nelissen <marcone@google.com> |
Merge \\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c am: 2b10519836
am: b232a6be76
Change-Id: I7f87144778601d7d0050aeaf741d556058da2f67
|
| b232a6be76eaf9aaa99ec180a6ed2f91fe56429a |
|
11-Jun-2016 |
Marco Nelissen <marcone@google.com> |
Merge \\\"SoftAAC2: fix crash on all-zero adts buffer\\\" into lmp-dev am: 5979fb9ea9 am: 6f16bd8a7c
am: 2b10519836
Change-Id: I52e689739e5b2d0d328b8cfcb3dc346d0f6266f4
|
| 6f16bd8a7c4c5d32751d6796912b8c1605161419 |
|
11-Jun-2016 |
Marco Nelissen <marcone@google.com> |
Merge \"SoftAAC2: fix crash on all-zero adts buffer\" into lmp-dev
am: 5979fb9ea9
Change-Id: Iec42eb1541358d69a2a541ac65efb4c287486bf9
|
| ca88ff028bd66db97157270e933e918ef5877c39 |
|
09-Jun-2016 |
Jean-Michel Trivi <jmtrivi@google.com> |
AAC decoder supports ER-AAC-Scalable
Add OMX_AUDIO_AACObjectER_Scalable in the list of AAC profiles
supported by the FDK AAC decoder wrapper to indicate it supports
ER-AAC-Scalable.
Bug 29221608
Change-Id: Ibef1f868f90f803c92939965def05d7e3217d56f
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 315ac4a8700bc2d8a1da12b94f3a29e887632ce0 |
|
08-Jun-2016 |
Marco Nelissen <marcone@google.com> |
SoftAAC2: fix crash on all-zero adts buffer
Bug: 29153599
Change-Id: I1cb81c054098b86cf24f024f8479909ca7bc85a6
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 5bbb4078e3539675ee46f6b6dff459cbaefd6236 |
|
04-Jun-2016 |
Hangyu Kuang <hkuang@google.com> |
Merge "media: Advertise SoftAAC decoder\'s profiles." into nyc-dev am: 156c6cb4b5
am: 89fdae2dce
* commit '89fdae2dced9f7bfb46e52f5e81d8a4e5bce231d':
media: Advertise SoftAAC decoder's profiles.
Change-Id: I232996f753a14efd23a3e453ebf912905177e890
|
| d18c298df9ce7adf85ef57c8cc7caa6c5c7945fc |
|
03-Jun-2016 |
Chien-Yu Chen <cychen@google.com> |
Merge "Camera3Device: Prepare video stream for high speed" into nyc-dev
am: 156c6cb4b5
* commit '156c6cb4b56c9ecb9116b0aa8f506307da29b764':
media: Advertise SoftAAC decoder's profiles.
Change-Id: I7e55089508a7732cb6ba380bcd0af85f57d55ef0
|
| 89334a07cb379c003f626471e4358d7cef99b00a |
|
03-Jun-2016 |
Hangyu Kuang <hkuang@google.com> |
media: Advertise SoftAAC decoder's profiles.
bug: 29087598
Change-Id: I59325706c133f6a0fb531a66d8225ed17934e6f0
Related-to-bug: 28671284
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 276b60e1be8ed92149411240d95705c642c7531a |
|
19-May-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix misc-macro-parentheses warnings." am: 8a6d716a1e
am: f89b497da8
* commit 'f89b497da89aefbf32b3bdfd62d92c4ca00c4928':
Fix misc-macro-parentheses warnings.
Change-Id: I137b2728a00dbdfdceb44504f4f3f4707c441d93
|
| 183d387706417863076873ec566ca5966d8f5560 |
|
18-May-2016 |
Chih-Hung Hsieh <chh@google.com> |
Fix misc-macro-parentheses warnings.
Bug: 28705665
Change-Id: I9b4b253100cc06a5f37eb3129b0d54991471e382
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 995d39cc23949569ea3a689985812ee923da5d4f |
|
23-Apr-2016 |
Marco Nelissen <marcone@google.com> |
Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into lmp-mr1-dev am: 0822864
am: c90ba30
* commit 'c90ba3056712a9c0ef6383fb00dc3b9c9b0edbc7':
DO NOT MERGE Verify OMX buffer sizes prior to access
Change-Id: I42551c5f62380f422257f80a933ccd301674a041
|
| dfb280d3975afdce4da87602577d2814cb9eb30d |
|
22-Apr-2016 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE More OMX struct checking
These were lost due to bad merges.
Bug: 27207275
Change-Id: Idc7a9fc75376a88b91e9e259d664d6ee54c77330
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 67ef30185837950144d30e5a73d852eb9a7a0a89 |
|
29-Feb-2016 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE Verify OMX buffer sizes prior to access
Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 2386a120998bbdb7a92156891835fc30feac8d7a |
|
06-Apr-2016 |
Jean-Michel Trivi <jmtrivi@google.com> |
Always enable multichannel AAC decoding
There is no need to limit the number of channels at the output
of the decoder.
Bug 25842037
Change-Id: I7b3ba4872c0d990c50662e76c9ff44bcb49a0653
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 743aeb892fb5006c48eec5afd12d0f93a0b7a66b |
|
01-Apr-2016 |
Pawin Vongmasa <pawin@google.com> |
SoftAAC2: Modified conditions for format change notification
after decoding each frame.
Before: The format change notification would not be sent if
mInputBufferCount and mOutputBufferCount do not satisfy
(mInputBufferCount <= 2 || mOutputBufferCount > 1) even when sampleRate
and numChannels are valid and do not match the previous values.
Change: Check sampleRate and numChannels first. If they are valid and
do not match their previous values, the format change notification will
be sent regardless of the values of mInputBufferCount and
mOutputBufferCount. The OMX_EventError will still be sent under the same
condition.
Bug: 27645138
Change-Id: I5499b8495675744e04905c2d94c176fa1ada08e5
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 423766ca07beb7e3e9cd301385708ca13fcce3e1 |
|
29-Feb-2016 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE Verify OMX buffer sizes prior to access
Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| f1a2668f4f09e38722424a6a74f0ea26f49e4110 |
|
29-Feb-2016 |
Marco Nelissen <marcone@google.com> |
DO NOT MERGE Verify OMX buffer sizes prior to access
Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 2720c8b094cfa58de314daa8e5e4fb4fa81fe3b2 |
|
29-Feb-2016 |
Marco Nelissen <marcone@google.com> |
Verify OMX buffer sizes prior to access
Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 883cc24817551459fe72994dcff4fc6f54f88538 |
|
24-Apr-2015 |
Evgenii Stepanov <eugenis@google.com> |
Fix new[] vs delete mismatch.
Detected with AddressSanitizer.
Bug: 18202869
Change-Id: I7fa9ee722766968e33faa4d9312385ca303ca274
(cherry picked from commit a37f84ecce59a0d11a687b55527ccb18d4db7f52)
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 56f3de5e5bf164b36521a3f90033df77e49cfd64 |
|
27-Apr-2015 |
Dan Albert <danalbert@google.com> |
am 33e4119e: am 75781346: Merge "Fix new[] vs delete mismatch."
* commit '33e4119ee1bccb203aa89d417028d9ea9d0720e5':
Fix new[] vs delete mismatch.
|
| a37f84ecce59a0d11a687b55527ccb18d4db7f52 |
|
24-Apr-2015 |
Evgenii Stepanov <eugenis@google.com> |
Fix new[] vs delete mismatch.
Detected with AddressSanitizer.
Bug: 18202869
Change-Id: I7fa9ee722766968e33faa4d9312385ca303ca274
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 434a6094f69542257864b4f4223ce915c77976b1 |
|
08-Mar-2015 |
Chong Zhang <chz@google.com> |
SoftAAC2: reset EOS status after a flush
bug:19656539
Change-Id: I27f41d885f4fd5bb5a0e29510f808fb84a0f75f3
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 0e225c442d8603afb55dc2567a7144ccb675b01e |
|
04-Mar-2015 |
Chong Zhang <chz@google.com> |
SoftAAC2: calculate timestamp from aacSampleRate
bug: 19602975
Change-Id: Ie2e5a61d627980762080c4a8701b578143d123fa
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| ca6630c6065a9c93dde7b08b267c4d18314f935e |
|
16-Oct-2014 |
Marco Nelissen <marcone@google.com> |
Don't signal an error at the end of a short file
Just signaling EOS is sufficient
Bug: 17933838
Change-Id: I04a1af57378115731febe7cacb35af5e55d5db83
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 853bc5a2379a59859795027a9dd4bc11a54b2a5f |
|
09-Dec-2014 |
Lajos Molnar <lajos@google.com> |
am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."
* commit 'f3c253464e0047a28960b27bbee7366d5bd63327':
Cast int64_t values to long long before print.
|
| 12a61347d0f0ba2ee99c1ef7626aeebc39307227 |
|
30-Nov-2014 |
Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> |
Cast int64_t values to long long before print.
So the "%lld" format will not have Clang warnings in 32-bit and
64-bit builds. Alternative is to use PRId64.
Change-Id: I5fafc506fae012748a04ec261af62d9d13475cde
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 5a88501c8f677e34afb2043d7e81d8e09d6fa5f4 |
|
27-Nov-2014 |
Andreas Gampe <agampe@google.com> |
resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp
Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
|
| b3f9759c8c9437c45b9a34519ce2ea38a8314d4e |
|
24-Nov-2014 |
Andreas Gampe <agampe@google.com> |
Stagefright: Fix unused variables, functions, values
For build-system CFLAGS clean-up, remove unused functions and
variables.
Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| b1f5ab447c6b44c810f5e97aeef381c93347a47a |
|
16-Oct-2014 |
Marco Nelissen <marcone@google.com> |
Don't signal an error at the end of a short file
Just signaling EOS is sufficient
Bug: 17933838
Change-Id: I04a1af57378115731febe7cacb35af5e55d5db83
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| c68cc33cd94cfc97c2a7b57955ce18b0ff931f19 |
|
05-Oct-2014 |
Marco Nelissen <marcone@google.com> |
Recover from errors
When the AAC decoder encounters an error, the lists of submitted
and consumed sizes need to be resynchronized, to prevent timestamp
drift.
Bug: 17638652
Change-Id: Ia6d5f48dc36be355803589e4a5796b01559942b8
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| d0b9efe7d8300e48f7a99c1dd746d60060206b3c |
|
01-Oct-2014 |
Chong Zhang <chz@google.com> |
Merge "add AAC audio decoder params for PCM limiter enable" into lmp-dev
|
| 2965f4eb7dceaf1173f0e2d93c11c28293aeead7 |
|
01-Oct-2014 |
Chong Zhang <chz@google.com> |
add AAC audio decoder params for PCM limiter enable
Bug: 17470065
Change-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 4edf384a512748b871f24e4c03afaa3c1151ca23 |
|
25-Sep-2014 |
Marco Nelissen <marcone@google.com> |
Fix SoftAAC2 flush
If there were less than a full frame worth of samples in the ring
buffer, then flush would loop forever trying to empty the ring
buffer.
Bug: 17646525
Change-Id: I68ec87352a91ce3a96d05e9b3f60a6e7975f9156
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| ab7f4182d4d509733107622216db4dd128340185 |
|
19-Sep-2014 |
Marco Nelissen <marcone@google.com> |
Fix ringbuffer handling
Explicitly keep track of the number of samples in the ring buffer,
rather than inferring it from the difference between the read and
write pointer, since the latter cannot distinguish between a
completely full and a completely empty buffer.
Bug: 17582331
Change-Id: I24d16ce96710209b7457ffad7c4c60201451980f
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 229b7a8d7c986645ef7ef75a36f27feb0c1a4117 |
|
19-Sep-2014 |
Marco Nelissen <marcone@google.com> |
Always consider first buffer to be config
for backwards compatibility. Also fix a problem where writing 0
bytes to an empty ringbuffer would treat it as overflowed.
Bug: 17567501
Change-Id: I8019da76466576e1b2984e9eccf09bdec593038a
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 9b7db1c57ff2a3f854568dd61fcec82ff63addeb |
|
17-Sep-2014 |
Marco Nelissen <marcone@google.com> |
Fix null pointer dereference
Bug: 17544813
Change-Id: I6c94cd3056a99bb42fc71ee583938a2e3806fdc7
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| a3d078b02d22ee2329e3778f63974be59296f64f |
|
05-Sep-2014 |
Marco Nelissen <marcone@google.com> |
Fix AAC timestamps for multiple aac frames per input buffer
Support multiple aac frames per input buffer also for non-ADTS streams,
now also works with 5.1 audio.
Bug: 16715379
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 8484830a6b488b41da0e32acacf2e6b68060d9d0 |
|
10-Sep-2014 |
Marco Nelissen <marcone@google.com> |
Revert "Fix AAC timestamps for multiple aac frames per input buffer"
This reverts commit e086387c805311ac87904c3c4d6d4eb08d4b4ee2.
(broke multichannel movie playback)
Bug: 17454025
Change-Id: I95b82359f87f8beca66f35c34b7e125850a44747
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| fa20a1db4be377a004efd756887f8b212e31d670 |
|
05-Sep-2014 |
Marco Nelissen <marcone@google.com> |
Fix AAC timestamps for multiple aac frames per input buffer
Support multiple aac frames per input buffer also for non-ADTS streams.
Bug: 16715379
Change-Id: I84f33d9bb65b6821b2a697f6750356cea98777c4
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 34febc9654ba3b447239b7761ce4c93ca9a20b5f |
|
23-Aug-2014 |
Lajos Molnar <lajos@google.com> |
stagefright: process CSD regardless of what port was last queued
CSD is always on the input port, so it does not matter which port
a buffer was last queued to.
Bug: 17216852
Change-Id: I6d00eb4bf3c2e9b9cc3c9918229de958bc465693
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 5f42113f21c31802e044f0a73351eef35e32feaf |
|
22-Aug-2014 |
Lajos Molnar <lajos@google.com> |
stagefright: allow to resubmit CSDs for SoftAAC2
Bug: 17118001
Change-Id: I45469b9aa6146edf3265b0f05f5ce3592b5daca6
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 143a951f1f19161fa12ca97f3dee85094078365a |
|
21-Aug-2014 |
Robert Shih <robertshih@google.com> |
SoftAAC2: allow reconfiguring output after multiple output buffers
Bug: 17134697
Change-Id: Iaa8bdccbf1a8ccd3f898e48cfd22a0a443710fdd
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 8045853d03649f43ea2f7107e7d2dbb9b2d20855 |
|
02-Aug-2014 |
Jean-Michel Trivi <jmtrivi@google.com> |
AAC decoder: add support for controlling presentation parameters
Control the dowmixing of the AAC decoder
Control the DRC processing of the AAC decoder
Bug 16740915
Change-Id: I9b06ea8785f56213ea120ed85eeb360c88223297
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| a5a103c579d5ecde233e04c00c90f4d15b216f29 |
|
26-Jun-2014 |
Marco Nelissen <marcone@google.com> |
Fix AAC timestamps
When playing an mpeg-2 transport stream with AAC audio, there will be
more than one packet per input buffer, resulting in multiple output
buffers for each input buffers. Additional timestamps needs to be
generated in that case.
b/15755476
Change-Id: I2df50b0cb3690eb36d56871daa1263de0028db06
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| ed83915060af3eaaf62feef2eb2eec1e7d431891 |
|
06-Jun-2014 |
Marco Nelissen <marcone@google.com> |
Remove unneeded code
Change-Id: I33c7424f1858e9f3f7f7ab5fb46db09c2714e02e
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 475300b8ac5438b5037ac088ff599394e9658022 |
|
06-Jun-2014 |
Marco Nelissen <marcone@google.com> |
Make AAC decoder behavior after flush consistent with non-flush
Timestamps don't start at zero, but at least they're consistent.
Change-Id: I2ce9cd60655a4ece787802902b679fda01cb6182
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| d4838ed14a169f5981c0adc2edcb24559a913fe6 |
|
21-May-2014 |
Jean-Michel Trivi <jmtrivi@google.com> |
AAC decoder: compensate limiter delay
Add decoder limiter delay compensation to decoder wrapper
Includes a wrapper function for SoftAAC2.cpp which selects
DRC-related decoder parameters according to information in the bitstream
and desired DRC characteristics for different playback modes.
Bug 9428126
Change-Id: I5041b68760e95cf54073c3addf2b6026b9cfe8c5
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 619fd4d6d4d815065becbdf360422ee40dfa7690 |
|
03-Apr-2014 |
Glenn Kasten <gkasten@google.com> |
Merge commit '52a23bd3' into manualmerge
Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
|
| 66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051 |
|
02-Apr-2014 |
Glenn Kasten <gkasten@google.com> |
64-bit: Correction to OMX_U32 and OMX_S32
Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 08fce45fdb537e135868604522aba15461f516be |
|
20-Sep-2013 |
Marco Nelissen <marcone@google.com> |
Fix aac decoder flush
b/8543366
Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| c71a99131ca97bd3bdc5b78473d06e613e96e073 |
|
29-Aug-2013 |
Marco Nelissen <marcone@google.com> |
Fix decoder EOS handling
Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.
b/8747869
Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 6a9ebb41a8084b73e654a25d97a6ae26ff4166d4 |
|
07-Feb-2014 |
Marco Nelissen <marcone@google.com> |
Fix regression
CTS DecoderTest.testBug11696552 started failing again, and this fixes that
Change-Id: I422c3b249a1d5eb25422573d2106d1f142ccfab6
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| c21623371d947b2c0bf9c4029bcc8d33c590a8ef |
|
18-Dec-2013 |
Jean-Michel Trivi <jmtrivi@google.com> |
Update AAC decoder wrapper to latest FDK API for output channel count
Rename decoder parameter for the maximum number of PCM output channels,
according to FDK AAC decoder interface, as defined in aacdecoder_lib.h
Bug 9428126
Change-Id: I2f0f6ca848bdbc8657d8dea589b03238245c0eaf
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| ca1b3ee97a82a91c650da664ea2f2c47dbfaf621 |
|
20-Sep-2013 |
Marco Nelissen <marcone@google.com> |
Fix aac decoder flush
b/8543366
Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| d089c2540e4f0897c166693f4f13e2023241720e |
|
29-Aug-2013 |
Marco Nelissen <marcone@google.com> |
Fix decoder EOS handling
Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.
b/8747869
Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| b6209a3d4c29bbb88de5a77546f4d545883cc484 |
|
31-Aug-2013 |
Eric Laurent <elaurent@google.com> |
Revert "Fix decoder EOS handling"
This reverts commit 9da36a6c8df70a5c8179ac78fab33cfbb5078cb2.
Bug: 10571297.
Change-Id: I76f20fe34872ea54fce626077462fb86c8c3f02e
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 9da36a6c8df70a5c8179ac78fab33cfbb5078cb2 |
|
29-Aug-2013 |
Marco Nelissen <marcone@google.com> |
Fix decoder EOS handling
Conceptually it should be the same whether EOS is signalled on the last
buffer holding data, or an empty buffer that follows. Make it so that
this actually behaves the same for mp3, AAC and Vorbis.
b/8747869
Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| d94e716af0e49d775f0c0c4f36dd2c136ba5f2b2 |
|
04-Jun-2013 |
Andreas Huber <andih@google.com> |
Fix our software decoders to reset (more of) their internal state
properly on a transition from idle->loaded.
Change-Id: I56ccfeef24c391e50e42b522194206e35c7ab700
related-to-bug: 9105408
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| e42f027d19b20cf581be11a89e26b2c96c50c335 |
|
17-Apr-2013 |
Marco Nelissen <marcone@google.com> |
Make sure the drain buffer is big enough
b/8614909
Change-Id: I9d973dcd74100b793791359c262b821207ff9ddd
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| ff4b1e2b9a7109669ce794692553a2ce14981923 |
|
16-Apr-2013 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Better default AAC DRC setting" into jb-mr2-dev
|
| 0e03e72e7bb2633f5a16c2fe7c164bc3ec8ca855 |
|
16-Apr-2013 |
Jean-Michel Trivi <jmtrivi@google.com> |
Better default AAC DRC setting
By default, use boost and attenuation together.
bug 7140036
Change-Id: Ie0565f9e5cd24f7a59b5a218b4e6186661832601
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 7c5abbb0e1b20df4b265a08a8560899f637f9b44 |
|
15-Apr-2013 |
Marco Nelissen <marcone@google.com> |
Fix AAC decoder reconfiguration
The recent flush() changed made the codec behave differently after
a reconfigure. Now we reset its state properly again.
b/8543366
Change-Id: I8807b5ab02249b43fc1cf315d4e8d4ceb3f9b298
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| f3bd1972e039c6ded5154db715e5a32f1813a239 |
|
09-Apr-2013 |
Marco Nelissen <marcone@google.com> |
Fix MediaCodec.flush()
There were two problems here. One was that the skip/cut buffer
wasn't cleared when it should be, and the second was that we
were always sending the first buffer of encoded data to the AAC
decoder twice.
b/8543366
Change-Id: Ic040edabf16cccd1f6ef8c9e5c9cfbacbdd8a089
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 6fc72b01a3b67903b52f1d33b1ad5c960b5365f1 |
|
18-Dec-2012 |
Marco Nelissen <marcone@google.com> |
Make codecs reconfigurable
Change-Id: I3dd46cb4401493becbf6152f4dcd5a8f1e9a0b44
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 347f35436be724a64272c41e6325f03fe6b9d43a |
|
19-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
AAC DRC reference level for mobile is -16dB
Use -16dB as the default DRC reference level when decoding streams
with DRC metadata.
Bug 7370764
Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 4213e9db1cc57ab593bb63432b4e0cf477c3f835 |
|
02-Oct-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 7170947 Configure AAC decoder for mobile DRC settings
Configure the AAC decoder to use the modile DRC settings when
decoding streams with DRC metadata.
Settings are:
- target reference level of -12dB
- DRC compression factor (attenuation) at max
These settings can be overridden by platform properties if the
default values are to be modified.
Change-Id: If329fe566497685b735abe4e4b9a5e01697c063b
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 888f63bcde37347061de1aabb1b7febb2eca0875 |
|
09-Sep-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix buffer size issue for multichannel HE-AAC
Decoding of HE-AAC fails due to output buffer size being too small.
Size output buffer size according to maximum number of channels.
Change-Id: I6b10842cf7ba3da1f4b4075b1f7f5404bf76be41
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 5696a4efef79ee474ac6bcf2639c741e159bed1b |
|
10-Aug-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix AAC DRC metadata being ignored
The decoder will bypass all DRC processing during decode unless
any of the DRC parameters is set.
The fix consists in setting the DRC reference level to its
default value when after the decoder is initialized.
Change-Id: Ibb8355ab8c3c65020c5eef0752957040f7316c2a
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 51d7547944967d1157b7fe18e1fb8f7ee6810412 |
|
07-Aug-2012 |
Andreas Huber <andih@google.com> |
Only emit padding at the end of the stream in the aac and mp3 decoders
if we actually discarded content at the beginning of the stream.
Change-Id: I1e79835bb3a02350060a137b94f85f2c90f4a12b
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| cc9833b5db0e96f12daddb90a747fd146627377d |
|
30-May-2012 |
James Dong <jdong@google.com> |
Only send port settings changed if the number of channels and sample rate are both known to be valid.
Change-Id: I9f8813eedc95db202488d8860cf485bdb8e69e11
related-to-bug: 6553089
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 503775e4e2c3ead1cbd3c10561e3bdd90f2e70d5 |
|
30-May-2012 |
Dave Burke <daveburke@google.com> |
Precautionary logging to identify a potential infinite loop.
Bug: 6571063
Change-Id: I433659c6da333d5acd25ad03cb7f4a6ab0b6a4a5
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 1adacd921319ec52fac1a4596ab6eaf8689e6a7d |
|
23-May-2012 |
Dave Burke <daveburke@google.com> |
Property to enable AAC 5.1 pass-through.
Bug: 6275957
Change-Id: I8debdce872fc8287a4f6340f1790e02c075886e3
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| e35ac2860e99d809a2ccca59bd4eb2f8c02d15ad |
|
21-May-2012 |
Andreas Huber <andih@google.com> |
Add more verbose ADTS error logging to SoftAAC.
and fix the corresponding code in SoftAAC2.
Change-Id: I6c745fb6e8e093708fdfe2861963b0a35fa7b912
related-to-bug: 6519161
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 8370c7ad4136ad7e0787d5a91ccfa3d63cfbe5cc |
|
18-May-2012 |
Andreas Huber <andih@google.com> |
Instead of asserting on malformed ADTS headers or insufficient data,
stop decoding and signal a runtime error.
Change-Id: Ib66a17a2908273f65a92999951439cc6f0752164
related-to-bug: 6519161
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| bf2461ecc71c0aacf8c03fcdaf0dc46bc8285c7f |
|
18-May-2012 |
Dave Burke <daveburke@google.com> |
Don't reconfigure stream after outputing data.
Handle invalid configuration.
Bug: 6519161
Change-Id: Ib2d38bee769e63e627c93d7f3839c3a55de694e9
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 441fbdea6e46ddc6b99fa864ab1edaa9759ec033 |
|
18-May-2012 |
Dave Burke <daveburke@google.com> |
Robustness - use defaults if we see bogus sample rate / channels from decoder.
Bug: 6498711
Change-Id: I6950d316a292cfd0cb516ee6d95b6af071b08fdc
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 3748b71a7fe73b0365a93f1fd28ced14219f85e5 |
|
18-May-2012 |
Dave Burke <daveburke@google.com> |
Handle stream changes at any point in the stream.
Also, handle discontinuity properly (was using wrong flag before).
Bug: 6498711
Change-Id: I18a6684f7dc96aa04b1e8113b54ec1053895ca98
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| e672a0eea2cdc2ed43e002f0583902f20705de57 |
|
18-May-2012 |
Andreas Huber <andih@google.com> |
Clear the decoder input buffer after it signalled an error to be able to continue.
Change-Id: I06d43723dea7688d63cfb05e7fc7754672788562
related-to-bug: 6419102
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| e893150187191299002626c75232f8985189cb0d |
|
17-May-2012 |
Dave Burke <daveburke@google.com> |
Add informational logging to track 0 channel issue.
Bug #: 6498711
Change-Id: I952777923569511a171fe8b79eab579625eda073
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 26976984d4f882f5da385360e76bc1c29fb4a696 |
|
16-May-2012 |
Dave Burke <daveburke@google.com> |
Add logging for invalid channel count or sample rate.
Change-Id: I2e2145e4b258923cf6c2907106345b7172c12280
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 94f60e297b9e45fac387cf10b6ce1acc067cb4a1 |
|
12-May-2012 |
Dave Burke <daveburke@google.com> |
Remove ASC workaround (now fixed in Franhofer library).
Change-Id: Ia0ce8155def9f6dea85da7f88942ac1b11c16823
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| eb61431af13741aa8b7e57a39f69bba5a6c190dc |
|
11-May-2012 |
Andreas Huber <andih@google.com> |
Increase AAC software decoder's buffer count. Refactor how clients
of ACodec get notified about codec buffers and buffer ids.
Change-Id: I962f873262dae7aa7b43f5f68a6d60268282f91e
related-to-bug: 6478823
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| dc5db5d281d57ff59d92105cf0cd383df3b3c368 |
|
11-May-2012 |
Dave Burke <daveburke@google.com> |
Make decoder more robust to inaccurate ASCs.
Bug: 6408518
Bug: 6463794
Change-Id: Ice4ae327bc53e9d826adce572a2706e045eacd62
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| f60c660f048d5f5e2458cff243c20400d73757a7 |
|
29-Apr-2012 |
Dave Burke <daveburke@google.com> |
Added support for HE-AAC recording
Fixed bug in decoder related to sample rates / channel counts
Made decoder follow Fraunhofer pattern
Log if bitrate not available
Bug: 6275957
Change-Id: I47a8e29358fa4a88ebc73fe02d46a2bfb96c64fe
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 41914becfd019c619783d875c61ef71db0e67400 |
|
26-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Account for new AAC decoder's delay
This drops the first block of decoded samples, and flushes the decoder
at the end of the stream to get the last bit of valid data.
b/774846
Change-Id: I1ae61b3e0619444441d160f33903eb61f57c6d31
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 940335776b6d4eb91b13c4e56bc20bed3ac0011b |
|
26-Apr-2012 |
Dave Burke <daveburke@google.com> |
Handle reconfiguration properly.
Bug 6388957.
Change-Id: I61a86ed6fdad99497535249acda5e4a325911918
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 6b7b8227cc8753fde4094ca8af2d381c2740826f |
|
21-Apr-2012 |
Andreas Huber <andih@google.com> |
Make sure we restore our input buffer to its original state if we want to revisit it.
Change-Id: Iab62562c4dea13520751c37c9448c0b19c82d739
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| 095c2da8d6c2058b02142c940f6e6346d6581780 |
|
13-Apr-2012 |
Dave Burke <daveburke@google.com> |
Make AAC 5.1 work
Fix bug with pausing audio
Change-Id: Icd6b095dac8d1a68b027de853d11ae02cc070b10
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|
| b7ddcc9460f488f0b032aeb27b52a423318a97ea |
|
02-Apr-2012 |
Dave Burke <daveburke@google.com> |
Add support for a new AAC decoder library.
Change-Id: I867bf95f7c20503e55b38d0087ac027647834f37
/frameworks/av/media/libstagefright/codecs/aacdec/SoftAAC2.cpp
|