summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/aacenc/src
Commit message (Collapse)AuthorAgeFilesLines
* Stagefright: Fix unused variablesAndreas Gampe2014-12-041-1/+1
| | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. These variables are unused in aarch64. Bug: 18632512 Change-Id: I6ae41f64e721a0f3188f0ee045a734b366ee72a6
* Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-259-90/+9
| | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* Remove extraneous parenthesesBernhard Rosenkränzer2014-11-181-1/+1
| | | | | | | Remove extraneous parentheses - they cause compiler warnings in clang Change-Id: Ie2efd9714f9e2251cf3b204b5c5dd1a8b8aaca13 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* warnings be gone.Andreas Huber2014-02-117-9/+25
| | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* aacenc: Mark some global arrays constMartin Storsjo2012-09-092-2/+2
| | | | | | This gets rid of initialized writeable data in the library. Change-Id: I7c1cbeb3df10c302b645b7311591ead87a289ca1
* 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
* 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 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 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-241-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | aacenc: Make the bits to write in WriteBits unsigned" * commit 'ed7e1e830165678421ee7d1b3dac044214a6e635': stagefright aacenc: Make the bits to write in WriteBits unsigned
| * | | | Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"Jean-Baptiste Queru2012-02-241-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | stagefright aacenc: Make the bits to write in WriteBits unsignedMartin Storsjo2012-01-131-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | They shouldn't, as far as I know, ever be a signed value. Change-Id: I64429c7c0b2b52bec768a04d3c3eb0eb252955fa
* | | | am 15278119: am 61022b06: am 5f83b957: am bf45bbf3: Merge "stagefright ↵Jean-Baptiste Queru2012-02-241-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | aacenc: Zero-initialize a struct" * commit '1527811984557ee0b5d6e476e84ed147e073cb45': stagefright aacenc: Zero-initialize a struct
| * | | Merge "stagefright aacenc: Zero-initialize a struct"Jean-Baptiste Queru2012-02-241-0/+2
| |\ \ \
| | * | | stagefright aacenc: Zero-initialize a structMartin Storsjo2012-01-131-0/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | This avoids using uninitialized data in some cases, according to valgrind. Change-Id: I2eb5242b93c4d83a1cf6a15f022ec9579e0742a4
* | | | am 4de803c7: am 459df4ef: am e7650c32: am e5bdd24b: Merge "stagefright ↵Jean-Baptiste Queru2012-02-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | aacenc: Avoid warnings about incompatible pointer types" * commit '4de803c76d4afd0f542c086b555b71729b3c5796': stagefright aacenc: Avoid warnings about incompatible pointer types
| * | | Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"Jean-Baptiste Queru2012-02-241-1/+1
| |\ \ \
| | * | | stagefright aacenc: Avoid warnings about incompatible pointer typesMartin Storsjo2012-01-301-1/+1
| | | |/ | | |/| | | | | | | | | Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
* | | | am 307f47aa: am 7e8b65df: am 7ffa4546: am 47b56c5a: Merge "stagefright ↵Jean-Baptiste Queru2012-02-245-8/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | aacenc: Add const declarations to some pointers" * commit '307f47aa5def85d0c0bb4af725ff557707c5be86': stagefright aacenc: Add const declarations to some pointers
| * | | Merge "stagefright aacenc: Add const declarations to some pointers"Jean-Baptiste Queru2012-02-245-8/+9
| |\ \ \ | | |/ / | |/| |
| | * | stagefright aacenc: Add const declarations to some pointersMartin Storsjo2012-01-185-8/+9
| | |/ | | | | | | | | | | | | | | | This avoids some compilation warnings. Change-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36
* | | Preserve NEON callee-save registers d8-d15.Ben Cheng2012-01-263-3/+30
|/ / | | | | | | | | BUG:5918479 Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
* | Merge "stagefright aacenc: Add missing newlines at the end of files"Jean-Baptiste Queru2012-01-249-9/+9
|\ \
| * | stagefright aacenc: Add missing newlines at the end of filesMartin Storsjo2012-01-139-9/+9
| |/ | | | | | | | | | | This avoids compiler warnings about missing newlines. Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
* | stagefright aacenc: Properly terminate a commentMartin Storsjo2012-01-131-1/+1
|/ | | | | | This avoids a warning about /* within a comment. Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
* stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-1234-3499/+3499
| | | | | | | | | | | | | | This was applied in AOSP master earlier, in commit b21611e5b0f1797e39e781d91ade023bac87637f, but when merged into the Google internal tree in 88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these changes have been brought in. (The diff of this merge commit and its first parent, d94b71d, is empty.) Therefore, reapply the rest of these changes on the files that still are present in the current version. Change-Id: I645a9b9134769958a11808a06163123d28d83e46
* am e5143d6c: am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright ↵Conley Owens2011-07-181-1/+1
|\ | | | | | | | | | | | | aacenc: Mark codeWord as UWord16" * commit 'e5143d6c09f0e9a960661a2b0a5916c33fcafc4d': stagefright aacenc: Mark codeWord as UWord16
| * Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
| |\
| | * stagefright aacenc: Mark codeWord as UWord16Martin Storsjo2011-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, the codeword 0xffff will be expanded to 0xffffffff when passed as a Word32 parameter. All code words set into this variable are UWord16 initially. When it was expanded to 0xffffffff, it could accidentally overwrite earlier cached bits in the bitstream writer. Change-Id: Id91a2b8a4e934876d9cb39eaeeee323202ec8e40
* | | am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright ↵Deckard Autoverifier2011-07-181-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | aacenc: Make the mem_malloc function 64-bit safe" * commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9': stagefright aacenc: Make the mem_malloc function 64-bit safe
| * | Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"Deckard Autoverifier2011-07-181-2/+7
| |\ \ | | |/ | |/|
| | * stagefright aacenc: Make the mem_malloc function 64-bit safeMartin Storsjo2011-06-221-2/+7
| | | | | | | | | | | | Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
| * | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-2334-3499/+3499
| |/ | | | | | | Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
| * stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-2334-4869/+4869
| | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | Convert line breaks to Unix styleMans Rullgard2011-05-2134-4869/+4869
|/ | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* Initial software encoder checkinsJames Dong2010-05-1935-0/+14646
Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60