summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 4e3c2bbc: am 7e45789f: Fix overload of ↵Bernhard Rosenkränzer2014-12-100-0/+0
|\ | | | | | | | | | | | | SoftVideoDecoderOMXComponent::updatePortDefinitions * commit '4e3c2bbc65e03f9515d56dfc079c507aac08a69e': Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
| * am 7e45789f: Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-102-3/+3
| |\ | | | | | | | | | | | | * commit '7e45789f5fbcbe68075f57b6d17f72b7b48df546': Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
| | * Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | An overloaded function should take the same parameters as the function it is overloading. Bug: 18639027 Change-Id: I8327fe1b363917515cf76c8f76bdbc05b2c0fbf0 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | Merge branch 'lmp-mr1-dev-plus-aosp' of ↵rmcloughlin2014-12-100-0/+0
|\ \ \ | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-mr1-dev-plus-aosp
| * \ \ am ab01c22a: am cf1e3bb2: Merge "Fix AAC recording issue"Marco Nelissen2014-12-100-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'ab01c22a69da8750323a9bfddd023b7e46c6fa76': Fix AAC recording issue
| | * \ \ 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 1546028a: am 1767df77: AudioPolicyManager: distinguish between mirroring ↵Jean-Michel Trivi2014-12-102-2/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | and rerouting * commit '1546028a2d02837f88f7ea1a4109e7649b665d2f': AudioPolicyManager: distinguish between mirroring and rerouting
| * | | | am 1767df77: AudioPolicyManager: distinguish between mirroring and reroutingJean-Michel Trivi2014-12-102-2/+8
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '1767df778e20c1395afc63b3a0479bd903e7b9f0': AudioPolicyManager: distinguish between mirroring and rerouting
| | * | | AudioPolicyManager: distinguish between mirroring and reroutingJean-Michel Trivi2014-12-092-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the screen mirroring case, the notification manager queries the policy to see if media "is playing remotely": if yes, it will not request audio focus before playing a notification. This is the correct behavior for screen mirroring, but doesn't work when audio is rerouted to an external policy. This change consists in not reporting "remote" activity when playing to a mix of an external policy by looking at the address of the output on which playback is active for the given stream type. Bug 16009464 Change-Id: Iebbf5a8c738ab36c1cf2055e921c0a3472503125
* | | | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-108-2/+95
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ifd30546c11def40ad483f27c9d7baa4008fcbac3
| * | | | am 1487d270: Merge "audio policy: binder calls for dynamic audio policy ↵Eric Laurent2014-12-108-2/+95
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | mixes" into lmp-mr1-dev * commit '1487d270e86845e93a9abd1af020b45d6799b257': audio policy: binder calls for dynamic audio policy mixes
| | * | | Merge "audio policy: binder calls for dynamic audio policy mixes" into ↵Eric Laurent2014-12-108-2/+95
| | |\ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-098-2/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add binder calls to register and unregister dynamic mixes to AudioPolicyManager. Bug: 16009464. Change-Id: I4ef38166d0cfc88c984970969380d0cd6eb083ac
* | | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ↵Eric Laurent2014-12-108-106/+648
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'c49d9cda49dab8b7dd0376cf56476b3e1895d5c6': audio policy: add support for custom mixes
| * | | | | am 2dda40d6: Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-108-106/+648
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2dda40d638138c426cf4a66ddd0da8794c87f5c7': audio policy: add support for custom mixes
| | * | | | Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-108-106/+648
| | |\ \ \ \ | | | |/ / /
| | | * | | audio policy: add support for custom mixesEric Laurent2014-12-098-106/+648
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for custom mixes in AudioPolicyManager. Two methods are added to register or unregister a list of custom mixes with their attributes and format. getOutputForAttr() and getInputForAttr() first look for a match in registered mixes before defaulting to normal output/input selection Remote submix device connection disconnection now takes address into account to identify the correspnoding custom mix. Bug: 16009464. Change-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408
* | | | | | am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '2a0f484e7d95490274e77cd4adc01592cfdf6e3a': Truncate file before recording into it.
| * | | | | 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 c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c15a72f66add3c1f1b5b6a53488628c3843472bf': Fix print format mismatches.
| * | | | | | 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 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after ↵Chien-Yu Chen2014-12-102-141/+234
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result" into lmp-mr1-dev * commit '61697a5c1ddd2ad882a889474822851187734cf4': Camera3Device: support shutter after result
| * | | | | | am 9cea7aa4: Merge "Camera3Device: support shutter after result" into ↵Chien-Yu Chen2014-12-092-141/+234
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '9cea7aa494f6f93a473cab936af79868fc8efea6': Camera3Device: support shutter after result
| | * | | | | Merge "Camera3Device: support shutter after result" into lmp-mr1-devChien-Yu Chen2014-12-092-141/+234
| | |\ \ \ \ \
| | | * | | | | Camera3Device: support shutter after resultChien-Yu Chen2014-12-092-141/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the code to remove in-flight requests from processCaptureResult to a separate function so it can be called when the framework receives a result or a shutter event. An in-flight request will only be removed when both results and the shutter event arrive in the case of a successful request. Also send out results only after the shutter event receives. Bug: 18135776 Change-Id: I340db1a495c711b0913784d43fd0f144871e4420
* | | | | | | | Merge commit '2340e5a8' into manualmergeRuben Brunk2014-12-092-4/+81
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: I0299d49b7e283072fc646de717fd7c1643241984
| * | | | | | | am 6533dc1c: Merge "Camera2: Round unsupported surface sizes in configure." ↵Ruben Brunk2014-12-092-4/+81
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '6533dc1c576af241c9c1753f29d6777802d4c496': Camera2: Round unsupported surface sizes in configure.
| | * | | | | | Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-devRuben Brunk2014-12-092-4/+81
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Camera2: Round unsupported surface sizes in configure.Ruben Brunk2014-12-052-4/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16030677 Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
* | | | | | | | am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6eb3b5205354ee41ae79abb692abb1490a8c3019': Fix AAC recording issue
| * | | | | | | am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f6a364ed92945bf8a39dbadddb674c3f2e3b7d53': Fix AAC recording issue
| | * | | | | | Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Fix AAC recording issueMarco Nelissen2014-12-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uninitialized variable that caused ADTS recording to incorrectly specify LTP object in the header. Bug: 17895547 Change-Id: I75650f4963f4f371cd191bc635e32c9ab17fa8c9
* | | | | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'f143b60856d275a9dcda1f3084c768655b242022': Fix build with clang in C++11 mode
| * | | | | | | 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 f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3c253464e0047a28960b27bbee7366d5bd63327': Cast int64_t values to long long before print.
| * | | | | | | | 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 5abc1201: am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5abc1201bbdb27b855c85bd4f8e63748a941835b': Fix build with clang
| * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-07-06 15:37:10 +0000