summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Camera: Add hotplug support (for fixed # of cameras)Igor Murashkin2013-03-264-15/+162
* Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-devIgor Murashkin2013-03-221-2/+21
|\
| * ICameraServiceListener.h: Add STATUS_ENUMERATING enumIgor Murashkin2013-03-211-2/+21
* | Merge changes Ic92924ce,I53107a39 into jb-mr2-devIgor Murashkin2013-03-212-1/+3
|\ \
| * | Camera2: getSceneMode should return NULL when there are no supported scene modesIgor Murashkin2013-03-211-0/+2
| * | commandStartFaceDetectionL returned the wrong value when face detection is no...Ziv Hendel2013-03-211-1/+1
| |/
* | Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-203-19/+58
|\ \
| * | Add the presentation rotation supportztenghui2013-03-153-19/+58
* | | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-2015-0/+1854
|\ \ \ | |_|/ |/| |
| * | Implementing MediaDrm APIsJeff Tinker2013-03-1315-0/+1854
* | | Merge "Change ANetworkSession implementation to optionally attach timestamps"...Andreas Huber2013-03-196-49/+135
|\ \ \
| * | | Change ANetworkSession implementation to optionally attach timestampsAndreas Huber2013-03-186-49/+135
* | | | Merge "Allow for streaming of media files (without recompression)" into jb-mr...Andreas Huber2013-03-197-35/+318
|\ \ \ \ | |/ / /
| * | | Allow for streaming of media files (without recompression)Andreas Huber2013-03-187-35/+318
* | | | Merge "Fix valgrind error" into jb-mr2-devMarco Nelissen2013-03-191-0/+1
|\ \ \ \
| * | | | Fix valgrind errorMarco Nelissen2013-03-191-0/+1
| | |_|/ | |/| |
* | | | Merge "Camera: fix waitUntilDrained log message" into jb-mr2-devAlex Ray2013-03-181-1/+1
|\ \ \ \
| * | | | Camera: fix waitUntilDrained log messageAlex Ray2013-03-171-1/+1
| |/ / /
* | | | Merge "ProCameraTests: Minor add grey/frame count debug-only print outs" into...Igor Murashkin2013-03-181-0/+10
|\ \ \ \ | |/ / / |/| | |
| * | | ProCameraTests: Minor add grey/frame count debug-only print outsIgor Murashkin2013-03-181-0/+10
* | | | am 59ac7b30: am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE resp...Andreas Huber2013-03-151-0/+3
|\ \ \ \
| * \ \ \ am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"Andreas Huber2013-03-151-0/+3
| |\ \ \ \
| | * \ \ \ Merge "Fix for crash if no content in DESCRIBE response"Andreas Huber2013-03-151-0/+3
| | |\ \ \ \
| | | * | | | Fix for crash if no content in DESCRIBE responseXuefei Chen2013-03-121-0/+3
* | | | | | | am c44a3ae2: am f0cea9f8: Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am f0cea9f8: Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Prevent invalid frame durationsOla Andersson2013-03-121-0/+6
| | |/ / /
* | | | | Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-devTenghui Zhu2013-03-143-6/+55
|\ \ \ \ \
| * | | | | Make limitations of MPEG4Writer explicitJames Dong2013-03-143-6/+55
* | | | | | Merge "Parse SBR extension sample rate" into jb-mr2-devMarco Nelissen2013-03-141-9/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Parse SBR extension sample rateMarco Nelissen2013-03-141-9/+22
* | | | | | ProCamera: Fix rare deadlock when client destructs inside the connect callIgor Murashkin2013-03-131-77/+87
* | | | | | Merge "Adds audio support to DirectRenderer." into jb-mr2-devAndreas Huber2013-03-133-169/+491
|\ \ \ \ \ \
| * | | | | | Adds audio support to DirectRenderer.Andreas Huber2013-03-133-169/+491
* | | | | | | Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2...Mathias Agopian2013-03-1317-67/+24
|\ \ \ \ \ \ \
| * | | | | | | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-1217-67/+24
* | | | | | | | Merge "remove CameraServiceTest which wasn't used" into jb-mr2-devMathias Agopian2013-03-134-1140/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | remove CameraServiceTest which wasn't usedMathias Agopian2013-03-124-1140/+0
* | | | | | | Attempt to recover from network stalls by dropping frames on the source side.Andreas Huber2013-03-1311-5/+101
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-1230-327/+802
|\ \ \ \ \ \
| * | | | | | Squashed commit of the following:Andreas Huber2013-03-1230-327/+802
| |/ / / / /
* | | | | | Merge "GraphicBufferSource fixes" into jb-mr2-devAndy McFadden2013-03-123-56/+81
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | GraphicBufferSource fixesAndy McFadden2013-03-123-56/+81
| | |/ / / | |/| | |
* | | | | Camera: Make ProCamera connect take the same paths as Camera connectIgor Murashkin2013-03-114-164/+130
* | | | | (Camera)ProCamera: Remove unused functions from binder interfaceIgor Murashkin2013-03-1112-199/+51
* | | | | (Camera)FrameProcessor: Refactor to share code with ProFrameProcessorIgor Murashkin2013-03-1111-203/+106
* | | | | CameraService: Refactor Camera2Client to share a base with ProCameraClientIgor Murashkin2013-03-1115-470/+583
* | | | | Merge "Increase size of statistics buffer" into jb-mr2-devGlenn Kasten2013-03-111-1/+1
|\ \ \ \ \
| * | | | | Increase size of statistics bufferGlenn Kasten2013-03-111-1/+1
| |/ / / /