summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | libstagefright: httplive: Add NULL check for empty playlistLeena Winterrowd2015-01-281-1/+6
| | | | | | | | | | | | | | | | | | If the source playlist is empty, the playlist meta will be NULL. Check for this case to avoid an invalid dereference. Also flag playlists without the required EXT-X-TARGETDURATION tag as malformed. Bug: 18821145 Change-Id: Idf74d890a89bbc6483a6d4060eb092dc7461be24
* | Revert "HLS: QCom enhancements"Lajos Molnar2015-01-287-71/+14
| | | | | | | | | | | | | | | | | | This is to restore patch attributions This reverts commit f580806d893c4631f5324ff0af5c2db68a40ef42. Bug: 18821145 Change-Id: Idc49385fffccfde2a3915388fe3fe4e2b740d787
* | Merge "Audio policy: fix device gain initialization" into lmp-mr1-devEric Laurent2015-01-292-5/+15
|\ \
| * | Audio policy: fix device gain initializationEric Laurent2015-01-272-5/+15
| |/ | | | | | | | | | | | | | | | | | | | | Fix initilization of default gain configuration for audio devices loaded from audio_policy.conf. Initialization cannot be done in constructor as the possible gain configurations are not loaded yet. Bug: 19120566. Change-Id: I78f057ecfa1a121365ac3d8f317912a6f1647627
* | Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" ↵Ronghua Wu2015-01-281-2/+2
|\ \ | | | | | | | | | into lmp-mr1-dev
| * | stagefright: do not reject SPL5 files outright in SoftMpeg4 decoderRonghua Wu2015-01-281-2/+2
| |/ | | | | | | | | Bug:19013118 Change-Id: I58f63ae13559c93ea5e627b658c9919e86769076
* | NuPlayerRenderer: return current real time as render time for video frame ↵Wei Jia2015-01-272-15/+18
|/ | | | | | | | | | when paused. This allows video to display immediately during seeking in paused state. Also fix some racing condition. Bug: 19153026 Change-Id: I0d7a8981ca3c121f5dbc430c2c6d8b7522edc24a
* Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
|\
| * Fix MTP deleteMarco Nelissen2015-01-231-2/+2
| | | | | | | | | | Bug: 18836972 Change-Id: Ia1caa9bfb0f2084af774745b5c01b260ab1f1b20
* | Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into ↵Robert Shih2015-01-231-1/+1
|\ \ | |/ |/| | | lmp-mr1-dev
| * MPEG4Extractor: more NULL derefernce fixes in parseChunkRobert Shih2015-01-211-1/+1
| | | | | | | | | | Bug: 18771789 Change-Id: Ie0511ed3a885dbf64a7472e8fa74d15b0e87778d
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-190-0/+0
| |\
| | * do not use paused postition if it's not availableChong Zhang2015-01-161-2/+8
| | | | | | | | | | | | | | | | | | bug: 18896133 bug: 18996505 Change-Id: I1e24fabe3fe8f2275b1ccc0df100cb2c4ba2264b
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-150-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-140-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-120-0/+0
| | | | |\
| | | | | * Use aligned width and height to compute size.Ronghua Wu2015-01-081-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18528130 Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
| | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-080-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-070-0/+0
| | | | | | |\
* | | | | | | \ Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" ↵Ronghua Wu2015-01-231-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev
| * | | | | | | | stagefright: do not reject SPL4 files outright in SoftMpeg4 decoderRonghua Wu2015-01-221-0/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19014147 Change-Id: Ie90e8fc69e9ac2cb34d6362e67ad289d002a2c14
* | | | | | | | libstagefright: Use aligned width and height.Ronghua Wu2015-01-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19014147 Change-Id: I33314b02448e436c43fcfad086b5edfa650dcf83
* | | | | | | | Camera: make sure jpeg buffer size isn't too smallYin-Chia Yeh2015-01-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assuming the jpeg header can take up to 256KB, make sure we always allocate enough size for the image data. Bug: 18962703 Change-Id: I08eb3d198d12f71f3ab7266324e80fe7410bdc89
* | | | | | | | Merge "fix audio patch leak." into lmp-mr1-devEric Laurent2015-01-201-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix audio patch leak.Eric Laurent2015-01-151-2/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always wait for status when executing a create audio patch command in audio policy service command thread. The returned patch handle must be passed back to audio policy manager so that the patch can be modified later. Failing to do so causes a leak of patch descriptors in audio flinger. Bug: 19032387. Change-Id: I5462d1437fac244d9c5e38f2c7b8e1a4c01d2b75
* | | | | | | Merge "do not use paused postition if it's not available" into lmp-mr1-devChong Zhang2015-01-161-2/+8
|\ \ \ \ \ \ \
| * | | | | | | do not use paused postition if it's not availableChong Zhang2015-01-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18896133 bug: 18996505 Change-Id: I1e24fabe3fe8f2275b1ccc0df100cb2c4ba2264b
* | | | | | | | Merge "fix leak in audio policy effect config parser" into lmp-mr1-devEric Laurent2015-01-151-0/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fix leak in audio policy effect config parserEric Laurent2015-01-151-0/+4
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free temporary effect descriptors created in loadAudioEffectConfig(). Bug 19021726. Change-Id: Icd44216e25df3fe683a01763d7e8a7b84f367a1a
* | | | | | | Merge " [FM]There is no sound output from BT earphone while BT earphone ↵Leo Wang2015-01-151-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | is connected" into lmp-mr1-dev
| * | | | | | [FM]There is no sound output from BT earphone while BT earphone is connectedHochi Huang2015-01-131-4/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18847131 Review: https://partner-android-review.git.corp.google.com/#/c/193318 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com> Change-Id: I79703ba4ceb67ca3b95fbc71444dd3b116ba4131
* | | | | | MidiFile: report correct state during transient period when start() is ↵Wei Jia2015-01-141-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | called first time. Bug: 18905421 Bug: 18994222 Change-Id: Iee47043e60740fab9e62aa28db4cbcec4f339c22
* | | | | Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-devRachad2015-01-104-0/+71
|\ \ \ \ \
| * | | | | ACodec: Added support for E-AC3 decodersRachad2014-12-234-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17883772 Change-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab
* | | | | | stagefright: keep alignment restrictions for SoftVideoDecoderLajos Molnar2015-01-091-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse updatePortDefinitions for setParam(PortDefinition). Allow increasing input buffer size even if size changes. Bug: 18528130 Change-Id: I62b66d8f1135504dd16ac576046bfc5b5b8cda59
* | | | | | Merge "Use aligned width and height to compute size." into lmp-mr1-devRonghua Wu2015-01-081-3/+6
|\ \ \ \ \ \
| * | | | | | Use aligned width and height to compute size.Ronghua Wu2015-01-071-3/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18528130 Change-Id: I4d2304d8c8919c1cde60676848cfe2e4f2061a87
* | | | | | Merge "mark any copyrighted content as protected to disable capture" into ↵Chong Zhang2015-01-085-1/+19
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | lmp-mr1-dev
| * | | | | mark any copyrighted content as protected to disable captureChong Zhang2015-01-075-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18916274 Change-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340
* | | | | | Merge "make libserviceutility a shared lib" into lmp-mr1-devChong Zhang2015-01-073-10/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | make libserviceutility a shared libChong Zhang2015-01-073-10/+14
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that we have only one getpid_cached in mediaserver process bug: 18919657 Change-Id: Iff3cd932c9110e874b3885f79705f49bf3e3f1fc
| * | | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-060-0/+0
| |\ \ \ \
| | * \ \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-230-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | | |\ \ \
| | | | * | | audio policy: fix remote mic captureEric Laurent2014-12-142-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
| | | | * | | audio policy: suppport for dynamic sourceEric Laurent2014-12-142-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
| | | | * | | merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-110-0/+0
| | | | |\ \ \
| | | | | * | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-102-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 in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-100-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-090-0/+0
| | | | | | |\ \ \