summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Clean up some makefiles.Dan Albert2014-09-112-6/+1
| | | | | | The build system takes care of these things for you. Change-Id: Ife9605f15786e11d6a3578f56ed83dd9ae7fd799
* Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
|\
| * Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
| | | | | | | | | | | | | | | | | | | | | | The test accepts a .amr file as input and dumps output PCM in a wav file. To run the test, use following command libstagefright_amrnbdec_test <input amr> <output wav> Change-Id: I2492c2ed4e670c9fd8cb4213201ccbd0cb9bf8fe Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \
| * | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size of buffer_handle_t, a pointer type, was assumed to be 4 bytes. This patch uses sizeof(buffer_handle_t) instead. In addition, replaced magic number 4 with sizeof(OMX_U32) Change-Id: Id5a7ed805a7b8e9867d8e51655cd334a66ac2c2b Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-1/+1
| | | | | | | | | | | | | | | Bug: 17048545 Change-Id: I9bb86908177d8c5350124b4f8bee448595eb32a4
* | | Use gettid directly.Elliott Hughes2014-08-181-1/+1
| | | | | | | | | | | | | | | Bug: 17048545 Change-Id: I5ae40c2de1afc2a59f0b28e81c25f0c404368408
* | | Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-073-25/+0
|\ \ \
| * | | Revert "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-083-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3b909164de79904137bb6661514d5ca6236a49c9. Bug: 16853291
* | | | Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-077-0/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-087-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ARM assembly contains a couple of hand-coded PC relative references to data defined in other object files. Make sure the externs are tagged as hidden so the linker knows that it can resolve the reference locally at build time. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com> Bug: 16853291 Change-Id: If7bc8e5bb6a2c63b9df33666d56e6c42f398fd47
* | | | Fix build after side-stepping global -Bsymbolic.Dan Albert2014-08-073-0/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | Some of the assembly in the codecs is generating invalid relocations without -Bsymbolic. Leave it on for these projects for the time being. Bug: 16853291 Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
* | | Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-232-4/+2
|\ \ \
| * | | Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
| | | | | | | | | | | | | | | | | | | | Bug: 15765976 Change-Id: Ib21abe9349bb1863304cd7618d8fc95ca254e8f6
* | | | stagefright: Fix seeking in MPEG4 container - do not mergeLajos Molnar2014-07-224-120/+97
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | - seek based on user-visible timestamp - seek to previous, next and closest exactly - also update OggExtractor seek to same logic Bug: 12786906 Change-Id: I2d5e1fbff6469b6f081a284be2222a4cb50aa754
* | | M3UParser: check for NULL before setting meta dataRobert Shih2014-07-161-0/+6
| | | | | | | | | | | | | | | Bug:16351654 Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772
* | | Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
| | | | | | | | | | | | | | | Bug: 16017037 Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
* | | Merge "h264_enc: Use free() to release memory allocated with malloc()"Narayan Kamath2014-07-101-2/+2
|\ \ \
| * | | h264_enc: Use free() to release memory allocated with malloc()Ashok Bhat2014-06-251-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | mInputFrameData and mSliceGroup are allocated memory with malloc() but released using delete. Changed this to use free() instead. Change-Id: Iecf6684d97fabb2229d9abd94279a24faf9ac2d7 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | Merge "Switch frameworks/av/media/libmedia to the new icu."Elliott Hughes2014-07-091-1/+1
|\ \ \
| * | | Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
| | |/ | |/| | | | | | | Change-Id: I45349756bac6d89b02dba082ba6d606f4c489dcf
* | | m4v_h263_enc: Use uint32_t for ULongAshok Bhat2014-07-024-7/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | ULong is used in the encoder code as 32-bit unsigned integer type. But it has been defined as an unsigned long, which will be 64-bit on 64-bit platforms. This causes many problems including output mismatch between 32-bit and 64-bit code and crash in certain cases. This patch defines ULong as uint32_t. In addition, it uses uintptr_t at places where an address is cast to an integer to check for alignment. Change-Id: I2b0086824a5985b9fc4628ce6fbe81db156e37d2 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | DO NOT MERGE: Fix for SW video decoder OMX profile/level queryXiaosong Wei2014-06-241-3/+4
| | | | | | | | | | | | | | | | | | get the correct profile index from the input param and pass it to profileLevel array to get the corresponding profile/level Change-Id: I582961c0afb53c1781af7fb94226a23e5fdb96cf Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com>
* | libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
| | | | | | | | Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
* | Fix buffer allocationMarco Nelissen2014-06-231-1/+1
| | | | | | | | | | | | b/15293123 Change-Id: Icb3ceabf02a55bc931baaf388ce125db6332de0e
* | Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-101-2/+2
|\ \
| * | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 15424960 bug: 15107693 (cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96) Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
* | | Update OMX messages for 64 bitAndy Hung2014-06-129-148/+234
|/ / | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-114-23/+29
|\ \
| * | Offer a type-safe album art interface.Elliott Hughes2014-06-114-23/+29
| | | | | | | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-102-3/+1
|/ / | | | | | | | | | | | | | | | | | | libstagefright_rtsp uses some MD5 functions that used to be in bionic, but it was removed recently. As an initial fix, I statically linked in libcrypto_static to the libstagefright_rtsp library. However, I think it's better to modify the single user of this library to link against the shared libcrypto library. Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
* | Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
|/ | | | Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
* Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\
| * Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
| | | | | | | | | | | | | | | | | | The unused ARM assembly files were written for legacy proprietary ARM compilers. They are not needed when gcc or clang compiler is used. Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \ | | | | | | | | | | | | * commit '2d0e8d8f75369b491362f2ea3a6efd5159df404c': libcpustats: Turn on -Werror
| * | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
| |/ | | | | | | | | | | | | | | - Switch to static_assert from deprecated utils/Debug.h - Turn on C++11 standard - Turn on -Werror Change-Id: I4f1c08bbcaf1ad3a97502cde756a2f42bcece789
* | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
|\ \ | |/ | | | | | | * commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0': Move frameworks/av off <sys/atomics.h>.
| * Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-221-3/+2
| | | | | | | | | | Bug: 14903517 Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
* | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-1/+1
|\ \ | |/ | | | | | | * commit 'd551633916d3677da4dda10aba6837bdc6803ee0': Move frameworks/av from fdprintf to POSIX dprintf.
| * Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-1/+1
| | | | | | | | | | Bug: 11156955 Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
* | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
|\ \ | |/ | | | | | | * commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe': Move frameworks/av off private API.
| * Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
| | | | | | | | | | Bug: 11156955 Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
* | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
|\ \ | |/ | | | | | | * commit 'd084206d5a4a5364211af46e4201311933e83bfc': Move frameworks/av off __futex_syscall3.
| * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
| | | | | | | | | | Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
* | am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale ↵Andreas Huber2014-05-161-1/+1
|\ \ | |/ | | | | | | | | | | warning" * commit '3059e27d0e18a427f3c19889aac86ea31ec0d5d1': libstagefright foundation: fix uninitialized varibale warning
| * libstagefright foundation: fix uninitialized varibale warningAmit Pundir2014-05-151-1/+1
| | | | | | | | | | | | | | | | gcc-4.9 reports warning for this uninitialized variable and -Werror make this warning fatal. Change-Id: I6901362246d53deeded78fa38ad656b167705346 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
* | am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
|\ \ | |/ | | | | | | * commit 'b231408849158baea8dddc0edf7e97fcfc2e3240': AwesomePlayer: use PTS for queueBuffer
| * Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| |\
| | * AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
| | | | | | | | | | | | Change-Id: I1c14ad4784c799c46cf06a14b0f00c5e4d01f718
* | | am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ \ | |/ / | | | | | | | | | * commit 'b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb': Smooth out AwesomePlayer
generated by cgit v1.1 at 2024-05-02 11:35:40 +0000