summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* Fix AAC recording issueMarco Nelissen2014-12-101-1/+2
| | | | | | | | Fix uninitialized variable that caused ADTS recording to incorrectly specify LTP object in the header. Bug: 17895547 Change-Id: I75650f4963f4f371cd191bc635e32c9ab17fa8c9
* Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
| | | | | | Clang complains about mismatch of argument type and print format. Change-Id: Ib07da09d8b1b62b3018033f9eaf7aa01bf7f7f9c
* Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0936-97/+97
|\
| * Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2736-97/+97
| | | | | | | | | | | | | | | | | | This removes the deprecated register keyword in many places, fixes one instance of passing '\0' where a char* is expected, and 2 switch type narrowing issues. Change-Id: Ie265ac26ff6a61267ad6406dfe237226d97ca9ac Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
|\ \
| * | Cast int64_t values to long long before print.Bernhard Rosenkränzer2014-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | So the "%lld" format will not have Clang warnings in 32-bit and 64-bit builds. Alternative is to use PRId64. Change-Id: I5fafc506fae012748a04ec261af62d9d13475cde Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
|/ / | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. These variables are unused in aarch64. Bug: 18632512 Change-Id: I6ae41f64e721a0f3188f0ee045a734b366ee72a6
* | Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
|\ \ | | | | | | | | | OutputPortSettingsChangedState"
| * | libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I9719f1698bf411914eb753d3c349a15b9fbf9df6 Signed-off-by: Per Persson <per.persson@intel.com> Signed-off-by: Persson, Mikael <mikael.persson@intel.com> Signed-off-by: Fagerstedt, Axel <axel.fagerstedt@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | Merge "Added support for YEAR metadata key from VorbisComments"Glenn Kasten2014-12-011-0/+1
|\ \ \ | |_|/ |/| |
| * | Added support for YEAR metadata key from VorbisCommentsAndreas Lillvik2014-11-111-0/+1
| |/ | | | | | | | | | | | | | | The OggExtractor wasn't extracting the YEAR key when the metadata in the file was parsed. The YEAR key is now extracted when the file metadata is parsed. Change-Id: Idf0d1a37fb141491dce5de527703ca1b27f621e7
* | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2643-241/+95
|\ \
| * | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-2543-241/+95
| | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* | | Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
|\ \ \
| * | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An overloaded function should take the same parameters as the function it is overloading. Change-Id: I8327fe1b363917515cf76c8f76bdbc05b2c0fbf0 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In C++11 mode, clang errors out on the register keyword. Change-Id: I034ba5815e37e3ff5e017551977e97b8516123e8 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Remove forward declarations of MediaBuffer -- they're not needed because MediaBuffer.h is included earlier in the file anyway, and they incorrectly declared MediaBuffer as a struct instead of a class. Change-Id: Ia35ea8f938553e39244032b6fd6c061aa388859f Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
| | | | | | | | | | | | Change-Id: Ie2fef95a45dd124572bf062011a272898a371924
* | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
|\ \ \
| * | | Remove check for an impossible conditionBernhard Rosenkraenzer2014-10-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offset_for_ref_frame is an array rather than a pointer - it can't be NULL (and the check causes a warning in clang). Change-Id: I9b96e1e723e3b8caebd41821137ed6fb669d8cd4 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
|\ \ \ \
| * | | | C++11 compatibility.Dan Albert2014-11-201-4/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix string literal concatenation to not be interpreted as UD literals. * Add constexpr compatibility for non-integral static members. * Use __typeof__ instead of typeof (should become decltype once this actually becomes C++11). * Add an appropriate cast for atomic_uintptr_t, since moving to C++11 means moving from <stdatomic.h> to <atomic>, which has better typechecking (hooray for not macros!). Bug: 18466763 Change-Id: I9561dcb2526578687819ff85421ba80d8e1a9694
* | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Remove extraneous parentheses that cause compiler warnings in clang Change-Id: I88a3d84738433db85e4a04b673f82da7b0b1be10 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \
| * | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extraneous parentheses - they cause compiler warnings in clang Change-Id: Ie2efd9714f9e2251cf3b204b5c5dd1a8b8aaca13 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | In the case of !(err == OK && !mCancelled), sdpSize is used uninitialized. Change-Id: I33c6365ca6df13b0051491771d3eee3e35346b6d Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-179-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-175-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | libstagefright: use __predict_false from bionic rather than CONDITION from ↵Mark Salyzyn2014-11-111-1/+1
| |/ |/| | | | | | | | | log/log.h Change-Id: Ieb07a4f58c96326553e87dacca11e3980e283dc8
* | Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
| | | | | | | | Change-Id: I3c105b7e2736ade22de0bb12f396859816b3adf7
* | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
|\ \ | | | | | | | | | | | | * commit '8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2': Add -no-integrated-as at local level.
| * \ am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| |\ \ | | | | | | | | | | | | | | | | * commit '589a89f5a2a9aa08bdd9b78727f608f2f178f107': Add -no-integrated-as at local level.
| | * | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I5d95ef260c097961cb2bf2f15155572c2b24cb0e
* | | | am c40da54b: Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'c40da54b34138856446e79245ac45600191962b5': Fix freed memory references
| * \ \ \ Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
| |\ \ \ \
| | * | | | Fix freed memory referencesMarco Nelissen2014-10-161-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4Source references memory owned by MPEG4Extractor, and therefore an MPEG4Extractor needs to be kept around as long as the MPEG4Sources obtained from it exist. Bug: 17890354 Change-Id: I399e18ec78517559ccc0914ffc7e099687c0ba51
* | | | | | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '447898bca790fae2fdae304073162e980d816b79': ACodec: only check crop rect on output port
| * | | | | Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ \ \ \
| | * | | | | ACodec: only check crop rect on output portLajos Molnar2014-10-071-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17789956 Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a
* | | | | | | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-1410-362/+454
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I760286b72fe1ebda3e8b058ca2138cb97fbdb7e1
| * | | | | | stagefright: fix surface input handling of software encodersLajos Molnar2014-10-1310-349/+456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added SoftVideoEncoder for common color conversion and extension handling logic - fix YUV420 SemiPlanar handling that should be NV12 not NV21 Bug: 17935149 Change-Id: I9b8d05678b1862dd37bf349ea83d67bdf1bb5560
* | | | | | | am 512e9792: stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-144-21/+75
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '512e979284de984427e5b2f73b9054ae1b5e2b0a': stagefright: support passing GraphicBuffer in metadata buffer
| * | | | | | stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-134-21/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935149 Change-Id: I6bb5dd654e498a7153410afc052c2c8f7f35e44d
* | | | | | | am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-132-1/+34
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit '801a3ff80c36aa9b55dc9b360d0e59f863011a39': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-132-1/+34
| |\ \ \ \ \ \
| | * | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-132-1/+34
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: Id09190ae813aa9e00a3c1ef6fb8a1bd3021deb6e
* | | | | | | am 7225187b: Merge "ACodec: process deferred messages when entering Loaded ↵Wei Jia2014-10-131-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state." into lmp-dev * commit '7225187b5126b921e40f0221db158a16c366344e': ACodec: process deferred messages when entering Loaded state.
| * | | | | | Merge "ACodec: process deferred messages when entering Loaded state." into ↵Wei Jia2014-10-131-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | lmp-dev
| | * | | | | ACodec: process deferred messages when entering Loaded state.Wei Jia2014-10-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17792260 Change-Id: Ie8154cf41be5672fc8a9f3a2a82b7ede0a8b828f