summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "mediaplayer: support dynamic playback rate"Wei Jia2015-02-2515-68/+190
|\
| * mediaplayer: support dynamic playback rateWei Jia2015-02-2415-68/+190
* | MPEG4Writer: add software version to mp4 metaChong Zhang2015-02-252-10/+64
* | MediaRecorder: pass capture fps in floatChong Zhang2015-02-232-10/+38
* | 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
* | | 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
| |/ /
* | | 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
* | | am 76b54aa5: am 340cebda: Fix mismatched type tag clang warning.Dan Albert2015-02-201-1/+0
|\ \ \
| * \ \ am 340cebda: Fix mismatched type tag clang warning.Dan Albert2015-02-201-1/+0
| |\ \ \
| | * | | Fix mismatched type tag clang warning.Dan Albert2015-02-191-1/+0
* | | | | 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
* | | | | | am 935b4750: am 011734f0: Fix clang build errorBill Yi2015-02-201-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 011734f0: Fix clang build errorBill Yi2015-02-201-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fix clang build errorBill Yi2015-02-191-1/+1
* | | | | | Merge "Fix for getMicMute in AudioFlinger"Ricardo Garcia2015-02-201-4/+10
|\ \ \ \ \ \
| * | | | | | Fix for getMicMute in AudioFlingerRicardo Garcia2015-02-191-4/+10
* | | | | | | Merge "Include what you use"Glenn Kasten2015-02-204-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Include what you useGlenn Kasten2015-02-194-4/+4
* | | | | | | | Merge "Pull out FastCaptureDumpState and FastMixerDumpState"Glenn Kasten2015-02-208-241/+327
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Pull out FastCaptureDumpState and FastMixerDumpStateGlenn Kasten2015-02-198-241/+327
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 0667633d: am 1f9b6745: Merge commit \'56fbb4d7bcb34af71a08cd126891afafdec2...Bill Yi2015-02-200-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 1f9b6745: Merge commit \'56fbb4d7bcb34af71a08cd126891afafdec217f1\' into HEADBill Yi2015-02-200-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2d9ded1d: am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am d607e5a5: Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Fixes for GSM decoder"Marco Nelissen2015-02-192-3/+28
| | | |\ \ \ \ \ \
| | | | * | | | | | Fixes for GSM decoderMarco Nelissen2015-02-192-3/+28
* | | | | | | | | | Merge "camera: implement flashlight control"Chien-Yu Chen2015-02-1910-3/+965
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | camera: implement flashlight controlChien-Yu Chen2015-02-1210-3/+965
* | | | | | | | | | Merge "Pull out FastThreadDumpState"Glenn Kasten2015-02-198-55/+110
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Pull out FastThreadDumpStateGlenn Kasten2015-02-178-55/+110
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge "Refactor AudioPolicyManager"Jean-Michel Trivi2015-02-1931-2812/+3233
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor AudioPolicyManagerJean-Michel Trivi2015-02-1831-2812/+3233
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge "Add dumpsys info"Marco Nelissen2015-02-184-4/+104
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
| | | | * | | | | Add dumpsys infoMarco Nelissen2015-02-184-4/+104
| | | |/ / / / /
* | | | | | | | 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
* | | | | | | | | 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
* | | | | | | | | stagefright: add support for limiting framerate in GraphicBufferSourceRonghua Wu2015-02-1211-45/+387
* | | | | | | | | 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
| |/ / / / / / /