summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-038-4/+228
| | | | Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
* MediaDrm API updateJeff Tinker2013-04-016-190/+817
| | | | | | | | Clarify offline usage of sessions and keys and implement implement CryptoSession to support additional crypto use cases. Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
* Merge "Adapt frame rate instead of keeping that constant and tweaking ↵Andreas Huber2013-03-265-29/+88
|\ | | | | | | bitrate" into jb-mr2-dev
| * Adapt frame rate instead of keeping that constant and tweaking bitrateAndreas Huber2013-03-265-29/+88
| | | | | | | | Change-Id: I889abbbe1237e1a8fdd7135cdc91a2e9728ff39b
* | ToneGenerator: fix AudioTrack pointer initEric Laurent2013-03-261-1/+1
|/ | | | | | | | | | The pointer to AudioTrack should be initialized before early return from ToneGenerator constructor because it is tested by the destructor. Bug 8140963 Change-Id: I9a7dfb60ba162b75dfaa5630ab7fc9485afd0074
* Identify network servers and clients with a OS version related stringAndreas Huber2013-03-268-55/+38
| | | | | | and put the logic to create that string in one location instead of many... Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
* Merge "In "special" mode we now establish a UDP RTCP channel in addition to ↵Andreas Huber2013-03-2610-26/+135
|\ | | | | | | the" into jb-mr2-dev
| * In "special" mode we now establish a UDP RTCP channel in addition to theAndreas Huber2013-03-2510-26/+135
| | | | | | | | | | | | | | | | TCP RTP channel and provide feedback on the latency of arriving packets from the sink back to the source. This information is then used to throttle video bitrate. Change-Id: Ic589a3cb65e4893a3ff67de947da6063d32a1c6e
* | Merge "ToneGenerator: optimize silent tone" into jb-mr2-devEric Laurent2013-03-261-1/+5
|\ \
| * | ToneGenerator: optimize silent toneEric Laurent2013-03-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Do not create an AudioTrack and start playback when a silent tone is requested to ToneGenerator. Bug 7946399 Change-Id: Ib9282871a56f7a862af7d1504ce3fbd7c18e34e2
* | | Merge "Get rid of TunnelRenderer" into jb-mr2-devAndreas Huber2013-03-253-369/+0
|\ \ \ | | |/ | |/|
| * | Get rid of TunnelRendererAndreas Huber2013-03-253-369/+0
| | | | | | | | | | | | Change-Id: I40dc00e2e689d7a6b8717ce524016c2948229807
* | | 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
| |/ | | | | | | Change-Id: I682944f793690842219cf1adbae5e61e061b6b62
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently crypto plugins are expected to be in libdrmdecrypt.so. When there are multiple plugins supporting different schemes, this approach requires source code integration across vendors which is unmanagable. Also, for integration with MediaDrm where the crypto keys are obtained from a drm server, the MediaCrypto plugin needs to interoperate with the MediaDrm plugin. This change allows {MediaCrypto, MediaDrm} pairs that are logically related to be implemented in a common shared library. Change-Id: I7f6638f29171f91609fc2d944396365568630b56
* | 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
| | | | | | | | | | | | | | | | | | I now can use a TCP reliable data channel with a UDP back channel. Change-Id: Ieb0f0970e3a6da4cff250e9547e181c0c961b9fb
* | | Merge "Ensure that the payload in each TS packet is an even multiple of 16 ↵Andreas Huber2013-03-251-43/+158
|\ \ \ | |/ / |/| | | | | bytes long" into jb-mr2-dev
| * | Ensure that the payload in each TS packet is an even multiple of 16 bytes longAndreas Huber2013-03-211-43/+158
| | | | | | | | | | | | | | | | | | | | | (except for the final TS packet) as specified by HDCP. Change-Id: I45d49d347c06f5daae310f196d9a8484be0f3ca0 related-to-bug: 7549145
* | | 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
| | | | | | | | | | | | | | | | Change-Id: I41a9f358f63a19e7b746a9ccf24722001e5e7475
* | | | Merge changes Ic92924ce,I53107a39 into jb-mr2-devIgor Murashkin2013-03-212-1/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | * changes: Camera2: getSceneMode should return NULL when there are no supported scene modes commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case.
| * | | Camera2: getSceneMode should return NULL when there are no supported scene modesIgor Murashkin2013-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | Bug: 8444806 Change-Id: Ic92924ceda3de738a7971605552baf00a4fc0546
| * | | commandStartFaceDetectionL returned the wrong value when face detection is ↵Ziv Hendel2013-03-211-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case. Change-Id: I53107a3958d541c25930b81eda638d4b6a394254 Signed-off-by: Igor Murashkin <iam@google.com>
* | | Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-203-19/+58
|\ \ \ | |_|/ |/| |
| * | Add the presentation rotation supportztenghui2013-03-153-19/+58
| | | | | | | | | | | | | | | | | | bug:7991013 Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
* | | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-2015-0/+1854
|\ \ \ | |_|/ |/| |
| * | Implementing MediaDrm APIsJeff Tinker2013-03-1315-0/+1854
| | | | | | | | | | | | Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
* | | Merge "Change ANetworkSession implementation to optionally attach ↵Andreas Huber2013-03-196-49/+135
|\ \ \ | | | | | | | | | | | | timestamps" into jb-mr2-dev
| * | | Change ANetworkSession implementation to optionally attach timestampsAndreas Huber2013-03-186-49/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to fragments of data to be transferred and to log statistics when data is finally submitted to the POSIX layer. Change-Id: Icbfcac203cdc5c9eac1634e84d34bb380b316a01
* | | | Merge "Allow for streaming of media files (without recompression)" into ↵Andreas Huber2013-03-197-35/+318
|\ \ \ \ | |/ / / | | | | | | | | jb-mr2-dev
| * | | Allow for streaming of media files (without recompression)Andreas Huber2013-03-187-35/+318
| | | | | | | | | | | | | | | | Change-Id: I1de356cc37506ba986822d12a1a59e7b64069e02
* | | | Merge "Fix valgrind error" into jb-mr2-devMarco Nelissen2013-03-191-0/+1
|\ \ \ \
| * | | | Fix valgrind errorMarco Nelissen2013-03-191-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The volume member of the BundledEffectContext class was not being initialized, resulting in uninitialized data being used for calculations and control flow. Change-Id: I84bf9fd478e5d0479e781323b21c7c03dea958c5
* | | | 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
| |/ / / | | | | | | | | | | | | Change-Id: Iab6197e0674752de7933dd812bff430a5c487c4b
* | | | Merge "ProCameraTests: Minor add grey/frame count debug-only print outs" ↵Igor Murashkin2013-03-181-0/+10
|\ \ \ \ | |/ / / |/| | | | | | | into jb-mr2-dev
| * | | ProCameraTests: Minor add grey/frame count debug-only print outsIgor Murashkin2013-03-181-0/+10
| | | | | | | | | | | | | | | | Change-Id: I0f7b7f3c083a644e9bb0c2302244a5ad434e96a8
* | | | am 59ac7b30: am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE ↵Andreas Huber2013-03-151-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | response" * commit '59ac7b3056db57e5a8e851b7946a181c5fc34852': Fix for crash if no content in DESCRIBE response
| * \ \ \ am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"Andreas Huber2013-03-151-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '66abe3ae38665256c8fe97770f046bf9c68625aa': Fix for crash if no content in DESCRIBE response
| | * \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If DESCRIBE response is received with status 200 but no content, MyHandler will still set content data for session description parsing. This will cause NULL Pointer crash. This fix checks whether DESCRIBE response has content before parsing session description. Change-Id: I114ae6fd54ce804e61718f62618ca9008425a433
* | | | | | | am c44a3ae2: am f0cea9f8: Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | * commit 'c44a3ae2704af52c0f4ea006b5b02a53b6df6c46': Prevent invalid frame durations
| * | | | | am f0cea9f8: Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f0cea9f83cf0c8e5ecdd2b401ec2d56d0c717708': Prevent invalid frame durations
| | * | | | Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Prevent invalid frame durationsOla Andersson2013-03-121-0/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent frame duration from being negative when exporting movie studio project Change-Id: I459fb243650c777c2b59d1094acc88c3a944bd81
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o No more than 2 tracks will be supported o No more than one video and/or one audio tracks will be supported o Only take video and/or audio track (for instance, no text tracks) o If there is no track before start() is called, bail out. At the same time, make sure the errors from addSource() report to addTrack(), not to start(). Bug: 7991013 Change-Id: I1ca35aaeb75b5448d75ed2c6c10dd12ecea720ab
* | | | | | Merge "Parse SBR extension sample rate" into jb-mr2-devMarco Nelissen2013-03-141-9/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
generated by cgit v1.1 at 2024-07-06 08:53:29 +0000