summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary stagefright noticesJean-Baptiste Queru2012-07-2648-4848/+0
| | | | | | They now live in frameworks/media Change-Id: Ic8b457c422359f260d6a1fed8c499b74aa9c6491
* Merge "Update notice files for libstagefright codecs."Jean-Baptiste Queru2012-05-0648-0/+4848
|\
| * Update notice files for libstagefright codecs.David Deephanphongs2012-03-1348-0/+4848
| |
* | Deleted the media, camera, drm related files since they are relocatedJames Dong2012-03-281552-447154/+0
| | | | | | | | Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
* | Provisional support for secure decryption of media streams.Andreas Huber2012-03-262-3/+47
| | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | Support gapless playback for mp3 and m4aMarco Nelissen2012-03-222-6/+20
| | | | | | | | | | | | | | | | | | Gapless playback for appropriately tagged mp3 and m4a files. Currently this is implemented in OMXCodec, which most players use, but should be easy to support in other players as well by using the SkipCutBuffer utility class. Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
* | Merge "ACodec is a little more aggressive in its error checking now."Andreas Huber2012-03-162-2/+16
|\ \
| * | ACodec is a little more aggressive in its error checking now.Andreas Huber2012-03-162-2/+16
| |/ | | | | | | | | | | Update components to do the right thing. Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
* | Remove obsolete software codec header files and amr encoders.Andreas Huber2012-03-164-552/+0
|/ | | | Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-1213-20/+20
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright ↵Conley Owens2012-03-091-4/+0
|\ | | | | | | | | | | | | amrwbenc: Simplify the definition of static_vo" * commit 'ea374096511f92206c264f3f1eb0551a05a34cd5': stagefright amrwbenc: Simplify the definition of static_vo
| * am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the ↵Conley Owens2012-03-091-4/+0
| |\ | | | | | | | | | | | | | | | | | | definition of static_vo" * commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04': stagefright amrwbenc: Simplify the definition of static_vo
| | * Merge "stagefright amrwbenc: Simplify the definition of static_vo"Conley Owens2012-03-091-4/+0
| | |\
| | | * stagefright amrwbenc: Simplify the definition of static_voMartin Storsjo2012-01-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For GCC, all of inline, __inline and __inline__ work fine. For MSVC, only __inline works. (__inline should also be accepted by RVCT.) Change-Id: Ifbb1c848b200a8c4080624a3d3bd8b6ee498edb2
* | | | 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
| * | | am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * commit '972efafb90b543eea51aa5b23104d469a1bcc1fb': 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
* | | | resolved conflicts for merge of 532679a5 to masterDirk Dougherty2012-03-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
| * | | am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219': Doc change: String changes for Android Market
| | * | Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| | | | | | | | | | | | | | | | Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
* | | | 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 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: ↵Jean-Baptiste Queru2012-02-283-4/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid C++/C99 for loops with variable declaration" * commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58': stagefright amr: Avoid C++/C99 for loops with variable declaration
| * | | | | Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"Jean-Baptiste Queru2012-02-273-4/+6
| |\ \ \ \ \
| | * | | | | stagefright amr: Avoid C++/C99 for loops with variable declarationMartin Storsjo2012-02-273-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the code compileable in C89 mode, too. Change-Id: I9b76f8bfca148d1aec6081b8db139f351d64cfed
* | | | | | | 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 360db46e: am b7913f70: am 163777b8: am 354ac772: Merge "stagefright ↵Jean-Baptiste Queru2012-02-273-13/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | amrwb: Make local const arrays static" * commit '360db46e78a1492b695d5be6e779386dc66a502e': stagefright amrwb: Make local const arrays static
| * | | | | | | Merge "stagefright amrwb: Make local const arrays static"Jean-Baptiste Queru2012-02-273-13/+13
| |\ \ \ \ \ \ \
| | * | | | | | | stagefright amrwb: Make local const arrays staticMartin Storsjo2012-02-243-13/+13
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of these tables exist in both the amrnb and amrwb libraries, but with different content. This avoids some cases of multiple definitions of symbols, if linking in both libraries statically into the same executable, if the libraries are built as C. (As C++, the local symbols get mangled so they don't conflict with the external C symbols in amrnb, that are unmangled.) Most of this was committed on the master branch of the opencore repository in commit 0cd4b3ac412dd0a8370ce339e89cf346c6cfe395, based on AOSP contribution 10016. Change-Id: I5387e699ce54a56dc43fcfa0396dee5c99280fd9
* | | | | | | | am 5ba910d8: am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | amrwb: Change a C++ style cast into a C style cast" * commit '5ba910d867d029e69c4f52667c02a4c114f849df': stagefright amrwb: Change a C++ style cast into a C style cast
| * | | | | | | Merge "stagefright amrwb: Change a C++ style cast into a C style cast"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | stagefright amrwb: Change a C++ style cast into a C style castMartin Storsjo2012-02-241-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes compilation as C - while the source files are named .cpp, they actually are compileable as pure C (except for this cast). This was committed on the master branch of the opencore repository in commit ae27d9b2ef68c4e6fc383a8cab93d6baa235ff6b, based on AOSP contribution 10014. Change-Id: I4f533313be041ad3e0a03ffc5f4207480894ddd1
* | | | | | | am b205a5d8: am 50ee92e9: am d91b744d: am f7f1280e: Merge changes ↵Jean-Baptiste Queru2012-02-2729-67/+93
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ib4e27ea3,I4ad55266,Ie32b32c7 * commit 'b205a5d861c5ba31599084a42c7d92549f464dac': stagefright amrnb: Remove extern from table definitions stagefright amrnb: Add includes for prototype declarations of tables stagefright amrnb: Add missing const qualifier to table declarations in headers
| * | | | | | Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7Jean-Baptiste Queru2012-02-2729-67/+93
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright amrnb: Remove extern from table definitions stagefright amrnb: Add includes for prototype declarations of tables stagefright amrnb: Add missing const qualifier to table declarations in headers
| | * | | | | | stagefright amrnb: Remove extern from table definitionsMartin Storsjo2012-02-2424-62/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local prototype declarations are added where no suitable ones are available in headers. This fixes warnings when compiling as C - while the source files are named .cpp, they actually are compileable as pure C. This was committed on the master branch of the opencore repository in commit a0acb494ea6682ca966b5ebbd3676c89c56d63a6, based on AOSP contribution 10303. Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
| | * | | | | | stagefright amrnb: Add includes for prototype declarations of tablesMartin Storsjo2012-02-2415-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was committed on the master branch of the opencore repository in commit da3d0463c999871ee584a0d750be65be65d19b00, based on AOSP contribution 10302. Change-Id: I4ad5526634efecc2d2bb3d2169184b8d4d4d7671
| | * | | | | | stagefright amrnb: Add missing const qualifier to table declarations in headersMartin Storsjo2012-02-245-5/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was committed on the master branch of the opencore repository in commit 5ce7a6fdf125116ffce2e692e14eafef1c807628, based on AOSP contribution 10301. Change-Id: Ie32b32c7407f449e382c0b4fd2d60a664e0daa33
* | | | | | | 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
generated by cgit v1.1 at 2024-09-10 14:50:00 +0000