summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-038-4/+228
* MediaDrm API updateJeff Tinker2013-04-016-190/+817
* Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate...Andreas Huber2013-03-265-29/+88
|\
| * Adapt frame rate instead of keeping that constant and tweaking bitrateAndreas Huber2013-03-265-29/+88
* | ToneGenerator: fix AudioTrack pointer initEric Laurent2013-03-261-1/+1
|/
* Identify network servers and clients with a OS version related stringAndreas Huber2013-03-268-55/+38
* Merge "In "special" mode we now establish a UDP RTCP channel in addition to t...Andreas Huber2013-03-2610-26/+135
|\
| * In "special" mode we now establish a UDP RTCP channel in addition to theAndreas Huber2013-03-2510-26/+135
* | Merge "ToneGenerator: optimize silent tone" into jb-mr2-devEric Laurent2013-03-261-1/+5
|\ \
| * | ToneGenerator: optimize silent toneEric Laurent2013-03-251-1/+5
* | | Merge "Get rid of TunnelRenderer" into jb-mr2-devAndreas Huber2013-03-253-369/+0
|\ \ \ | | |/ | |/|
| * | Get rid of TunnelRendererAndreas Huber2013-03-253-369/+0
* | | Merge "Misc debugging support and handling of latency changes." into jb-mr2-devAndreas Huber2013-03-252-34/+12
|\ \ \ | |/ /
| * | Misc debugging support and handling of latency changes.Andreas Huber2013-03-252-34/+12
| |/
* | Merge "Load crypto plugins from additional shared libraries" into jb-mr2-devJeff Tinker2013-03-254-40/+140
|\ \ | |/ |/|
| * Load crypto plugins from additional shared librariesJeff Tinker2013-03-224-40/+140
* | Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-devAndreas Huber2013-03-254-25/+48
|\ \
| * | Separate the mode of the RTP and RTCP channels.Andreas Huber2013-03-254-25/+48
* | | Merge "Ensure that the payload in each TS packet is an even multiple of 16 by...Andreas Huber2013-03-251-43/+158
|\ \ \ | |/ / |/| |
| * | Ensure that the payload in each TS packet is an even multiple of 16 bytes longAndreas Huber2013-03-211-43/+158
* | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |