summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | | | am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ↵Guang Zhu2014-10-131-21/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat"" into lmp-dev * commit '380757ba5c927015d403e3b97cc418413330453e': Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
| * | | | | | Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" ↵Guang Zhu2014-10-131-21/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| | * | | | | | Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"Guang Zhu2014-10-131-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 fix 64-bit builds This reverts commit 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b. Change-Id: Ifbc499342fb47fd67cae02a79cb900e701caed68
* | | | | | | | am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-101-0/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit 'aec1dbfd10150da3f28b64471b4dc249a58a104e': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-101-0/+21
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-091-0/+21
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: I8eab0acf55df6934e05947b0dbdd1fd456130088
* | | | | | | am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ↵Lajos Molnar2014-10-101-9/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit 'a4c3d8f0f9aab53b106d95e6139e0465908909f4': MediaCodec: fix onError and onInputBufferAvailable
| * | | | | | MediaCodec: fix onError and onInputBufferAvailableLajos Molnar2014-10-091-9/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - don't call onInputBufferAvailable if we created an input surface - keep component name alive if an error occurs Bug: 17934966 Change-Id: I396c6e6cfd9fa589a1a95c6169492089255e6993
* | | | | | am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '5002d02e545dafbcf129b2e5bccf087e765019e5': Recover from errors
| * | | | | Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ \
| | * | | | | Recover from errorsMarco Nelissen2014-10-061-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the AAC decoder encounters an error, the lists of submitted and consumed sizes need to be resynchronized, to prevent timestamp drift. Bug: 17638652 Change-Id: Ia6d5f48dc36be355803589e4a5796b01559942b8
* | | | | | | am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ↵Rachad2014-10-071-1/+28
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback" into lmp-dev * commit '584c14c370f141685b7e8963a13ed91584383ca1': stagefright: do not allocate output buffers for tunneled playback
| * | | | | | Merge "stagefright: do not allocate output buffers for tunneled playback" ↵Rachad2014-10-071-1/+28
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | into lmp-dev
| | * | | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allocate native window buffers for tunneled video playback codecs. Bug: 17112525 Change-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f
* | | | | | | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit '566a6fba127771c752fd40db84f1e7aafa520ea6': Add -no-integrated-as at local level.
| * | | | | | am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'ae38d425fdb3e3fea015c161d635d631172350c3': Add -no-integrated-as at local level.
generated by cgit v1.1 at 2024-05-18 05:22:27 +0000