Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 71171988: am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering ... | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
|\ | |||||
| * | am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_... | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
| |\ | |||||
| | * | Merge "Fix memory leak when filtering commands in insertCommand_l()" | Eric Laurent | 2014-05-06 | 2 | -10/+27 |
| | |\ | |||||
| | | * | Fix memory leak when filtering commands in insertCommand_l() | Jesper Tragardh | 2014-04-11 | 2 | -10/+27 |
| * | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEAD | Bill Yi | 2014-04-29 | 7 | -102/+217 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r... | Igor Murashkin | 2014-03-25 | 2 | -44/+121 |
| | |\ \ | |||||
| | * \ \ | am 4f53fe74: Merge "CameraService: deadlock fix" | Eino-Ville Talvala | 2014-03-25 | 1 | -0/+1 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aosp | Colin Cross | 2014-03-21 | 20 | -70/+80 |
| | |\ \ \ | |||||
| | * \ \ \ | am 36817364: Merge "Add libaudioresampler" | Glenn Kasten | 2014-03-19 | 1 | -11/+18 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | am 77658a06: Merge "AudioPolicyService: malloc/delete pair" | Glenn Kasten | 2014-03-18 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | am bd3e2e03: camera2: Fix segfault when using null availability listener | Igor Murashkin | 2014-03-17 | 1 | -0/+10 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am 089affb6: Merge "mediaserver and associated services are 32-bit only" | Glenn Kasten | 2014-03-14 | 3 | -0/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ... | Zhijun He | 2014-03-10 | 1 | -0/+16 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev | Eino-Ville Talvala | 2014-03-07 | 3 | -55/+66 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible" | Narayan Kamath | 2014-03-07 | 17 | -58/+73 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fa... | Glenn Kasten | 2014-03-07 | 4 | -26/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ... | Glenn Kasten | 2014-03-07 | 2 | -5/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | am d66cd743: Merge "audioflinger: conform inline ASM to UAL" | Glenn Kasten | 2014-03-07 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Use audio_is_linear_pcm()" | Glenn Kasten | 2014-05-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Use audio_is_linear_pcm() | Glenn Kasten | 2014-05-02 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-05 | 1 | -1/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling. | Ruben Brunk | 2014-05-02 | 1 | -1/+14 |
* | | | | | | | | | | | | | | | | | | Merge "NULL check in ConnectPro" | Natalie Silvanovich | 2014-05-05 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | NULL check in ConnectPro | Natalie Silvanovich | 2014-05-05 | 1 | -0/+5 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling."" | Ruben Brunk | 2014-05-03 | 1 | -14/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-03 | 1 | -14/+1 |
* | | | | | | | | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling." | Ruben Brunk | 2014-05-02 | 1 | -1/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling. | Ruben Brunk | 2014-05-02 | 1 | -1/+14 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge "Fix bug for direct track with PCM != 16-bit" | Glenn Kasten | 2014-05-02 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Fix bug for direct track with PCM != 16-bit | Glenn Kasten | 2014-05-02 | 1 | -4/+2 |
| |/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge "Camera3: Don't notifyError for non-fatal errors" | Zhijun He | 2014-05-02 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Camera3: Don't notifyError for non-fatal errors | Zhijun He | 2014-05-01 | 1 | -3/+0 |
* | | | | | | | | | | | | | | | | | Merge "Start pulling bits of FastMixer up to FastThread" | Glenn Kasten | 2014-04-29 | 11 | -668/+932 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Start pulling bits of FastMixer up to FastThread | Glenn Kasten | 2014-04-28 | 11 | -668/+932 |
* | | | | | | | | | | | | | | | | | Camera3: scale the max jpeg buffer size based on resolutions | Zhijun He | 2014-04-25 | 2 | -2/+67 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | am 7e5c6351: am 4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resamp... | Glenn Kasten | 2014-04-24 | 1 | -151/+165 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4513aa2c: Merge "AArch64: rewrite audioflinger\'s sinc resample by intrins... | Glenn Kasten | 2014-04-24 | 1 | -151/+165 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Merge "AArch64: rewrite audioflinger's sinc resample by intrinsics." | Glenn Kasten | 2014-04-23 | 1 | -151/+165 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | AArch64: rewrite audioflinger's sinc resample by intrinsics. | Zhongwei Yao | 2014-04-10 | 1 | -151/+165 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | camera3: Don't hold mLock during flush call | Zhijun He | 2014-04-21 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | | | Merge "CameraService: fix waitUntilIdle bug revealed by TestingCamera2." | Jianing Wei | 2014-04-21 | 2 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | CameraService: fix waitUntilIdle bug revealed by TestingCamera2. | Jianing Wei | 2014-04-21 | 2 | -4/+7 |
* | | | | | | | | | | | | | | | | | | am dae621c2: am 95006625: Merge "camera: set mNeedConfig after creating ZSL s... | Eino-Ville Talvala | 2014-04-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | am 95006625: Merge "camera: set mNeedConfig after creating ZSL stream" | Eino-Ville Talvala | 2014-04-21 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge "camera: set mNeedConfig after creating ZSL stream" | Eino-Ville Talvala | 2014-04-21 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | camera: set mNeedConfig after creating ZSL stream | Yuvraj Pasi | 2014-04-15 | 1 | -0/+2 |
| | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Camera3: block until get an available buffer | Zhijun He | 2014-04-18 | 7 | -22/+103 |
| |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge "CameraService: fix race condition and wrong last frame number." | Jianing Wei | 2014-04-17 | 2 | -156/+71 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | CameraService: fix race condition and wrong last frame number. | Jianing Wei | 2014-04-17 | 2 | -156/+71 |
* | | | | | | | | | | | | | | | | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d | Mark Salyzyn | 2014-04-15 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |