summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
|\ | | | | | | | | * commit '6b3e1a6d59b304a2dde7f03ba184feac0dec4ee7': Remove obsolete TARGET_SIMULATOR checks
| * 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 0cbeaf83: am 8cffa91a: Merge "audio policy: suppport for dynamic source" ↵Eric Laurent2014-12-122-48/+101
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '0cbeaf83f7f50b5bc25a8dd7a08ea4e7c364c815': audio policy: suppport for dynamic source
| * \ \ \ am 8cffa91a: Merge "audio policy: suppport for dynamic source" into lmp-mr1-devEric Laurent2014-12-112-48/+101
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '8cffa91a76d3fa4c96268fc40fc8722a0d33dc8d': audio policy: suppport for dynamic source
| | * \ \ \ Merge "audio policy: suppport for dynamic source" into lmp-mr1-devEric Laurent2014-12-112-48/+101
| | |\ \ \ \
| | | * | | | audio policy: suppport for dynamic sourceEric Laurent2014-12-102-48/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completed support for dynamic sources: - remote submix input device is dynamically connected/disconnected when corresponding AudioTrack starts/stops. Also do not create a duplicated output for mixes used by dynamic policies. Bug: 16006090. Change-Id: Ib5b5a2159fcac9d9f410a5a2f1c64d7ebad79f72
* | | | | | | am 67c93ad7: am f1b12df3: Merge "Trigger error only when a template is ↵Chih-Hung Hsieh2014-12-121-6/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instantiated." * commit '67c93ad704d4418445c6d9693420f1cbaad98b0a': Trigger error only when a template is instantiated.
| * | | | | | 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
* | | | | | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1119-997/+601
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
| * | | | | | am a0940a56: stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1119-997/+600
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit 'a0940a569f2bc24b00dc10ce0fa7658b1dc3a3a5': stagefright: misc fixes to software video encoders (and decoders)
| | * | | | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1019-997/+600
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move logic to set encoder parameters to common encoder class (similarly to what was done for decoders) - set compressed buffer size based on frame size and compression ratio, and codec-specific minimum size - set raw buffer size based on frame size and metadata mode - do not set stride and slice height on compressed ports - advertise only QCIF support for google H263 encoder - set large-enough input size for video decoders to support adaptive playback - do not change input buffer size on output port reconfiguration, as no input buffer reallocation takes place - do not return empty buffers with EOS after EOS has been signaled Bug: 18513091 Bug: 18639027 Change-Id: Ib13492ef66adf331aa4572c67d2b283ea020cb41
* | | | | | | am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume all frames ↵Phil Burk2014-12-111-2/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a DirectThread is done." into lmp-mr1-dev * commit '6baa8fe747621b7121ff18dcdfab15d99c349c15': [audio][audioflinger] Consume all frames when a DirectThread is done.
| * | | | | | am 94a92c69: Merge "[audio][audioflinger] Consume all frames when a ↵Phil Burk2014-12-111-2/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirectThread is done." into lmp-mr1-dev * commit '94a92c69af528edf6ec17d7978a0c3bb6ab51e63': [audio][audioflinger] Consume all frames when a DirectThread is done.
| | * | | | | Merge "[audio][audioflinger] Consume all frames when a DirectThread is ↵Phil Burk2014-12-111-2/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | done." into lmp-mr1-dev
| | | * | | | | [audio][audioflinger] Consume all frames when a DirectThread is done.Phil Burk2014-12-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was causing movies to think there was still data left to play so they never finished. Bug: 18360054 Change-Id: If7aee81d62b7af8532abd14579677848a06fe2b1 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before ↵Lajos Molnar2014-12-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setDataSource * commit '2253b3c50ee4b89349553f42edf676ce8579e680': mediaplayer: allow setVideoSurface before setDataSource
| * | | | | | | am f484952e: mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-111-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f484952edd94c1b7ee82d7b108edc1ce08671cc4': mediaplayer: allow setVideoSurface before setDataSource
| | * | | | | | mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-101-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18709604 Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
* | | | | | | 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
generated by cgit v1.1 at 2024-05-20 13:34:55 +0000