summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / / /
* | | | | am c5604b08: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-...Jean-Baptiste Queru2013-03-110-0/+0
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Recon...Jean-Baptiste Queru2013-03-110-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-...Jean-Baptiste Queru2013-03-110-0/+0
| | |\ \
| | | * \ am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release -...Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ \
| | | | * \ am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \ | | | |/ / /
| | | | * | Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ \
* | | | | \ \ Merge "Clean up the native code to match Java update" into jb-mr2-devztenghui2013-03-083-12/+33
|\ \ \ \ \ \ \
| * | | | | | | Clean up the native code to match Java updateztenghui2013-03-083-12/+33
* | | | | | | | Merge "Disable our fancy logic to respect both sink and source's native forma...Andreas Huber2013-03-074-21/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable our fancy logic to respect both sink and source's native formatsAndreas Huber2013-03-074-21/+10
* | | | | | | | | Merge "Camera: Log warning on out-of-range face detect scores" into jb-mr2-devAlex Ray2013-03-071-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera: Log warning on out-of-range face detect scoresAlex Ray2013-03-061-0/+4
| |/ / / / / / / /
* | | | | | | | | The transport stream HDCP descriptor belongs in the program_info sectionAndreas Huber2013-03-074-30/+70
|/ / / / / / / /
* | | | | | | | Merge "Correct MediaCodec + Surface behavior" into jb-mr2-devAndy McFadden2013-03-067-41/+74
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Correct MediaCodec + Surface behaviorAndy McFadden2013-03-057-41/+74
* | | | | | | | Merge "Add template class SingleStateQueue" into jb-mr2-devGlenn Kasten2013-03-066-1/+272
|\ \ \ \ \ \ \ \
| * | | | | | | | Add template class SingleStateQueueGlenn Kasten2013-03-056-1/+272
* | | | | | | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-0535-3177/+4317
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Squashed commit of the following:Andreas Huber2013-03-0535-3177/+4317
| |/ / / / / / /
* | | | | | | | Merge "Implement Surface input to MediaCodec." into jb-mr2-devAndy McFadden2013-03-0515-20/+1148
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Implement Surface input to MediaCodec.Andy McFadden2013-03-0415-20/+1148
| |/ / / / / /
* | | | | | | Merge "Miscellaneous cleanup" into jb-mr2-devGlenn Kasten2013-03-048-24/+17
|\ \ \ \ \ \ \
| * | | | | | | Miscellaneous cleanupGlenn Kasten2013-03-048-24/+17
| |/ / / / / /
* | | | | | | Modified udptest to sync time across devices.Andreas Huber2013-03-041-52/+92
|/ / / / / /