summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f4500233: am f147b722: Merge "Preliminary support for HDCP as a binder ser...Andreas Huber2012-08-295-0/+434
|\
| * am f147b722: Merge "Preliminary support for HDCP as a binder service for wifi...Andreas Huber2012-08-295-0/+434
| |\
| | * Merge "Preliminary support for HDCP as a binder service for wifi display supp...Andreas Huber2012-08-295-0/+434
| | |\
| | | * Preliminary support for HDCP as a binder service for wifi display support.Andreas Huber2012-08-295-0/+434
* | | | am 22060e5a: am 0a24726a: am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Rea...Jean-Baptiste Queru2012-08-291-0/+2
|\ \ \ \ | |/ / /
| * | | am 0a24726a: am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immedi...Jean-Baptiste Queru2012-08-291-0/+2
| |\ \ \ | | |/ /
| | * | am 8836f8e0: am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an e...Jean-Baptiste Queru2012-08-291-0/+2
| | |\ \
| | | * \ am 5b15adfe: Merge "MPEG2TSWriter: Read more immediately if an empty buffer i...Jean-Baptiste Queru2012-08-291-0/+2
| | | |\ \
| | | | * \ Merge "MPEG2TSWriter: Read more immediately if an empty buffer is received"Jean-Baptiste Queru2012-08-291-0/+2
| | | | |\ \
| | | | | * | MPEG2TSWriter: Read more immediately if an empty buffer is receivedMartin Storsjo2012-08-291-0/+2
* | | | | | | am 526cf47b: am 55fb8470: am bf30787f: am 735d1b92: Merge "avcenc: Don\'t era...Jean-Baptiste Queru2012-08-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 55fb8470: am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputB...Jean-Baptiste Queru2012-08-291-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo bef...Jean-Baptiste Queru2012-08-291-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo before reading i...Jean-Baptiste Queru2012-08-291-1/+1
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "avcenc: Don't erase the InputBufferInfo before reading info from it"Jean-Baptiste Queru2012-08-291-1/+1
| | | | |\ \ \
| | | | | * | | avcenc: Don't erase the InputBufferInfo before reading info from itMartin Storsjo2012-08-291-1/+1
| | | | | |/ /
* | | | | | | am a2cfbc31: am b7b8de88: am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add a...Jean-Baptiste Queru2012-08-291-2/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b7b8de88: am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for ...Jean-Baptiste Queru2012-08-291-2/+11
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for choosing soft...Jean-Baptiste Queru2012-08-291-2/+11
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"Jean-Baptiste Queru2012-08-291-2/+11
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "recordvideo: Add an option for choosing software encoders"Jean-Baptiste Queru2012-08-291-2/+11
| | | | |\ \ \
| | | | | * | | recordvideo: Add an option for choosing software encodersMartin Storsjo2012-08-291-2/+11
| | | | | |/ /
* | | | | | | am 29d030b7: am ac418756: am 3f9e843d: am 9ce74352: Merge "recordvideo: Sleep...Jean-Baptiste Queru2012-08-291-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ac418756: am 3f9e843d: am 9ce74352: Merge "recordvideo: Sleep while waitin...Jean-Baptiste Queru2012-08-291-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 3f9e843d: am 9ce74352: Merge "recordvideo: Sleep while waiting for the enc...Jean-Baptiste Queru2012-08-291-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | | * | | am 9ce74352: Merge "recordvideo: Sleep while waiting for the encoding to finish"Jean-Baptiste Queru2012-08-291-0/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "recordvideo: Sleep while waiting for the encoding to finish"Jean-Baptiste Queru2012-08-291-0/+1
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * recordvideo: Sleep while waiting for the encoding to finishMartin Storsjo2012-08-291-0/+1
| | | | |/
* | | | | am cb4d650a: am eb941f9a: Merge "Camera2: Factor out Camera2Client::Parameter...Eino-Ville Talvala2012-08-289-2017/+2140
|\ \ \ \ \ | |/ / / /
| * | | | am eb941f9a: Merge "Camera2: Factor out Camera2Client::Parameters" into jb-mr...Eino-Ville Talvala2012-08-289-2017/+2140
| |\ \ \ \ | | |/ / /
| | * | | Merge "Camera2: Factor out Camera2Client::Parameters" into jb-mr1-devEino-Ville Talvala2012-08-289-2017/+2140
| | |\ \ \
| | | * | | Camera2: Factor out Camera2Client::ParametersEino-Ville Talvala2012-08-289-2017/+2140
* | | | | | am 73ad84eb: am 3a1d5240: Merge "Fix retries when server doesn\'t support ran...Andreas Huber2012-08-281-2/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3a1d5240: Merge "Fix retries when server doesn\'t support range requests."...Andreas Huber2012-08-281-2/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix retries when server doesn't support range requests." into jb-mr1-devAndreas Huber2012-08-281-2/+10
| | |\ \ \ \
| | | * | | | Fix retries when server doesn't support range requests.Andreas Huber2012-08-281-2/+10
* | | | | | | am bdd7193d: am eccfd929: Merge "Test to measure UDP roundtrip time between t...Andreas Huber2012-08-285-0/+1467
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am eccfd929: Merge "Test to measure UDP roundtrip time between two devices on...Andreas Huber2012-08-285-0/+1467
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Test to measure UDP roundtrip time between two devices on the same net...Andreas Huber2012-08-285-0/+1467
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Test to measure UDP roundtrip time between two devices on the same network.Andreas Huber2012-08-285-0/+1467
| | | |/ / /
* | | | | | am e5380f70: am 2352a815: Merge "Use new surface flinger API." into jb-mr1-devJeff Brown2012-08-275-7/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2352a815: Merge "Use new surface flinger API." into jb-mr1-devJeff Brown2012-08-275-7/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Use new surface flinger API." into jb-mr1-devJeff Brown2012-08-275-7/+9
| | |\ \ \ \
| | | * | | | Use new surface flinger API.Jeff Brown2012-08-245-7/+9
* | | | | | | am 56df4108: am 68536901: Merge "Camera2: Fix metering/focusing region coordi...Eino-Ville Talvala2012-08-272-10/+38
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 68536901: Merge "Camera2: Fix metering/focusing region coordinates, minor ...Eino-Ville Talvala2012-08-272-10/+38
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Camera2: Fix metering/focusing region coordinates, minor bugs" into jb...Eino-Ville Talvala2012-08-272-10/+38
| | |\ \ \ \ \
| | | * | | | | Camera2: Fix metering/focusing region coordinates, minor bugsEino-Ville Talvala2012-08-272-10/+38
* | | | | | | | am 916e75f7: am 33ea2dff: Merge "Camera2: Move frame processing to its own th...Eino-Ville Talvala2012-08-274-77/+119
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 33ea2dff: Merge "Camera2: Move frame processing to its own thread." into j...Eino-Ville Talvala2012-08-274-77/+119
| |\ \ \ \ \ \ \ | | |/ / / / / /