summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Libcpustats: Remove unused variableAndreas Gampe2014-11-251-1/+0
| | | | | | For build-system CFLAGS clean-up, fix unused variable. Change-Id: I6aba5f011d47271fae0ac5eca1d35a398dd56856
* Merge "Remove unused parameter"chh2014-11-251-1/+1
|\
| * Remove unused parameterBernhard Rosenkränzer2014-11-181-1/+1
| | | | | | | | | | | | | | Remove unused parameter clang complains about Change-Id: I6710645658a802438e41d881d262231a10b091d3 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>
* | | Merge "Stagefright: Fix default typo"Andreas Gampe2014-11-241-2/+2
|\ \ \
| * | | 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-209-24/+32
|\ \ \ \
| * | | | C++11 compatibility.Dan Albert2014-11-209-24/+32
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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 "Disable clang++ due to compiler error."Chih-Hung Hsieh2014-11-182-0/+12
|\ \ \ \
| * | | | Disable clang++ due to compiler error.Chih-Hung Hsieh2014-11-142-0/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang++ chokes on AudioMixer.cpp. It does not know "how to split this operator." BUG: 18373866 Change-Id: I3d588d44596c7c3b6f97e5f822545e015b074206
* | | | 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>
* | | | Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | 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>
* | | Merge "No need to #include atomic-inline.h if you have atomic.h."Elliott Hughes2014-11-171-1/+0
|\ \ \
| * | | 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-1713-15/+14
|\ \ \
| * | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1713-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge "libcutils no longer requires that its users configure ANDROID_SMP."Elliott Hughes2014-11-172-9/+0
|\ \ \ \ | |/ / / |/| | |
| * | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-172-9/+0
|/ / / | | | | | | | | | Change-Id: Ib91ff0696ab2472c62168eb5261bbda5d22f623e
* | | Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1755-145/+143
|\ \ \
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1755-145/+143
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
|\ \ \
| * | | Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
|/ / / | | | | | | | | | | | | Bug: 15193147 Change-Id: If59c4a53a497f501881d26d58b80b11371906527
* | | Merge "Include AudioPolicyInterface.h only when needed."Chih-Hung Hsieh2014-11-152-0/+3
|\ \ \ | |/ / |/| |
| * | Include AudioPolicyInterface.h only when needed.Chih-Hung Hsieh2014-11-142-0/+3
|/ / | | | | | | | | | | | | | | | | | | Both legacy and non-legacy AudioPolicyInterface define extern "C" functions createAudioPloicyManager and destroyAudioPloicyManager. Standard C++ does not allow overloading of extern C functions. g++ did not catch this problem but clang++ does. Change-Id: I80869cdb26e7721777e53d4eff71c5c733044abf
* | Merge "libstagefright: use __predict_false from bionic rather than CONDITION ↵Mark Salyzyn2014-11-121-1/+1
|\ \ | | | | | | | | | from log/log.h"
| * | libstagefright: use __predict_false from bionic rather than CONDITION from ↵Mark Salyzyn2014-11-111-1/+1
|/ / | | | | | | | | | | log/log.h Change-Id: Ieb07a4f58c96326553e87dacca11e3980e283dc8
* | Merge "Move to libc++."Dan Albert2014-11-113-23/+3
|\ \
| * | Move to libc++.Dan Albert2014-11-113-23/+3
|/ / | | | | | | | | | | | | This also cleans up some makefile cruft. Bug: 15193147 Change-Id: Ia53ca4f6fb2153f4e77e6f696eb27dcaae73a78e
* | Merge "Camera: Guard against asBinder() calls on NULL interfaces"Eino-Ville Talvala2014-11-107-17/+27
|\ \
| * | Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-077-17/+27
| | | | | | | | | | | | | | | Bug: 18207548 Change-Id: I9879c9b4c0282a6b96b77398f62beedc47f7f0a0
* | | Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
|\ \ \ | |/ / |/| |
| * | Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
|/ / | | | | | | Change-Id: I3c105b7e2736ade22de0bb12f396859816b3adf7
* | Resolve conflictThe Android Open Source Project2014-11-06864-122269/+75117
|\ \
| * \ 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 ac302143: Fix the fixMarco Nelissen2014-10-201-1/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'ac302143551a8b964f026385a524dda9ff8ea5ba': Fix the fix
| | * | | Fix the fixMarco Nelissen2014-10-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to clear the buffer a little more often. Bug: 18023017 Change-Id: If8a522b9133a4269e2435af8958f6ced322e71e9
| * | | | am 22bc10a3: Merge "Clear effect buffer before sending to chain" into lmp-devMarco Nelissen2014-10-201-4/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '22bc10a347569a0ab2980c24783e31aba4d7414d': Clear effect buffer before sending to chain
generated by cgit v1.1 at 2024-05-17 08:45:55 +0000