summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 7ebc1670: am 8975220e: Merge "Fix for Bundled Effects level compensation" ↵Ricardo Garcia2014-12-162-104/+144
|\ | | | | | | | | | | | | into lmp-mr1-dev * commit '7ebc167072be27f42b7c58bd7f9378c8311533ab': Fix for Bundled Effects level compensation
| * am 8975220e: Merge "Fix for Bundled Effects level compensation" into lmp-mr1-devRicardo Garcia2014-12-162-104/+144
| |\ | | | | | | | | | | | | * commit '8975220e28f632c5db4d89c798384d7635228bbc': Fix for Bundled Effects level compensation
| | * Merge "Fix for Bundled Effects level compensation" into lmp-mr1-devRicardo Garcia2014-12-162-104/+144
| | |\
| | | * Fix for Bundled Effects level compensationRicardo Garcia2014-12-092-104/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the bundled effects, only the EQ had some sort of level compensation based on the settings of the effect. This patch takes into account all the status and levels of EQ, BassBoost and Virtualizer bundled effects and makes an informed decision on the overall level compensation. bug: 18213779 Change-Id: I23c7b94fe7da5482f0bbef0cbe715ea464631420
* | | | am 0fd52ac2: am 6eac9e2f: Merge "Camera2Client: flush requests in ↵Chien-Yu Chen2014-12-161-0/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | stopPreviewL" into lmp-mr1-dev * commit '0fd52ac2929f6ded984cc3a063645d65b5e2006f': Camera2Client: flush requests in stopPreviewL
| * | | am 6eac9e2f: Merge "Camera2Client: flush requests in stopPreviewL" into ↵Chien-Yu Chen2014-12-161-0/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '6eac9e2f04480e80adca05347ae69919037c968e': Camera2Client: flush requests in stopPreviewL
| | * | Merge "Camera2Client: flush requests in stopPreviewL" into lmp-mr1-devChien-Yu Chen2014-12-151-0/+9
| | |\ \
| | | * | Camera2Client: flush requests in stopPreviewLRuchit Sharma2014-12-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requests queued in the pipeline have little meaning after the app calls stopPreview(). Flushing will help improve the switch KPI. bug 17340914 Change-Id: I899d69aa3b0fd41f028760290a81013297712fed
* | | | | am 42818cca: am 9f932418: Merge "Fix for apps that forget to use widevine:// ↵Jeff Tinker2014-12-151-0/+8
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | urls" into lmp-mr1-dev * commit '42818cca55fa4e4faca5b5686c7930070c2bf434': Fix for apps that forget to use widevine:// urls
| * | | | am 9f932418: Merge "Fix for apps that forget to use widevine:// urls" into ↵Jeff Tinker2014-12-151-0/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '9f932418856844c6b8242d4c921654d0cc6af754': Fix for apps that forget to use widevine:// urls
| | * | | Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-devJeff Tinker2014-12-151-0/+8
| | |\ \ \
| | | * | | Fix for apps that forget to use widevine:// urlsJeff Tinker2014-12-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18554455 Change-Id: I8ff08e7270c65c375205169eb068f361f2a4a727
* | | | | | am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into ↵Lajos Molnar2014-12-152-1/+18
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '06f9952190357426445344090b4e20b8758a118a': MediaCodecList: handle binder death
| * | | | | am 2aa82e78: Merge "MediaCodecList: handle binder death" into lmp-mr1-devLajos Molnar2014-12-152-1/+18
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '2aa82e786be2e986be1ecb48d72b095b040efe9a': MediaCodecList: handle binder death
| | * | | | Merge "MediaCodecList: handle binder death" into lmp-mr1-devLajos Molnar2014-12-152-1/+18
| | |\ \ \ \
| | | * | | | MediaCodecList: handle binder deathLajos Molnar2014-12-122-1/+18
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Bug: 18691591 Change-Id: Icc402d6ea9b0de4ac642c3b403fb64e865481b2e
* | | | | | am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to ↵Wei Jia2014-12-152-2/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client when the source is not seekable." into lmp-mr1-dev * commit 'a0b3a0a46dc42eafe620ffd053604515bbd9ca9a': NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.
| * | | | | am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to client when ↵Wei Jia2014-12-152-2/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the source is not seekable." into lmp-mr1-dev * commit '6e430fbd927b9cc043639eb728ddc921392a60e8': NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.
| | * | | | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is ↵Wei Jia2014-12-152-2/+6
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | not seekable." into lmp-mr1-dev
| | | * | | NuPlayer: send NOT_SEEKABLE media info to client when the source is not ↵Wei Jia2014-12-122-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekable. LiveSession: return -1 for duration when it's not available. Bug: 18599325 Change-Id: Iecd040f48750806f98d1799e2aaab2f90c6f3887
* | | | | | am aff13ad4: am 8ddb0223: Merge "Tunneled video Playback/Max resolution: ↵Rachad2014-12-131-1/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component." into lmp-mr1-dev * commit 'aff13ad4e639316bca12827d68a4f0a6ac54cd02': Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component.
| * | | | | am 8ddb0223: Merge "Tunneled video Playback/Max resolution: Call ↵Rachad2014-12-131-1/+15
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component." into lmp-mr1-dev * commit '8ddb02230d02968d471aa41b22433957c38827c0': Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component.
| | * | | | Merge "Tunneled video Playback/Max resolution: Call ↵Rachad2014-12-131-1/+15
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component." into lmp-mr1-dev
| | | * | | | Tunneled video Playback/Max resolution:Rachad2014-12-121-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component. bug: 17883772 Change-Id: I8f634824103e66483527828993bb24f65e68e419
* | | | | | | am d4c0fef8: am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder ↵Lajos Molnar2014-12-131-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support" into lmp-mr1-dev * commit 'd4c0fef88384128acc4c986fe7d3026996d4a96b': stagefright: advertise 8kHz AAC decoder support
| * | | | | | am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder support" into ↵Lajos Molnar2014-12-131-1/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '554016a37167fc5cb449be3d93a9290e4a0dac21': stagefright: advertise 8kHz AAC decoder support
| | * | | | | Merge "stagefright: advertise 8kHz AAC decoder support" into lmp-mr1-devLajos Molnar2014-12-131-1/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | stagefright: advertise 8kHz AAC decoder supportLajos Molnar2014-12-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18738266 Change-Id: I1e5a1dc04b4deabfac069e70e4f730be6023a8ef
* | | | | | | am 23085662: am c73ca6ef: audio policy: fix remote mic captureEric Laurent2014-12-132-17/+43
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2308566236a3ff16197419ec226f956a295fe81a': audio policy: fix remote mic capture
| * | | | | | am c73ca6ef: audio policy: fix remote mic captureEric Laurent2014-12-132-17/+43
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'c73ca6ef04136f28306784ad35f444538f081957': audio policy: fix remote mic capture
| | * | | | | audio policy: fix remote mic captureEric Laurent2014-12-122-17/+43
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 275e8e9de introduced a regression for platforms overriding AudioPolicyManager::getDeviceForInputSource() method. Fixed by defining specific non virtual methods when overiding would break remote submix implementation. Bug: 18736417. Change-Id: Id4d0a6c48da987e6fb24422f2d61c7ab0fbfc921
* | | | | | 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>