summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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 "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
|\ \
| * | Use standard syntax to initialize fields.Chih-Hung Hsieh2014-11-141-712/+712
| | | | | | | | | | | | | | | | | | | | | Clang compiler gives warning to old gnu syntax. BUG: 18193625 Change-Id: I1b5237d60866fc357fc808f6a6955ab20418a7d8
* | | 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>
* | | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
| | | | | | | | | | | | Change-Id: I79f9a53b95dcf84dff62ed4b3c0661c7c1e1fc64
* | | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
|\ \ \
| * | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1711-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-2/+0
|/ / / | | | | | | | | | Change-Id: Ib91ff0696ab2472c62168eb5261bbda5d22f623e
* | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1727-77/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
|/ / | | | | | | | | Bug: 15193147 Change-Id: If59c4a53a497f501881d26d58b80b11371906527
* | 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
* | Resolve conflictThe Android Open Source Project2014-11-06358-10568/+34032
|\ \
| * \ am 686a0c4d: Merge "MTP Device: Parse USB3 descriptor for MTP initor;"Mike Lockwood2014-10-291-0/+9
| |\ \ | | | | | | | | | | | | | | | | * commit '686a0c4db5e90b811b1fbe1dba3638522ef4b7a1': MTP Device: Parse USB3 descriptor for MTP initor;
| * \ \ am d5923409: mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-212-1/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'd5923409bbcbb22954a92c2b497ef4492d7cb6a5': mediaplayer: limit scheduling video frames into the future
| | * | | mediaplayer: limit scheduling video frames into the futureLajos Molnar2014-10-202-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses when video timestamps jumps before an audio timestamp, but still works on slideshow video clips (<=1fps). This, however, will not skip time-changes on video-only live video streams, as we cannot distinguish live slideshow video clips from non-slideshow ones. Bug: 18032127 Change-Id: I959a714edfe1c8cf3b84704c693dcd1b3e5b7855
| * | | | am eecb7805: NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-212-36/+48
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'eecb7805bbbb712925d4372c505f8c7f5c4fb5ed': NuPlayer: set anchor time for each audio buffer.
| | * | | NuPlayer: set anchor time for each audio buffer.Ronghua Wu2014-10-202-36/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And use anchor time to compute current position Bug: 17999949 Bug: 18008307 Bug: 18032127 Change-Id: Ie493c9a1d45d7b788aef65d863f710da6326fcc1
| * | | | am e9234f17: Merge "Fix AudioTrack retrograde getPosition when restoring ↵Andy Hung2014-10-171-1/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | tracks" into lmp-dev * commit 'e9234f17dfbb192c96b122b9e0ce8cd9015d1589': Fix AudioTrack retrograde getPosition when restoring tracks
| | * | | Merge "Fix AudioTrack retrograde getPosition when restoring tracks" into lmp-devAndy Hung2014-10-171-1/+4
| | |\ \ \
| | | * | | Fix AudioTrack retrograde getPosition when restoring tracksAndy Hung2014-10-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mReleased represents the number of frames written to the track, but was cleared on start() causing a mismatch if the client wrote to the track before starting. Moved the clearing to entering the STATE_STOPPED or STATE_FLUSHED state. Bug: 18017947 Bug: 18022276 Change-Id: I3788c98c4c3c4d9cc004378432797b3f3138e22e
| * | | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 0ebf65b * commit '0ebf65be6642774c26e6fddd44b030ddd3eae492': move audio sink open/close to NuPlayerRenderer
| | * | | | Merge "move audio sink open/close to NuPlayerRenderer" into lmp-devChong Zhang2014-10-174-123/+223
| | |\ \ \ \
| | | * | | | move audio sink open/close to NuPlayerRendererChong Zhang2014-10-164-123/+223
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17675112 Change-Id: I7eb3d02380658f848baedafe2aea287586ccf016
| * | | | | 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.
| * | \ \ \ \ \ 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
| * | | | | | | | am 1375ac6d: Merge "NuPlayer: query current position from NuPlayerRenderer." ↵Lajos Molnar2014-10-146-225/+194
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '1375ac6d029b74ac392db411907b3c0ea57f08a7': NuPlayer: query current position from NuPlayerRenderer.
| | * | | | | | | Merge "NuPlayer: query current position from NuPlayerRenderer." into lmp-devLajos Molnar2014-10-146-225/+194
| | |\ \ \ \ \ \ \
| | | * | | | | | | NuPlayer: query current position from NuPlayerRenderer.Ronghua Wu2014-10-136-225/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17653702 Change-Id: Ie0b1f92420b071a0cfcd389f5e7917a54d332541
| * | | | | | | | | 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 e760de61: Merge "NuPlayerDriver: request seek notification when ↵Wei Jia2014-10-131-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prepare*() is called in STOPPED state." into lmp-dev * commit 'e760de61d9a662b1fbfda96ac34aaa246c2711bb': NuPlayerDriver: request seek notification when prepare*() is called in STOPPED state.
| | * | | | | | | | Merge "NuPlayerDriver: request seek notification when prepare*() is called ↵Wei Jia2014-10-131-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in STOPPED state." into lmp-dev
| | | * | | | | | | | NuPlayerDriver: request seek notification when prepare*() is called in ↵Wei Jia2014-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STOPPED state. Bug: 17596535 Change-Id: Ib43f91f9b0d0a52112aa1fa8352adac15aaf80f8
generated by cgit v1.1 at 2024-05-27 12:36:41 +0000