summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacenc
Commit message (Collapse)AuthorAgeFilesLines
* warnings be gone.Andreas Huber2014-04-113-4/+3
| | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* 64-bit: Correction to OMX_U32 and OMX_S32Glenn Kasten2014-04-021-2/+2
| | | | Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
* libstagefright is no longer 32 bit only.Narayan Kamath2014-03-191-1/+0
| | | | Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b Signed-off-by: Glenn Kasten <gkasten@android.com>
* mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+1
| | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
* AAC encoder: handle missing object typesJean-Michel Trivi2013-08-291-0/+4
| | | | | | | | | The audio object type for parametric stereo and lowdelay was not passed to the FDK AAC encoder. Bug 9428126 Change-Id: Ic32822afff8b1da6a2d80c1b65d514f24059fb29
* am e63f850b: am da0dc0af: Add liblogYing Wang2013-04-091-2/+2
|\ | | | | | | | | * commit 'e63f850b179a43a344d438f202ad34ec7566f955': Add liblog
| * Add liblogYing Wang2013-04-091-2/+2
| | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | am b41c9a03: am a5761dcb: Fix a number of warnings in stagefright code.Andreas Huber2013-04-041-1/+1
|\ \ | |/ | | | | | | * commit 'b41c9a03b7a7ca4244f68fd26b2f9d41b66f038a': Fix a number of warnings in stagefright code.
| * Fix a number of warnings in stagefright code.Andreas Huber2013-04-041-1/+1
| | | | | | | | Change-Id: If3edd00d991851797aeccdfe795a4a405e3a2ea3
* | Turn off debug tags in stagefright modules.Dan Morrill2013-03-191-1/+1
|/ | | | | | | | | LOCAL_MODULE_TAGS := debug causes the module to be included in every userdebug build, regardless of whether it's specified as a dep by the device config. This CL switches them all to optional (i.e. default behavior) so that we can do (userdebug) device builds without pulling these in. Change-Id: I4b7b65afea61865dd38b3af55550fb8f10edf66d
* aacenc: Mark some global arrays constMartin Storsjo2012-09-093-3/+3
| | | | | | This gets rid of initialized writeable data in the library. Change-Id: I7c1cbeb3df10c302b645b7311591ead87a289ca1
* aacenc/amrwbenc: Remove the now unused LINUX defineMartin Storsjo2012-08-162-4/+0
| | | | | | | This is no longer used by the codec code (except for the amrwbenc sample). Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ↵James Dong2012-06-134-0/+380
|\ | | | | | | | | | | | | /frameworks/av/" into jb-dev * commit 'e20435de10f63af812da9d4f801b61a8817733a0': Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-134-0/+380
| | | | | | | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* | am 10cf121f: Merge "Update make file" into jb-devDave Burke2012-06-121-2/+1
|\ \ | |/ | | | | | | * commit '10cf121f7285e23c37264dab3bad7cffefd754b1': Update make file
| * Update make fileDave Burke2012-06-121-2/+1
| | | | | | | | Change-Id: I7dbd128245f584df2689457df0dd12ce888cf8ef
* | stagefright aacenc: Move system headers before local headersMartin Storsjo2012-06-111-1/+4
| | | | | | | | | | | | | | This avoids issues with the encoder's own definition of __inline, which conflicts with headers brought in by string.h in glibc. Change-Id: I9e3fbf8d892529940ea67a46e67a9abe71d9c5fa
* | stagefright aacenc: Add parentheses in expression with mixed && and ||Martin Storsjo2012-06-081-2/+2
| | | | | | | | | | | | | | | | | | This doesn't maintain the exact behaviour, but seems closer to what the original author probably intended. This avoids a warning. Change-Id: I191292faa0a25f715f2b7d46ec770827e2ac0b7b
* | stagefright aacenc: Fix reading out of bounds in pow2_xyMartin Storsjo2012-05-251-2/+2
|/ | | | | | | | | This fixes cases where x was a large number, causing fPart to exceed the 32 bit signed integer range (while fitting in an unsigned 32 bit integer), making the table index a negative number. Change-Id: I674047db65f89148a93d218c138b42cd8305f80e
* Revert "Revert to PV for AAC codec for FactoryROM."Dave Burke2012-05-211-2/+2
| | | | | | This reverts commit d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444. Change-Id: I7076feab31ab64fccd364699280d821011edc099
* Revert to PV for AAC codec for FactoryROM.Dave Burke2012-05-211-2/+2
| | | | Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5
* Added support for HE-AAC recordingDave Burke2012-04-301-7/+24
| | | | | | | | | 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
* Add Fraunhofer AAC encoder with AAC-ELD support.Dave Burke2012-04-253-16/+683
| | | | Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
* AV Android make files changesJames Dong2012-03-281-6/+6
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-2/+2
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* am 3557654c: am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes ↵Conley Owens2012-03-091-2/+2
|\ | | | | | | | | | | | | | | I00c852e4,Ib31bf028 * commit '3557654c95bae7754dcd1951ec10742b895817e2': stagefright aacenc: Avoid overflows when calculating normFactor stagefright aacenc: Avoid a division by zero
| * Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| |\ | | | | | | | | | | | | | | | * changes: stagefright aacenc: Avoid overflows when calculating normFactor stagefright aacenc: Avoid a division by zero
| | * stagefright aacenc: Avoid overflows when calculating normFactorMartin Storsjo2012-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | normFactor is calculated using the saturating L_add function, but if the value added (*psfbPeFactors) is negative, the sum can end up negative. *psfbPeFactors can end up negative if redThrExp is less than *psfbNActiveLines. In cases where *psfbPeFactors ended up negative, normFactor became INT_MIN, causing division by zero later. Change-Id: I00c852e457b22f7eef4d6ed1887629828057206b
| | * stagefright aacenc: Avoid a division by zeroMartin Storsjo2012-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rare cases, the result of normFactor * (*psfbNActiveLines) could be zero, leading to a division by zero in pow2_xy. In these cases, normFactor was INT_MIN, and if *psfbNActiveLines was 2, the product was zero. normFactor being INT_MIN is a bug in itself though. Change-Id: Ib31bf02889615a7be3bd1bc028da8a7651a8dbee
* | | am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes ↵Jean-Baptiste Queru2012-03-013-14/+43
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | I46c81dba,If1f40e9c,I652eaaa5 * commit '9de7793b425be89889412f3a86466d7b19055c3c': stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| * | Merge changes I46c81dba,If1f40e9c,I652eaaa5Jean-Baptiste Queru2012-02-293-14/+43
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| | * | stagefright aacenc: Use QDADD/QDSUB instructionsMans Rullgard2012-01-131-4/+2
| | | | | | | | | | | | | | | | Change-Id: I46c81dba0486d515f1f2b89a13fae27f6ab1e122
| | * | stagefright aacenc: Remove useless inline asm for simple right shiftMans Rullgard2012-01-131-7/+1
| | | | | | | | | | | | | | | | Change-Id: If1f40e9c16952182e974af1c86a14995259c2ade
| | * | stagefright aacenc: Use ARMv6 SSAT instructionMans Rullgard2012-01-133-3/+40
| | | | | | | | | | | | | | | | Change-Id: I652eaaa54e7766d9dca80fd8cc156ca481359471
* | | | am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright ↵Jean-Baptiste Queru2012-03-011-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | aacenc: Safeguard against overwriting bits" * commit '715c78b933f8dec04882ebb73acd61fdd42c6c64': stagefright aacenc: Safeguard against overwriting bits
| * | | Merge "stagefright aacenc: Safeguard against overwriting bits"Jean-Baptiste Queru2012-02-291-0/+1
| |\ \ \
| | * | | stagefright aacenc: Safeguard against overwriting bitsMartin Storsjo2012-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if bits above the lowest noBitsToWrite were set, they would be ORed into the previous cache word, setting unrelated bits erroneously. This doesn't noticeably affect the performance of the codec as a whole. Change-Id: Ie9935533c4299b8f07cb14485f039a9be9c84016
* | | | | am 19bb6261: am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | aacenc: Add prototypes for arm specific implementations of functions" * commit '19bb62613f512b62d492fb4caf36de88fd1914dd': stagefright aacenc: Add prototypes for arm specific implementations of functions
| * | | | Merge "stagefright aacenc: Add prototypes for arm specific implementations ↵Jean-Baptiste Queru2012-02-271-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | of functions"
| | * | | | stagefright aacenc: Add prototypes for arm specific implementations of functionsMartin Storsjo2012-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arm specific functions are implemented in .s files, without any function declarations in headers. This fixes compiler warnings about implicit declarations of these functions. Change-Id: I1512560b6740c1879f378886e05aaad2e3a6c869
* | | | | | am 18a64b74: am a887ff9a: am 4f74be57: am 1a864db7: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-3/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacenc: Simplify the definition of __inline" * commit '18a64b74aa3cb0babb5f50e5f80660f601d80123': stagefright aacenc: Simplify the definition of __inline
| * | | | | Merge "stagefright aacenc: Simplify the definition of __inline"Jean-Baptiste Queru2012-02-271-3/+1
| |\ \ \ \ \
| | * | | | | stagefright aacenc: Simplify the definition of __inlineMartin Storsjo2012-01-131-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the amount of ifdefs needed, into something that works on both gcc and MSVC. This removes one occurrance of the LINUX ifdef, simplifying compiling on various platforms. Change-Id: I1e2af6c2517410dc280197ba922df877cf7afbd5
* | | | | | | am 2bf76b98: am 3e61e413: am 32901b39: am be9a7055: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacenc: Remove a stray semicolon" * commit '2bf76b983da1d1730d685f9907d5d4fa6ea46fcd': stagefright aacenc: Remove a stray semicolon
| * | | | | | Merge "stagefright aacenc: Remove a stray semicolon"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ \ \
| | * | | | | | stagefright aacenc: Remove a stray semicolonMartin Storsjo2012-02-241-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids warnings about an empty body in an if statement. mem_free does the same null check, so the accidental extra semicolon was harmless, and the whole if statement actually is needless. But if removing the if statements, all the other ones should be removed too, for consistency. (This could be done as a separate change). Change-Id: I1b6064dedd15ffa949043bb5396148aaed9b43f6
* | | | | | | am 5b299d2f: am 18643e70: am 6bc542e0: am 5aff259c: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacenc: Don\'t address a Word32 with a Word16 pointer" * commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a': stagefright aacenc: Don't address a Word32 with a Word16 pointer
| * | | | | | Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | stagefright aacenc: Don't address a Word32 with a Word16 pointerMartin Storsjo2012-01-131-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, a pointer to a Word32 is used as a pointer to Word16, which doesn't work as intended on big endian architectures. This change needs to be analyzed and tested properly so that it doesn't cause issues with overflows in these variables. Another solution would be to change all the scf arrays to 32 bit instead. Change-Id: I53d9eb83bdaf8d3b1530eb5064dd10b08bce737a
* | | | | | am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright ↵Jean-Baptiste Queru2012-02-242-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacenc: Make the bits to write in WriteBits unsigned" * commit 'ed7e1e830165678421ee7d1b3dac044214a6e635': stagefright aacenc: Make the bits to write in WriteBits unsigned
generated by cgit v1.1 at 2024-05-30 19:07:37 +0000