summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
|\ | | | | | | | | * commit 'ac90a24da56ff575220aefd3f3be1fbe2f9111ba': Remove obsolete TARGET_SIMULATOR checks
| * Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
| |\
| | * Remove obsolete TARGET_SIMULATOR checksTrevor Drake2014-12-111-24/+11
| | | | | | | | | | | | Change-Id: I9d499190e49fed16aac686ae5da79ab870605ff4
* | | am f1b12df3: Merge "Trigger error only when a template is instantiated."Chih-Hung Hsieh2014-12-121-6/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'f1b12df3dd7d070a62544d309593aea554f93c27': Trigger error only when a template is instantiated.
| * | Merge "Trigger error only when a template is instantiated."Chih-Hung Hsieh2014-12-121-6/+3
| |\ \ | | |/ | |/|
| | * Trigger error only when a template is instantiated.Chih-Hung Hsieh2014-12-111-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Clang compiler will check defintions and trigger undefined template error of 'android::CompileTimeAssert<false>' even when MixMul is not instantiated. Avoid such parse time error but trigger link error when the generic MixMul template is used. Change-Id: I84ef60a69fbfbeefc93b5654e4bdd54f9d530867
* | | am cf1e3bb2: Merge "Fix AAC recording issue"Marco Nelissen2014-12-101-1/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'cf1e3bb24b88cf942c133248d26ee7bb57ed5ba7': Fix AAC recording issue
| * | Merge "Fix AAC recording issue"Marco Nelissen2014-12-101-1/+2
| |\ \ | | |/ | |/|
| | * 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
* | am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
|\ \ | |/ | | | | | | * commit 'a04c05ab9c0cdca30952a687f9f5bd909c28b86a': Truncate file before recording into it.
| * Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| |\
| | * Truncate file before recording into it.Marco Nelissen2014-12-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Recording into an existing file of non-zero length could leave old data in the file after the recording ends. Best case that wastes space, worst case it results in a file that's considered corrupt on playback. Change-Id: I2c77a107603b2b36790958360ff0856c2b28d677
* | | am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
|\ \ \ | |/ / | | | | | | | | | * commit '1914e7edb45114e9953982f21c50e754af5d1fe1': Fix print format mismatches.
| * | Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
| |\ \
| | * | Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
| |/ / | | | | | | | | | | | | | | | Clang complains about mismatch of argument type and print format. Change-Id: Ib07da09d8b1b62b3018033f9eaf7aa01bf7f7f9c
* | | am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
|\ \ \ | |/ / | | | | | | | | | * commit 'd1aeff5597785336af3bba34cfddb0ebbc6b2397': Fix build with clang in C++11 mode
| * | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| |\ \
| | * | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2737-98/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '66172f5cd25d1ce05870be70ad4f5fc0af6289f0': Cast int64_t values to long long before print.
| * | | 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>
* | | | | am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '3cc937346baf31fda7f0587a8e622938fbb68983': Fix build with clang
| * | | | Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| |\ \ \ \
| | * | | | Fix build with clangBernhard Rosenkränzer2014-12-081-2/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the -DNDEBUG case, nextOffset is unused, causing clang to spew a warning in code build with -Werror. Change-Id: If0101dcdf735672050f985a1de25a983edb02a52 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '56335ae2978765e3bbc510468d4812b691545d04': Prevent ANR when AudioTrack is paused or re-routed
| * | | | Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| |\ \ \ \
| | * | | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If ClientProxy was interrupted by AudioTrack::pause() just before futex syscall() in obtainBuffer() was called, It will not call releaseBuffer to wake up AudioTrackThread. It puts the AudioTrackThread to sleep and then a deadlock occurs. In this case, CBLK_INTERRUPT flags can't prevent a deadlock, so this patch set mFutex to FUTEX_WAKE during interrupt() to avoid deadlock. A similar problem could occur due to re-route or recovery after mediaserver death. Bug: 18641665 Change-Id: I66fcae43af9a91eb55f6cdb52c644ee6c0999772
* | | | | am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-082-4/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f3df58c77ea506fb00e696313b0ea127dbebf02c': Stagefright: Fix unused variables
| * | | | Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-082-4/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | 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
* | | | am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | OutputPortSettingsChangedState" * commit '050ff19e650a53fd2b6f1f2490758b4bf3104ca4': libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
| * | | 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>
* | | | | am b0eb7b0a: Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."Elliott Hughes2014-12-031-4/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'b0eb7b0a4c1c8f437d099eb14007863a94fcfbf0': __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.
| * | | | Merge "__ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__."Elliott Hughes2014-12-031-4/+1
| |\ \ \ \
| | * | | | __ARM_HAVE_HALFWORD_MULTIPLY is always true for __arm__.Elliott Hughes2014-12-021-4/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And this is the only user of that macro... Bug: 18556103 Change-Id: I1b515a54ac8530b150f4dd93070db60c701a5603
* | | | | am 5458756a: Merge "Track volume should be maintained even if track is restored"Glenn Kasten2014-12-021-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '5458756afe20079055d65d9545399288b9298055': Track volume should be maintained even if track is restored
| * | | | Merge "Track volume should be maintained even if track is restored"Glenn Kasten2014-12-021-1/+5
| |\ \ \ \
| | * | | | Track volume should be maintained even if track is restoredseunghak.han2014-12-011-1/+5
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If track is restored when it set its volume to a non-unity value (such as mute), the volume was forced to unity again. Now, the previous volume is restored. Bug: 18570664 Change-Id: I79f34c6c7d6f535baba813fd3b8ba8e55cac8ad7
* | | | | am 592f3bc8: Merge "Added support for YEAR metadata key from VorbisComments"Glenn Kasten2014-12-011-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '592f3bc86d6f0aceb408961eae3cced1c2203af9': Added support for YEAR metadata key from VorbisComments
| * | | | 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
* | | | | am 1a9c3954: Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2643-241/+95
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1a9c3954a20800dda3d6d18048c7f0edc8c53e6a': Stagefright: Fix unused variables, functions, values
| * | | | 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
* | | | | | am f59eae94: Merge "Fix overload of ↵Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftVideoDecoderOMXComponent::updatePortDefinitions" * commit 'f59eae9442374940b6b05f436f0598b3c482e6d0': Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
| * | | | | 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>
* | | | | | | am b44760cf: Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b44760cfe95a9ddab74134dbafd215febc05bd54': Remove deprecated register keyword
| * | | | | | Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
| |\ \ \ \ \ \
generated by cgit v1.1 at 2024-09-27 15:01:24 +0000