summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific ↵Jean-Baptiste Queru2012-02-271-0/+6
| |\ | | | | | | | | | | | | | | | | | | implementations of functions" * commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e': 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
| * | | am 354ac772: Merge "stagefright amrwb: Make local const arrays static"Jean-Baptiste Queru2012-02-273-13/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '354ac772eca0afea25dd12d233e5cdee9677888b': 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
| * | | am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C ↵Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | style cast" * commit '695cfe1e1e189f176fdf994f72d05a0129a66394': 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
| * | | am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7Jean-Baptiste Queru2012-02-2729-67/+93
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | * commit 'f7f1280e0c71d64098efb42b58a922d056164b5e': 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
| * | | am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"Jean-Baptiste Queru2012-02-271-3/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1a864db7723a7947b72d24e6008ba48341d0feff': 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 6b4d7bad: am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | amrwbenc: Remove a useless check" * commit '6b4d7bada0b1d34f93149211cb179b71c864d5d3': stagefright amrwbenc: Remove a useless check
| * | | | am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '77576ff487e227092cdaf09db163e21f1e07604a': stagefright amrwbenc: Remove a useless check
| | * | | Merge "stagefright amrwbenc: Remove a useless check"Jean-Baptiste Queru2012-02-271-1/+1
| | |\ \ \
| | | * | | stagefright amrwbenc: Remove a useless checkMartin Storsjo2012-02-241-1/+1
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Length field is unsigned, the comparison will always be false. The corresponding code in the aac encoder doesn't have any check for Length. This avoids a warning about comparison always being false. Change-Id: I57c28ff9d09cb9ac4effeaeb40db608ab976acc6
* | | | | 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
| * | | | am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'be9a705586edafcedc9fabb94d3259f882b7cbd7': 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 484fc74b: am 4bcdeb86: am 716a0517: am fe5f5d77: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | amrwb: Make a global const array static" * commit '484fc74beb79d0b8d49223cb3fce9e1ccbfd3501': stagefright amrwb: Make a global const array static
| * | | | am fe5f5d77: Merge "stagefright amrwb: Make a global const array static"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f': stagefright amrwb: Make a global const array static
| | * | | Merge "stagefright amrwb: Make a global const array static"Jean-Baptiste Queru2012-02-271-1/+1
| | |\ \ \
| | | * | | stagefright amrwb: Make a global const array staticMartin Storsjo2012-02-241-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes compilation as C - while the source files are named .cpp, they actually are compileable as pure C. Prior to this, this table produced multiple definitions of the same symbol. This was committed on the master branch of the opencore repository in commit a803bd49a631317e0d52ff060cf1799f7741a47e, based on AOSP contribution 10017. Change-Id: Id76274964242b119ab61b8181e557477df1e1521
* | | | | am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | amrwbenc: Change keyword ordering" * commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0': stagefright amrwbenc: Change keyword ordering
| * | | | am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"Jean-Baptiste Queru2012-02-271-2/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '94ee1bf232d1f1cc97902dab1e4148eb478cd304': stagefright amrwbenc: Change keyword ordering
| | * | | Merge "stagefright amrwbenc: Change keyword ordering"Jean-Baptiste Queru2012-02-271-2/+2
| | |\ \ \
| | | * | | stagefright amrwbenc: Change keyword orderingMartin Storsjo2012-02-241-2/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids warnings about 'static' not being at the beginning of the declarations. Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
* | | | | 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
| * | | | am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a ↵Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Word16 pointer" * commit '5aff259c61e54e441ed04bf77e3cc69a0374432d': 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
* | | | fix libgui header locationMathias Agopian2012-02-2715-28/+9
| | | | | | | | | | | | | | | | Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
* | | | remove dependency on android_native{s_priv|buffer}.hMathias Agopian2012-02-242-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
* | | | Merge "Make sure we return input/output buffers to the codec not just while"Andreas Huber2012-02-241-2/+2
|\ \ \ \
| * | | | Make sure we return input/output buffers to the codec not just whileAndreas Huber2012-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flushing but also while stopping. Change-Id: I23534008b93654c9b9c022c0b1d204c2b546d566
* | | | | 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
| * | | | am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits ↵Jean-Baptiste Queru2012-02-242-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | unsigned" * commit '6a300a5413898ff8b728e77c5a23290cae60e9b5': 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-242-2/+2
| | |\ \ \
| | | * | | stagefright aacenc: Make the bits to write in WriteBits unsignedMartin Storsjo2012-01-132-2/+2
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | They shouldn't, as far as I know, ever be a signed value. Change-Id: I64429c7c0b2b52bec768a04d3c3eb0eb252955fa
generated by cgit v1.1 at 2024-05-27 16:57:37 +0000