summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "mediaplayer: support dynamic playback rate"Wei Jia2015-02-2515-68/+190
|\
| * mediaplayer: support dynamic playback rateWei Jia2015-02-2415-68/+190
| | | | | | | | | | | | Bug: 19196501 Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
* | MPEG4Writer: add software version to mp4 metaChong Zhang2015-02-252-10/+64
| | | | | | | | | | | | | | | | and account for meta data and geo data when estimating moov size bug: 19460202 Change-Id: I094d15f47dda5e41217181cdb3ac519c00330de5
* | MediaRecorder: pass capture fps in floatChong Zhang2015-02-232-10/+38
| | | | | | | | | | | | bug: 19460202 Change-Id: Ic8f2dc02dfd482c4b2065b16e28721fc6e3cf696
* | Merge "MPEG4Writer: add capture fps in meta data"Chong Zhang2015-02-233-5/+128
|\ \
| * | MPEG4Writer: add capture fps in meta dataChong Zhang2015-02-233-5/+128
| | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I3a6ea3a5149d124ca9a2487a300dcc2db4405d0f
* | | Merge "nuplayer: do not use cached source for wvm content"Chong Zhang2015-02-231-23/+32
|\ \ \
| * | | nuplayer: do not use cached source for wvm contentChong Zhang2015-02-231-23/+32
| |/ / | | | | | | | | | | | | bug: 18730095 Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
* | | Merge "CameraService: fix invalid access of camera metadata"Yin-Chia Yeh2015-02-201-8/+7
|\ \ \ | |/ / |/| |
| * | CameraService: fix invalid access of camera metadataYin-Chia Yeh2015-02-181-8/+7
| | | | | | | | | | | | | | | | | | static_camera_characteristics is not defined in API1. Change-Id: I422953081b0a5581e12fc4b16052b67ca8062186
* | | am 76b54aa5: am 340cebda: Fix mismatched type tag clang warning.Dan Albert2015-02-201-1/+0
|\ \ \ | | | | | | | | | | | | | | | | * commit '76b54aa5240ee2052aabe7b671965a0836159fdb': Fix mismatched type tag clang warning.
| * \ \ am 340cebda: Fix mismatched type tag clang warning.Dan Albert2015-02-201-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '340cebdaa2875ba2ab9725b81218ebc59d84164b': Fix mismatched type tag clang warning.
| | * | | Fix mismatched type tag clang warning.Dan Albert2015-02-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parcel is a struct, not a class. However, Parcel isn't used in this file, so just kill it. Change-Id: I575cae8b3c5dd13dd9b03fccfe7423e1f17f62f5
* | | | | Merge "Camera: Remove RAW_SENSOR in favor of RAW16"Eino-Ville Talvala2015-02-204-6/+6
|\ \ \ \ \
| * | | | | Camera: Remove RAW_SENSOR in favor of RAW16Eino-Ville Talvala2015-02-194-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69ca24c69f58be958efdef300b127401d2b2e880
* | | | | | am 935b4750: am 011734f0: Fix clang build errorBill Yi2015-02-201-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '935b47504411b6ac69f708ba698a72b7282aada1': Fix clang build error
| * | | | | am 011734f0: Fix clang build errorBill Yi2015-02-201-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '011734f0ce7e8b2e3066f90ef51c323ee7d4dea2': Fix clang build error
| | * | | | Fix clang build errorBill Yi2015-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I294903dcf3ce3aa6a3b2f50364067e701a33d327
* | | | | | Merge "Fix for getMicMute in AudioFlinger"Ricardo Garcia2015-02-201-4/+10
|\ \ \ \ \ \
| * | | | | | Fix for getMicMute in AudioFlingerRicardo Garcia2015-02-191-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous logic will only check for mic state of Primary Hardware Device. Current logic checks state of all devices with valid microphone input. This is needed for audio_output feature support. bug: 19439530 Change-Id: Ibbb92412ac70cf2915bbe8660c04fbaf0ab74171
* | | | | | | Merge "Include what you use"Glenn Kasten2015-02-204-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Include what you useGlenn Kasten2015-02-194-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1967861f383bb5ed6743fb69e3bd439907ed7033
* | | | | | | | Merge "Pull out FastCaptureDumpState and FastMixerDumpState"Glenn Kasten2015-02-208-241/+327
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Pull out FastCaptureDumpState and FastMixerDumpStateGlenn Kasten2015-02-198-241/+327
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Change-Id: I8e44dbfe02338622eb69193b234743b50f0dd79f
* | | | | | | am 0667633d: am 1f9b6745: Merge commit ↵Bill Yi2015-02-200-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | \'56fbb4d7bcb34af71a08cd126891afafdec217f1\' into HEAD * commit '0667633d139e57392443fa1eeb1f013fbdfc9eea':
| * | | | | | am 1f9b6745: Merge commit \'56fbb4d7bcb34af71a08cd126891afafdec217f1\' into HEADBill Yi2015-02-200-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | * commit '1f9b6745d7c88dac2bfd19d583c3d98b361f67b3':
| | * | | | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-19490-5502/+14112
| | |\ \ \ \ \
* | | \ \ \ \ \ am cf09e292: am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cf09e2926e3f76ac54a6efb6626a7eb256d2aaff': Fixes for GSM decoder
| * | | | | | | am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d9ded1d03653c747ba173f622e19ed6d56f26f4': Fixes for GSM decoder
| | * | | | | | am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd607e5a53a6136b745ebacdf41ecdb486ed82ca6': Fixes for GSM decoder
| | | * \ \ \ \ \ Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| | | |\ \ \ \ \ \
| | | | * | | | | | Fixes for GSM decoderMarco Nelissen2015-02-192-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use larger buffer size, since otherwise it won't work with MediaExtractor which batches up GSM frames. Support reset and flush. Change-Id: I3a87e3744c088f7a40bbc428187fc44c073c63ec
* | | | | | | | | | Merge "camera: implement flashlight control"Chien-Yu Chen2015-02-1910-3/+965
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | camera: implement flashlight controlChien-Yu Chen2015-02-1210-3/+965
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement flashlight API for module v2.4 by calling module APIs and by for hal v2 and v3 by using CameraDeviceBase. Bug: 2682206 Change-Id: Ib8b77f6fd462489d672f27e14fe37801d35b7544
* | | | | | | | | | Merge "Pull out FastThreadDumpState"Glenn Kasten2015-02-198-55/+110
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pull out FastThreadDumpStateGlenn Kasten2015-02-178-55/+110
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic99890bbba4f856b65535f3df0f928de9e3e9748
* | | | | | | | | | Merge "Refactor AudioPolicyManager"Jean-Michel Trivi2015-02-1931-2812/+3233
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor AudioPolicyManagerJean-Michel Trivi2015-02-1831-2812/+3233
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPolicyManager implementation is now split into the following files: files managerdefault/Gains.* class AudioGain class VolumeCurvePoint class StreamDescriptor files managerdefault/Devices.* class DeviceDescriptor class DeviceVector files managerdefault/Ports.* class AudioPort class AudioPortConfig class AudioPatch files managerdefault/IOProfile.* class IOProfile files managerdefault/HwModule.* class HwModule files managerdefault/AudioInputDescriptor.* class AudioInputDescriptor files managerdefault/AudioOutputDescriptor.* class AudioOutputDescriptor All files for libaudiopolicyservice are moved under service/ All files for libaudiopolicymanager are moved under manager/ Change-Id: I43758be1894e37d34db194b51a19ae24461e066e
* | | | | | | | | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7c1df10d39a8056ca755ccd77b06816c6de3225': Add dumpsys info
| * | | | | | | | | am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | * commit 'a963dacc1b44ec80742c86ce75611eb9cfa936ea': Add dumpsys info
| | * | | | | | | am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '64753517e8ee315654441512a1f59b28fe5c1bc1': Add dumpsys info
| | | * | | | | | Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Add dumpsys infoMarco Nelissen2015-02-184-4/+104
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a list of looper-handler pairs and the number of messages they've processed, and optionally break those stats out by message type. Change-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e
* | | | | | | | Merge "Look up user-specific device policy for disabling camera"Amith Yamasani2015-02-181-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Look up user-specific device policy for disabling cameraAmith Yamasani2015-02-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera can be disabled on a per-user basis by device admins. Changed the system property format to be per-user so that the policy can be applied based on calling user. TODO: Ideally this policy information should be pulled from the DevicePolicyManager rather than relying on system properties. Property changes will not be applied immediately either, if there's no listener. Bug: 19345698 Change-Id: Ia00034726260bc9ff28ac592f20a27b5c9a77d58
* | | | | | | | | Merge "stagefright: stop reading meta data after MDAT or MOOF"Chong Zhang2015-02-132-17/+18
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | stagefright: stop reading meta data after MDAT or MOOFChong Zhang2015-02-132-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 18520722 Change-Id: I213e4bde92a7830543c1815b324164b27d853049
* | | | | | | | | stagefright: add support for limiting framerate in GraphicBufferSourceRonghua Wu2015-02-1211-45/+387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19014096 Change-Id: I6de781e4d140a247dfd8fd8f12c3ddd7baa39ad4
* | | | | | | | | Merge "process all SEI messages for CC extraction"Chong Zhang2015-02-124-28/+69
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | process all SEI messages for CC extractionChong Zhang2015-02-124-28/+69
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19297083 Change-Id: I5b89e35cc2bd5fb2f332872941e7978f15a6f403