OSDN Git Service
Andreas Huber [Fri, 19 Apr 2013 15:37:04 +0000 (08:37 -0700)]
am
2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev
* commit '
2c157e0f127f36b4c709508f899c2a9f32ba3bd4':
Make sure MediaCodec::stop() and MediaCodec::release() still return
Andreas Huber [Fri, 19 Apr 2013 15:34:03 +0000 (15:34 +0000)]
Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev
Marco Nelissen [Fri, 19 Apr 2013 15:00:58 +0000 (08:00 -0700)]
am
da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev
* commit '
da77cee96d33aa015f90e537ce2d06e6853aac93':
Fix sample info parsing
Marco Nelissen [Fri, 19 Apr 2013 14:58:42 +0000 (14:58 +0000)]
Merge "Fix sample info parsing" into jb-mr2-dev
Jamie Gennis [Fri, 19 Apr 2013 00:37:32 +0000 (17:37 -0700)]
am
5ffabf06: OMXNodeInstance: actually fix OMX_GetExtIndex logging
* commit '
5ffabf0664b80b3dd94d40a3a63db25ecd993fd0':
OMXNodeInstance: actually fix OMX_GetExtIndex logging
Jamie Gennis [Thu, 18 Apr 2013 23:34:44 +0000 (16:34 -0700)]
OMXNodeInstance: actually fix OMX_GetExtIndex logging
Bug:
8538872
Change-Id: I228746e8eb502af4bba4054caa4d8569fab35025
Andreas Huber [Thu, 18 Apr 2013 20:24:17 +0000 (13:24 -0700)]
Make sure MediaCodec::stop() and MediaCodec::release() still return
instead of blocking indefinitely if the mediaserver died while the call
is pending.
Change-Id: If2789b7fe99634d947ce4a3bb69c04baff5f8b10
related-to-bug:
8397711
Marco Nelissen [Wed, 17 Apr 2013 18:49:11 +0000 (11:49 -0700)]
Fix sample info parsing
b/
8626561
Change-Id: Ibd5168282eb33d1abdc423e15a0d9aeb5a1ad687
Jeff Tinker [Thu, 18 Apr 2013 00:56:39 +0000 (17:56 -0700)]
am
64595e67: Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev
* commit '
64595e6727c478d3d80c7babbecdb470398f8c42':
Add new error codes for DRM to improve error reporting
Jeff Tinker [Thu, 18 Apr 2013 00:53:55 +0000 (00:53 +0000)]
Merge "Add new error codes for DRM to improve error reporting" into jb-mr2-dev
Jeff Tinker [Wed, 17 Apr 2013 23:12:27 +0000 (16:12 -0700)]
Add new error codes for DRM to improve error reporting
bug:
8621516
Change-Id: I9a06c9ea5bfde924906d3876a417b9451b6abde8
Marco Nelissen [Wed, 17 Apr 2013 22:49:19 +0000 (15:49 -0700)]
am
f7baffd1: Merge "Make sure the drain buffer is big enough" into jb-mr2-dev
* commit '
f7baffd1fce85e3cac464b0d2ad6bc600836abf8':
Make sure the drain buffer is big enough
Andreas Huber [Wed, 17 Apr 2013 22:49:19 +0000 (15:49 -0700)]
am
767fea95: Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev
* commit '
767fea952b45f29f2091f1fb59a1bb3c24eed7e1':
Apparently the mp3 decoder glitches if it was configured with the wrong
Marco Nelissen [Wed, 17 Apr 2013 22:38:19 +0000 (22:38 +0000)]
Merge "Make sure the drain buffer is big enough" into jb-mr2-dev
Andreas Huber [Wed, 17 Apr 2013 22:35:28 +0000 (22:35 +0000)]
Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev
Andreas Huber [Wed, 17 Apr 2013 19:54:58 +0000 (12:54 -0700)]
am
8dd719e4: Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev
* commit '
8dd719e4374c009c86569180a9017bab339db37e':
Fix a typo that would cause us not to shutdown/flush the decoders in
Andreas Huber [Wed, 17 Apr 2013 19:54:58 +0000 (12:54 -0700)]
am
ed863845: Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev
* commit '
ed86384591c0bf7ee2d227a6c56e85aa54bfaeac':
Parse the last none-empty line of .m3u8 file
Andreas Huber [Wed, 17 Apr 2013 19:52:41 +0000 (19:52 +0000)]
Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev
Andreas Huber [Wed, 17 Apr 2013 19:52:14 +0000 (19:52 +0000)]
Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev
Andreas Huber [Tue, 16 Apr 2013 23:35:19 +0000 (16:35 -0700)]
Apparently the mp3 decoder glitches if it was configured with the wrong
sample rate. Make sure we tell it about the one the extractor provides.
Change-Id: Ice5b9cf55485ca1a8f099a14be0202be9540e781
related-to-bug:
8621639
Jeff Tinker [Wed, 17 Apr 2013 16:20:14 +0000 (09:20 -0700)]
am
9e0727ca: Merge "Added CTS test for secure stop APIs" into jb-mr2-dev
* commit '
9e0727caf75049f17f8237efa159cd4baf699de7':
Added CTS test for secure stop APIs
Jeff Tinker [Wed, 17 Apr 2013 16:16:39 +0000 (16:16 +0000)]
Merge "Added CTS test for secure stop APIs" into jb-mr2-dev
Jeff Tinker [Mon, 8 Apr 2013 22:23:17 +0000 (15:23 -0700)]
Added CTS test for secure stop APIs
bug:
8604418
Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365
Marco Nelissen [Tue, 16 Apr 2013 22:57:38 +0000 (15:57 -0700)]
Make sure the drain buffer is big enough
b/
8614909
Change-Id: I9d973dcd74100b793791359c262b821207ff9ddd
Andreas Huber [Tue, 16 Apr 2013 17:54:03 +0000 (10:54 -0700)]
Fix a typo that would cause us not to shutdown/flush the decoders in
some cases.
related-to-bug:
8630032
Change-Id: I8e94b53b34e137e827e9630c65f3252ea91e4ebd
Eino-Ville Talvala [Tue, 16 Apr 2013 17:29:22 +0000 (10:29 -0700)]
am
480721ea: Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev
* commit '
480721ea3a724875a9d7787f656eb0bb88be7700':
Camera3: Allow multiple process_capture_result calls per request
Eino-Ville Talvala [Tue, 16 Apr 2013 17:26:38 +0000 (17:26 +0000)]
Merge "Camera3: Allow multiple process_capture_result calls per request" into jb-mr2-dev
Sungsoo Lim [Mon, 31 Dec 2012 08:48:20 +0000 (17:48 +0900)]
Parse the last none-empty line of .m3u8 file
If the last sentence of .m3u8 file is not processed, because
it is not empty and has no line feed, M3UParser.isComplete()
returns false even though it is completed.
Change-Id: I01b9f900d44247a3ef40369a2f9198bb7eaf01b7
related-to-bug:
8405824
Andreas Huber [Tue, 16 Apr 2013 16:16:51 +0000 (09:16 -0700)]
am
f5c02110: Merge "Guard against mLooper == NULL." into jb-mr2-dev
* commit '
f5c0211057be7a1d32f356d4162a84cce281394d':
Guard against mLooper == NULL.
Andreas Huber [Tue, 16 Apr 2013 16:15:14 +0000 (16:15 +0000)]
Merge "Guard against mLooper == NULL." into jb-mr2-dev
Jean-Michel Trivi [Tue, 16 Apr 2013 15:45:10 +0000 (08:45 -0700)]
am
ff4b1e2b: Merge "Better default AAC DRC setting" into jb-mr2-dev
* commit '
ff4b1e2b9a7109669ce794692553a2ce14981923':
Better default AAC DRC setting
Jean-Michel Trivi [Tue, 16 Apr 2013 15:42:00 +0000 (15:42 +0000)]
Merge "Better default AAC DRC setting" into jb-mr2-dev
Marco Nelissen [Tue, 16 Apr 2013 15:19:15 +0000 (08:19 -0700)]
am
94b66227: Fix Vorbis decoder reset
* commit '
94b66227ff5a57dd810aafa7b3aa810b9a185b8d':
Fix Vorbis decoder reset
Jean-Michel Trivi [Tue, 16 Apr 2013 01:40:51 +0000 (18:40 -0700)]
Better default AAC DRC setting
By default, use boost and attenuation together.
bug
7140036
Change-Id: Ie0565f9e5cd24f7a59b5a218b4e6186661832601
Marco Nelissen [Mon, 15 Apr 2013 23:28:49 +0000 (16:28 -0700)]
Fix Vorbis decoder reset
b/
8543366
Change-Id: I9f32e96fdfc355cf444259a7c40554e2de184728
Andreas Huber [Mon, 15 Apr 2013 23:18:56 +0000 (16:18 -0700)]
Guard against mLooper == NULL.
Change-Id: I01aa0e47b55d0dffe34525edf9f055a5cb4dc70f
related-to-bug:
8620223
Eino-Ville Talvala [Tue, 9 Apr 2013 21:13:50 +0000 (14:13 -0700)]
Camera3: Allow multiple process_capture_result calls per request
To simplify HAL implementation, allow the results for a single
capture request to be sent from the HAL across multiple calls
to process_capture_request.
This requires that the HAL must call notify() with the SHUTTER message
to indicate start of exposure time, before the first call to
process_capture_result for a given frame.
Bug:
8565103
Change-Id: I6a61449725f98af88769fafa07736848a226dad2
Marco Nelissen [Mon, 15 Apr 2013 20:46:29 +0000 (13:46 -0700)]
am
f4c873a6: Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev
* commit '
f4c873a64db2d5d2d74ca596e7482627dd6b4238':
Fix AAC decoder reconfiguration
Marco Nelissen [Mon, 15 Apr 2013 20:42:33 +0000 (20:42 +0000)]
Merge "Fix AAC decoder reconfiguration" into jb-mr2-dev
Glenn Kasten [Mon, 15 Apr 2013 19:10:13 +0000 (12:10 -0700)]
am
5182337f: Merge "Workaround: requestPriority() is one-way" into jb-mr2-dev
* commit '
5182337fcf848ca410ae61397752dfb0995067ef':
Workaround: requestPriority() is one-way
Glenn Kasten [Mon, 15 Apr 2013 19:07:56 +0000 (19:07 +0000)]
Merge "Workaround: requestPriority() is one-way" into jb-mr2-dev
Marco Nelissen [Mon, 15 Apr 2013 19:06:18 +0000 (12:06 -0700)]
Fix AAC decoder reconfiguration
The recent flush() changed made the codec behave differently after
a reconfigure. Now we reset its state properly again.
b/
8543366
Change-Id: I8807b5ab02249b43fc1cf315d4e8d4ceb3f9b298
ztenghui [Mon, 15 Apr 2013 18:39:12 +0000 (11:39 -0700)]
am
8f1efee1: Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev
* commit '
8f1efee1c17e997af5ea3c46c62b3ae106b18264':
MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.
ztenghui [Mon, 15 Apr 2013 18:36:01 +0000 (18:36 +0000)]
Merge "MediaMuxer prefer not to use the MPEG4Writer in real time recording mode." into jb-mr2-dev
ztenghui [Fri, 12 Apr 2013 20:50:38 +0000 (13:50 -0700)]
MediaMuxer prefer not to use the MPEG4Writer in real time recording mode.
By default, MPEG4Write will keep running in real time recording mode.
bug:
8598944
Change-Id: Idf7fbd4e0feb7763660a74279ba8817b79098aaf
The Android Open Source Project [Mon, 15 Apr 2013 17:46:05 +0000 (10:46 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I73bc6567706973507090e4c9bc05cd61ee850260
Andreas Huber [Mon, 15 Apr 2013 15:34:32 +0000 (08:34 -0700)]
am
5ce9c299: Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev
* commit '
5ce9c299a64a1568165fc66adb2cf68d89198a90':
Instead of returning an error, return an invalid duration (-1 ms)
Andreas Huber [Mon, 15 Apr 2013 15:16:02 +0000 (15:16 +0000)]
Merge "Instead of returning an error, return an invalid duration (-1 ms)" into jb-mr2-dev
The Android Automerger [Mon, 15 Apr 2013 12:55:41 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:33:28 +0000 (18:33 -0700)]
am
7455393a: Merge "Update the test output path." into jb-mr2-dev
* commit '
7455393a82bea99b88740365bc6612cbcac1a14a':
Update the test output path.
Yu Shan Emily Lau [Mon, 15 Apr 2013 01:30:32 +0000 (01:30 +0000)]
Merge "Update the test output path." into jb-mr2-dev
Yu Shan Emily Lau [Fri, 12 Apr 2013 21:52:52 +0000 (14:52 -0700)]
Update the test output path.
In order for the automated test to pick up the test.
The output must be in /data/nativetest.
Change-Id: Idc15036afb5617ac1ef67ff74ba332c5f73fe155
Jamie Gennis [Fri, 12 Apr 2013 17:43:54 +0000 (10:43 -0700)]
am
4a4256eb: Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev
* commit '
4a4256eb3963124e20ce63034c092c9bec396e32':
OMXNodeInstance: fix OMX_GetExtensionIndex logging
Jamie Gennis [Fri, 12 Apr 2013 17:38:49 +0000 (17:38 +0000)]
Merge "OMXNodeInstance: fix OMX_GetExtensionIndex logging" into jb-mr2-dev
Marco Nelissen [Fri, 12 Apr 2013 17:25:45 +0000 (10:25 -0700)]
am
089edf2e: Merge "Fix MediaCodec.flush()" into jb-mr2-dev
* commit '
089edf2e227c72b7ff4fd9b9ed96320e21811d50':
Fix MediaCodec.flush()
Marco Nelissen [Fri, 12 Apr 2013 17:20:51 +0000 (17:20 +0000)]
Merge "Fix MediaCodec.flush()" into jb-mr2-dev
Marco Nelissen [Tue, 9 Apr 2013 21:57:38 +0000 (14:57 -0700)]
Fix MediaCodec.flush()
There were two problems here. One was that the skip/cut buffer
wasn't cleared when it should be, and the second was that we
were always sending the first buffer of encoded data to the AAC
decoder twice.
b/
8543366
Change-Id: Ic040edabf16cccd1f6ef8c9e5c9cfbacbdd8a089
Andreas Huber [Fri, 12 Apr 2013 15:24:50 +0000 (08:24 -0700)]
am
5157b1e8: Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev
* commit '
5157b1e8355ef3176536e4de793ec1b7679b7ad9':
ACodec now signals an error if the mediaserver died while it is in
Andreas Huber [Fri, 12 Apr 2013 15:24:50 +0000 (08:24 -0700)]
am
c120d033: Merge "The framework really doesn\'t need to know the specifics of the codec" into jb-mr2-dev
* commit '
c120d033c011e5943e74b6cde638d15fd02eb5b9':
The framework really doesn't need to know the specifics of the codec
Andreas Huber [Fri, 12 Apr 2013 15:22:20 +0000 (15:22 +0000)]
Merge "ACodec now signals an error if the mediaserver died while it is in" into jb-mr2-dev
Andreas Huber [Fri, 12 Apr 2013 15:22:05 +0000 (15:22 +0000)]
Merge "The framework really doesn't need to know the specifics of the codec" into jb-mr2-dev
Glenn Kasten [Fri, 12 Apr 2013 00:21:41 +0000 (17:21 -0700)]
Workaround: requestPriority() is one-way
Bug:
8565696
Change-Id: If5fcdf8593e1ca15bea45217bd683b43a2a106c7
Eino-Ville Talvala [Thu, 11 Apr 2013 23:51:30 +0000 (16:51 -0700)]
am
cb42f317: Merge "Camera3: Improve error logging" into jb-mr2-dev
* commit '
cb42f317876ff42ed2b7de432b87d0486c385eb7':
Camera3: Improve error logging
Eino-Ville Talvala [Thu, 11 Apr 2013 23:47:32 +0000 (23:47 +0000)]
Merge "Camera3: Improve error logging" into jb-mr2-dev
Andreas Huber [Thu, 11 Apr 2013 23:06:14 +0000 (16:06 -0700)]
ACodec now signals an error if the mediaserver died while it is in
anything other than "uninitialized" state.
Change-Id: Id133d897ac65b455b34e5de17ff9c39b47285630
related-to-bug:
8397711
Andreas Huber [Thu, 11 Apr 2013 18:37:28 +0000 (11:37 -0700)]
The framework really doesn't need to know the specifics of the codec
color format, so stop trying to enforce a whitelist.
Change-Id: I0ceb3bdd5bcc6c1bbd56740b0cd662a2b5820dfe
related-to-bug:
8596546
Andreas Huber [Thu, 11 Apr 2013 18:07:55 +0000 (11:07 -0700)]
Instead of returning an error, return an invalid duration (-1 ms)
if no duration information was available. This prevents us from
entering ERROR state, effectively rendering the player instance useless.
Change-Id: I602d2661ae8b8633360306c0ea9208fb11e2bf17
related-to-bug:
8596285
The Android Open Source Project [Wed, 10 Apr 2013 17:05:32 +0000 (10:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I24038f939a31f582d6efc1fbe1488e7b15112b35
The Android Automerger [Wed, 10 Apr 2013 12:55:56 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Ying Wang [Wed, 10 Apr 2013 05:21:31 +0000 (22:21 -0700)]
Ying Wang [Wed, 10 Apr 2013 04:53:49 +0000 (21:53 -0700)]
Add liblog
Bug:
8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
Jamie Gennis [Tue, 9 Apr 2013 23:40:54 +0000 (16:40 -0700)]
OMXNodeInstance: fix OMX_GetExtensionIndex logging
This change fixes the logging of OMX_GetExtensionIndex errors. Under certain
circumstances these errors are not harmful and should not be logged.
Bug:
8538872
Change-Id: I19a13d29ca6263454a9a7a8be205e10363725f31
Eino-Ville Talvala [Tue, 9 Apr 2013 20:49:56 +0000 (13:49 -0700)]
Camera3: Improve error logging
In preparation for supporting fragmented result calls.
Bug:
8565103
Change-Id: Id834637d7cbecf7b550333beedab3281b5400748
The Android Automerger [Tue, 9 Apr 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Marco Nelissen [Mon, 8 Apr 2013 23:42:18 +0000 (16:42 -0700)]
am
ec771223: Add support for common encryption
* commit '
ec77122351b4e78c1fe5b60a208f76baf8c67591':
Add support for common encryption
Marco Nelissen [Mon, 8 Apr 2013 21:30:57 +0000 (14:30 -0700)]
Add support for common encryption
b/
7465749
Change-Id: I5403b74a5ae428ad28b382863a09daafc400b137
The Android Open Source Project [Mon, 8 Apr 2013 20:35:51 +0000 (13:35 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id3fbd2741e1c0b6c32e73cd5e33ab27cf947350e
The Android Automerger [Mon, 8 Apr 2013 12:56:03 +0000 (05:56 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Fri, 5 Apr 2013 23:32:26 +0000 (16:32 -0700)]
am
b3a95a56: Camera: implement takePicture for HAL3-using clients
* commit '
b3a95a56f0adaf2b60ff164275487d1870442734':
Camera: implement takePicture for HAL3-using clients
Igor Murashkin [Tue, 2 Apr 2013 00:29:07 +0000 (17:29 -0700)]
Camera: implement takePicture for HAL3-using clients
* Implements Camera2Device-style triggers by mutating the next request
* Implements Camera3Device::waitUntilRequestReceived
Change-Id: Ie0b5591158872513a0bffbfab33123cf18dacf8a
Andreas Huber [Fri, 5 Apr 2013 16:56:03 +0000 (09:56 -0700)]
am
526b2285: Merge "In certain cases where AAC audio frames extended into the next PES payload" into jb-mr2-dev
* commit '
526b2285e975b3c02d174d8798b55e9fc300f0d3':
In certain cases where AAC audio frames extended into the next PES payload
Andreas Huber [Fri, 5 Apr 2013 16:53:23 +0000 (16:53 +0000)]
Merge "In certain cases where AAC audio frames extended into the next PES payload" into jb-mr2-dev
Andreas Huber [Fri, 5 Apr 2013 16:27:29 +0000 (09:27 -0700)]
In certain cases where AAC audio frames extended into the next PES payload
(inside transport streams) timestamps would be miscalculated. This fixes it.
Change-Id: I9d74eeea474d2b89e8a9cdc478ed6085282fb3be
Jeff Tinker [Fri, 5 Apr 2013 01:19:34 +0000 (18:19 -0700)]
am
d5ef30b2: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '
d5ef30b223b627c21b11f2850eeb48426c74220d':
Implement async event callout from drm plugin to Java app
Jeff Tinker [Fri, 5 Apr 2013 01:16:19 +0000 (01:16 +0000)]
Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
Marco Nelissen [Thu, 4 Apr 2013 23:20:27 +0000 (16:20 -0700)]
am
f8fae863: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
* commit '
f8fae863e8a5d442684634a1d3b2adcbe74b957a':
Make sure resume() and flush() are handled appropriately even if the codec
Marco Nelissen [Thu, 4 Apr 2013 23:18:05 +0000 (23:18 +0000)]
Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
Marco Nelissen [Thu, 4 Apr 2013 22:37:21 +0000 (15:37 -0700)]
Make sure resume() and flush() are handled appropriately even if the codec
is in Loaded->Idle state.
b/
8347958
Change-Id: Ic14d29502a7effc636251379bb1bbc25739db98e
Eric Laurent [Thu, 4 Apr 2013 21:55:54 +0000 (14:55 -0700)]
am
af69ca18: Merge "audioflinger: multiple tracks on direct output" into jb-mr2-dev
* commit '
af69ca187058c417bbb4e653b0dbde8abdddd860':
audioflinger: multiple tracks on direct output
Eric Laurent [Thu, 4 Apr 2013 21:50:47 +0000 (21:50 +0000)]
Merge "audioflinger: multiple tracks on direct output" into jb-mr2-dev
Eric Laurent [Thu, 4 Apr 2013 00:27:56 +0000 (17:27 -0700)]
audioflinger: multiple tracks on direct output
Fix problems when multiple tracks exist on a direct output
thread: when multiple tracks are active, continue to update all
track states but only take into account the last track started
for audio HAL volume and mixer state control.
Bug
8388941
Change-Id: I57e6757286f41651dda99b11a5449e431812431b
Lajos Molnar [Thu, 4 Apr 2013 20:14:26 +0000 (13:14 -0700)]
am
2e9c6f37: Merge "Fix previous changes." into jb-mr2-dev
* commit '
2e9c6f37f8a839a6e31f118a5748ea8faac152a8':
Fix previous changes.
Lajos Molnar [Thu, 4 Apr 2013 20:11:22 +0000 (20:11 +0000)]
Merge "Fix previous changes." into jb-mr2-dev
Andreas Huber [Thu, 4 Apr 2013 20:03:03 +0000 (13:03 -0700)]
Fix previous changes.
Change-Id: I1cd3803b6507156174591c3252f1d89ef2e6140a
Andreas Huber [Thu, 4 Apr 2013 19:59:59 +0000 (12:59 -0700)]
am
74a6b0f1: Merge "RTPReceiver can now track packet loss, account for late arrivals" into jb-mr2-dev
* commit '
74a6b0f1a0de62b34b41dca22ea82615c3fdc77a':
RTPReceiver can now track packet loss, account for late arrivals
Andreas Huber [Thu, 4 Apr 2013 19:59:59 +0000 (12:59 -0700)]
am
071c6334: Merge "Support "raw" packetization in RTPSender." into jb-mr2-dev
* commit '
071c6334bf1e59fa8c5229b8c9f0b43616884982':
Support "raw" packetization in RTPSender.
Andreas Huber [Thu, 4 Apr 2013 19:59:58 +0000 (12:59 -0700)]
am
8f2f7b33: Merge "New nettest, a simple TCP connection test to measure" into jb-mr2-dev
* commit '
8f2f7b336fc3ae0482bb2bd30e2f61423bf46958':
New nettest, a simple TCP connection test to measure
Andreas Huber [Thu, 4 Apr 2013 19:59:58 +0000 (12:59 -0700)]
am
13e1c06b: Merge "RTPTest updated to allow for UDP/TCP transport and abstracted" into jb-mr2-dev
* commit '
13e1c06bdeb7c6d48fd9b64254648c0af991acc5':
RTPTest updated to allow for UDP/TCP transport and abstracted
Andreas Huber [Thu, 4 Apr 2013 19:57:42 +0000 (19:57 +0000)]
Merge "RTPReceiver can now track packet loss, account for late arrivals" into jb-mr2-dev
Andreas Huber [Thu, 4 Apr 2013 19:57:31 +0000 (19:57 +0000)]
Merge "Support "raw" packetization in RTPSender." into jb-mr2-dev