summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
Commit message (Collapse)AuthorAgeFilesLines
* am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo ↵Jean-Baptiste Queru2012-08-291-1/+1
|\ | | | | | | | | | | | | before reading info from it" * commit 'bf30787f2694057e775f3b527b649a9f8074237b': avcenc: Don't erase the InputBufferInfo before reading info from it
| * avcenc: Don't erase the InputBufferInfo before reading info from itMartin Storsjo2012-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | Previously, the timestamp and flags were read from the InputBufferInfo struct after it had been erased. This fixes cases where the output timestamp from the avc encoder could spuriously be garbage every now and then. Change-Id: I21acf23cfac93bcc201a603feace6499ec6d8e76
* | am 8d4d590d: am 1e75e972: Merge "avcenc: Update a comment about the inline ↵Jean-Baptiste Queru2012-08-213-6/+3
|\ \ | |/ | | | | | | | | | | assembly" * commit '8d4d590dcbbd2b178976d0bd024625e9d6216365': avcenc: Update a comment about the inline assembly
| * avcenc: Update a comment about the inline assemblyMartin Storsjo2012-08-213-6/+3
| | | | | | | | | | | | | | Since the inline assembly was fixed in commit 3fdb405597f the comment was no longer accurate. Change-Id: Id4f8a111d1fa6e0c2e97f7db64262e8d1604c519
* | am 41ee747f: am 5ebce52c: Merge "avcenc: Fix the gcc inline assembly ↵Jean-Baptiste Queru2012-08-213-17/+17
|\ \ | |/ | | | | | | | | | | constraints" * commit '41ee747fc019eb5856454c698adf23f55073c69e': avcenc: Fix the gcc inline assembly constraints
| * avcenc: Fix the gcc inline assembly constraintsMartin Storsjo2012-08-203-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use +r for registers whose value is used as input to the block. Also switch input registers to output registers with +r, for registers that are modified by the assembly block (SUB_SAD in sad_inline.h). Without this, the inline assembly fails on modern gcc versions (tested on gcc 4.6), where the intended input value never is loaded into the registers, causing segfaults at runtime. Currently this assembly isn't used, but this change makes it work properly if enabled. Change-Id: I37c247cd5c8aff213445e31ab3bd33d8f0f37e05
* | am 894a7e45: am 9e13e927: Merge "avcenc: Properly indent assembly blocks"Jean-Baptiste Queru2012-08-213-18/+108
|\ \ | |/ | | | | | | * commit '894a7e450704b0c7858a2187a5432b479ac69c1d': avcenc: Properly indent assembly blocks
| * avcenc: Properly indent assembly blocksMartin Storsjo2012-08-203-18/+108
| | | | | | | | | | | | | | Also line break multiline assembly blocks - previously they were virtually unreadable. Change-Id: Icb269909b78746e26b28ab7dcb6979c4655a0b0c
* | am add7c4d3: am 46b7eeb8: Merge "hardening: eliminate text relocations from ↵Nick Kralevich2012-08-208-54/+94
|\ \ | |/ | | | | | | | | | | h264" * commit 'add7c4d329586119fb8b5501b049905004400233': hardening: eliminate text relocations from h264
| * Merge "hardening: eliminate text relocations from h264"Nick Kralevich2012-08-208-54/+94
| |\
| | * hardening: eliminate text relocations from h264Ard Biesheuvel2012-08-138-54/+94
| | | | | | | | | | | | Change-Id: I8bdf9746f28f2f7bed6c1109c0f4badbab765a7c
* | | am 3b939a5e: am 02a4ec21: Merge "avcenc: Remove a leftover define"Jean-Baptiste Queru2012-08-201-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit '3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a': avcenc: Remove a leftover define
| * | avcenc: Remove a leftover defineMartin Storsjo2012-08-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This should have been removed as part of f5af6314db, but the second __arm__ define was introduced after the original commit was written, and not removing the second one was an oversight in rebasing the patch on top of the new code. Change-Id: Iccf08ffdef130446dd6e97dc1e15e6a1d4f9386f
* | | am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover ↵Jean-Baptiste Queru2012-08-166-416/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | source files" * commit '523c09d56c78933eea7fb4f028e0bfa595ca82b1': stagefright amrnb: Remove unused leftover source files
| * | Merge "stagefright amrnb: Remove unused leftover source files"Jean-Baptiste Queru2012-08-166-416/+2
| |\ \
| | * | stagefright amrnb: Remove unused leftover source filesMartin Storsjo2012-07-106-416/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows getting rid of adding the plain common directory (not common/include) to the include paths in projects that use this code, too. Change-Id: Ifb1fe4fc1f5c6f1264cb2b64f7b78e42b1e7833a
* | | | am f20e4ad9: am c1d2777c: Merge "stagefright amrnb: Move the ↵Jean-Baptiste Queru2012-08-164-36/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | bitstream_format enum into frame_type_3gpp.h" * commit 'f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a': stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h
| * | | Merge "stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h"Jean-Baptiste Queru2012-08-164-36/+28
| |\ \ \ | | |/ /
| | * | stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.hMartin Storsjo2012-07-104-36/+28
| | | | | | | | | | | | | | | | Change-Id: I6d6f9dc5799750394a853325466ffa2ebec44625
* | | | am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3"Jean-Baptiste Queru2012-08-163-7/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0df213babc4fb41b7daa05cb3c08071f2b60f6a5': hardening: eliminate text relocations from mp3
| * | | Merge "hardening: eliminate text relocations from mp3"Jean-Baptiste Queru2012-08-163-7/+9
| |\ \ \ | | | |/ | | |/|
| | * | hardening: eliminate text relocations from mp3Ard Biesheuvel2012-08-133-7/+9
| | | | | | | | | | | | | | | | Change-Id: I671ed4c8c7bb15172a8b64d513e2844319495102
* | | | am a109e9d5: am b7ca7dc9: Merge "avcenc: Clarify the ifdefs surrounding ↵Jean-Baptiste Queru2012-08-164-4/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | inline assembly" * commit 'a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99': avcenc: Clarify the ifdefs surrounding inline assembly
| * | | Merge "avcenc: Clarify the ifdefs surrounding inline assembly"Jean-Baptiste Queru2012-08-164-4/+12
| |\ \ \
| | * | | avcenc: Clarify the ifdefs surrounding inline assemblyMartin Storsjo2012-07-104-4/+12
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the code was structured like this: #if defined(__GNUC__) && defined(__arm__) /* Generic C implementation */ #elif defined(__CC_ARM) /* RVCT version */ #elif defined(__GNUC__) && defined(__arm__) /* GCC arm assembly version */ #endif This had two implications - the gcc arm version never was used in practice, and the code required -D__arm__ to build at all for other architectures. The inline assembly constraints are buggy (requires changes so as to not crash), and if fixed, the optimizations still aren't faster than the generic C code on modern gcc versions. Therefore, just ignore them and use the generic C code. Due to the peculiar code block ordering and preprocessor conditions, the generic C code is what has been used before anyway, but it did require -D__arm__ to build, which can cause problems if building for other architectures, if the system headers have ifdefs for this define. This change makes it build without that define. Change-Id: Ib3fcf5651ee720310b7dff10fd04279b5f90759c
* | | | am fba9d50d: am 4f981882: Merge "hardening: eliminate text relocations from ↵Jean-Baptiste Queru2012-08-163-6/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | amrwb" * commit 'fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe': hardening: eliminate text relocations from amrwb
| * | | Merge "hardening: eliminate text relocations from amrwb"Jean-Baptiste Queru2012-08-163-6/+12
| |\ \ \ | | | |/ | | |/|
| | * | hardening: eliminate text relocations from amrwbArd Biesheuvel2012-08-133-6/+12
| | | | | | | | | | | | | | | | Change-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62
* | | | am 1191287b: am c3bfa026: Merge "aacenc/amrwbenc: Remove the now unused ↵Jean-Baptiste Queru2012-08-166-11/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | LINUX define" * commit '1191287bc438c164a89cf86704936aeddbefb136': aacenc/amrwbenc: Remove the now unused LINUX define
| * | | aacenc/amrwbenc: Remove the now unused LINUX defineMartin Storsjo2012-08-166-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer used by the codec code (except for the amrwbenc sample). Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
* | | | am eeb9fde0: am 3f5d2e17: Merge "aacenc/amrwbenc: Remove unused and dubious ↵Jean-Baptiste Queru2012-08-161-24/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | typedefs" * commit 'eeb9fde0cb8e0ace44eb720bcac272ee70282d4d': aacenc/amrwbenc: Remove unused and dubious typedefs
| * | | aacenc/amrwbenc: Remove unused and dubious typedefsMartin Storsjo2012-08-161-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These typedefs aren't used anywhere, and their description doesn't really match their actual definition. The VO_TCHAR type is even defined as pointer for one configuration and as non-pointer for another configuration. This gets rid of the last use of the LINUX define in the VO codecs (except for the amrwbenc sample application). Within the codecs, the use of this define is unclear - does it indicate code specific to android but not normal linux, linux but not other unixes, unix but not windows, or gcc but not other compilers, etc. Originally, prior to cleanup, the define has meant many different of these - these uses has now been cleaned up to use the proper feature detection macros (e.g. looking for defines automatically set by the compiler, instead of relying on manually setting this define). Change-Id: I1a675d653d6d305f558aa7f74c7255858dc62758
* | | | Merge "Fix AAC DRC metadata being ignored" into jb-mr1-devJean-Michel Trivi2012-08-131-0/+5
|\ \ \ \
| * | | | Fix AAC DRC metadata being ignoredJean-Michel Trivi2012-08-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 979df012: am 98159acd: Merge "amrnb: Restart the p_xn pointer when ↵Jean-Baptiste Queru2012-08-131-1/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | retraversing the array on overflow" * commit '979df012eb0588ac7f87d5f6e8bff77e2049ee46': amrnb: Restart the p_xn pointer when retraversing the array on overflow
| * | | | Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"Jean-Baptiste Queru2012-08-131-1/+2
| |\ \ \ \
| | * | | | amrnb: Restart the p_xn pointer when retraversing the array on overflowMartin Storsjo2012-07-101-1/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a safeguard to avoid issues in a rare codepath. This was committed on the master branch of the opencore repository in commit f532d145194e474cb30d8644b8eee83873ad24cc, based on AOSP contribution 10905. Change-Id: I9688b009bcbe63d88ee5040e883a021aefa30664
* | | | | am 10004fe6: am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"Jean-Baptiste Queru2012-08-131-1/+1
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit '10004fe612bc38bedc258fd1c380ebccacfa0c1e': amrnb: Fix audio distortion in an AMR-NB clip
| * | | Merge "amrnb: Fix audio distortion in an AMR-NB clip"Jean-Baptiste Queru2012-08-131-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | amrnb: Fix audio distortion in an AMR-NB clipPacketVideo CM2012-07-101-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix had the PacketVideo internal tracking number RIO-9190. This was committed on the master branch of the opencore repository in commit 7d6ccc907d3a15ca2ff74b9c76f122ab87d0ffbe. Change-Id: Icbd7d6fe94e02cae360946cfb6f3b8dc90c8b518
* | | am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant ↵Jean-Baptiste Queru2012-08-082-10/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | zero-initialization of allocated memory" * commit '662b15c377e1ebe6aed8ff5cf82c684f0c8894dc': avcenc: Remove redundant zero-initialization of allocated memory
| * | Merge "avcenc: Remove redundant zero-initialization of allocated memory"Jean-Baptiste Queru2012-08-082-10/+0
| |\ \
| | * | avcenc: Remove redundant zero-initialization of allocated memoryMartin Storsjo2012-07-122-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The allocation callback is now supposed to always return initialized memory. Change-Id: I7a4d036e498c9f87c730dda3aab5057eb764a1e7
* | | | am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by ↵Jean-Baptiste Queru2012-08-082-2/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | the CBAVC_Malloc callback function" * commit '44237a8d58dc218257687f2cbe8fd33d73a713e8': avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
| * | | Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback ↵Jean-Baptiste Queru2012-08-082-2/+5
| |\ \ \ | | |/ / | | | | | | | | function"
| | * | avcenc: Initialize all memory allocated by the CBAVC_Malloc callback functionMartin Storsjo2012-07-122-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Valgrind reported use of uninitialized memory in AVCEncodeSlice, which this fixes. Change-Id: Ia09ad3e50d05b2b0487a4d588d9b00fc0828c816
* | | | am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '68d44b061e92fb6832240457d4f683635bf5328f': avcenc: Remove useless casts
| * | | Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
| |\ \ \
| | * | | avcenc: Remove useless castsMartin Storsjo2012-07-101-2/+2
| | |/ / | | | | | | | | | | | | Change-Id: I73a6f74268bcf6ca22d489d13936be8fd1b3fc92
* | | | am 96d18cca: am 0822156c: Merge "avcenc: Fix indentation"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '96d18cca4546045df118660017e74ddd751dfbb4': avcenc: Fix indentation