OSDN Git Service
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
Andreas Huber [Thu, 4 Apr 2013 19:57:21 +0000 (19:57 +0000)]
Merge "New nettest, a simple TCP connection test to measure" into jb-mr2-dev
Andreas Huber [Thu, 4 Apr 2013 19:54:51 +0000 (19:54 +0000)]
Merge "RTPTest updated to allow for UDP/TCP transport and abstracted" into jb-mr2-dev
Andreas Huber [Thu, 4 Apr 2013 18:16:39 +0000 (11:16 -0700)]
Support "raw" packetization in RTPSender.
Change-Id: I14d59573ee0f57eccc104fea0fb46377476d213d
Andreas Huber [Thu, 4 Apr 2013 18:12:36 +0000 (11:12 -0700)]
am
ac67e976: Merge "Track max latency in WifiDisplaySink" into jb-mr2-dev
* commit '
ac67e976b35cf43b4e8aea0eb64c4f206065096a':
Track max latency in WifiDisplaySink
Andreas Huber [Thu, 4 Apr 2013 18:12:35 +0000 (11:12 -0700)]
am
8058888d: Merge "Reduce TimeSyncer frequency to once every 60 secs, added some logs" into jb-mr2-dev
* commit '
8058888d7b98e14d82a68d0cf4f122a5c118894d':
Reduce TimeSyncer frequency to once every 60 secs, added some logs
Andreas Huber [Thu, 4 Apr 2013 18:12:35 +0000 (11:12 -0700)]
am
7a09d501: Merge "Removed rtp timestamp patching hack in ANetworkSession, advertise" into jb-mr2-dev
* commit '
7a09d501fe339203a1a38b35dbc13dc0dc31dcf9':
Removed rtp timestamp patching hack in ANetworkSession, advertise
Andreas Huber [Thu, 4 Apr 2013 18:12:34 +0000 (11:12 -0700)]
am
fa3df4ad: Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev
* commit '
fa3df4ad35da6528ab5620d4f596c60d8cd99110':
Fix adaptive frame rate handling to be non-adaptive unless specified through
Andreas Huber [Thu, 4 Apr 2013 18:12:24 +0000 (11:12 -0700)]
New nettest, a simple TCP connection test to measure
latency between two devices exchanging low-bitrate data.
Change-Id: Iac138fa70d2a69bbc86c517c953011c80bed071f
Andreas Huber [Thu, 4 Apr 2013 18:09:36 +0000 (18:09 +0000)]
Merge "Track max latency in WifiDisplaySink" into jb-mr2-dev
Andreas Huber [Thu, 4 Apr 2013 18:09:26 +0000 (18:09 +0000)]
Merge "Reduce TimeSyncer frequency to once every 60 secs, added some logs" into jb-mr2-dev
Andreas Huber [Thu, 4 Apr 2013 18:09:17 +0000 (18:09 +0000)]
Merge "Removed rtp timestamp patching hack in ANetworkSession, advertise" into jb-mr2-dev
Andreas Huber [Thu, 4 Apr 2013 18:09:04 +0000 (18:09 +0000)]
Merge "Fix adaptive frame rate handling to be non-adaptive unless specified through" into jb-mr2-dev
Andreas Huber [Thu, 4 Apr 2013 17:50:18 +0000 (10:50 -0700)]
Removed rtp timestamp patching hack in ANetworkSession, advertise
differentiated service tags to help prioritize our traffic.
Change-Id: Ibe42df64da272f4bb6b978e46a4ea2efdadfcbc7
Andreas Huber [Thu, 4 Apr 2013 17:49:17 +0000 (10:49 -0700)]
am
a5761dcb: Fix a number of warnings in stagefright code.
* commit '
a5761dcb5f9f017ca9b83ec868565d7ce54a92ac':
Fix a number of warnings in stagefright code.
Andreas Huber [Thu, 4 Apr 2013 17:48:50 +0000 (10:48 -0700)]
Fix adaptive frame rate handling to be non-adaptive unless specified through
adb shell setprop media.wfd.video-framerate adaptive
Change-Id: I452576b62ad465680232b40464977e126616df18
Andreas Huber [Thu, 4 Apr 2013 17:42:23 +0000 (10:42 -0700)]
Fix a number of warnings in stagefright code.
Change-Id: If3edd00d991851797aeccdfe795a4a405e3a2ea3
The Android Open Source Project [Wed, 3 Apr 2013 23:43:18 +0000 (16:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Icb6a064ee14714e954177e5110282efe21727ec6
Eric Laurent [Wed, 3 Apr 2013 16:08:55 +0000 (09:08 -0700)]
am
a9cbef06: Merge "audioflinger: add effect config status check" into jb-mr2-dev
* commit '
a9cbef06acb2a422474cbf292debc1f31fcf9c44':
audioflinger: add effect config status check
Eric Laurent [Wed, 3 Apr 2013 16:06:30 +0000 (16:06 +0000)]
Merge "audioflinger: add effect config status check" into jb-mr2-dev
The Android Automerger [Wed, 3 Apr 2013 13:02:20 +0000 (06:02 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Wed, 3 Apr 2013 00:11:59 +0000 (17:11 -0700)]
am
e09f4860: Camera3: Fix output stream creation for JPEG streams
* commit '
e09f486085c7e7f3de329db73ad6bb9899740dbe':
Camera3: Fix output stream creation for JPEG streams
Eric Laurent [Tue, 2 Apr 2013 23:41:41 +0000 (16:41 -0700)]
audioflinger: add effect config status check
Check the result of the effect engine configuration command
and do not attempt to send parameters to, enable, or process
the effect if configuration fails.
Bug
8512027
Change-Id: I8c78a05d79fba36b1a387aa5cf2700612301ac91
Jeff Tinker [Tue, 2 Apr 2013 23:45:22 +0000 (16:45 -0700)]
am
a56e1506: Merge "MediaDrm API update" into jb-mr2-dev
* commit '
a56e15065bc45082d913c8c8e71e60692ce8c8f0':
MediaDrm API update
Igor Murashkin [Tue, 2 Apr 2013 23:36:33 +0000 (16:36 -0700)]
Camera3: Fix output stream creation for JPEG streams
Change-Id: Iadf85c103c21614abb1aeb69a832ca01919c2aa5
Jeff Tinker [Tue, 2 Apr 2013 22:49:20 +0000 (22:49 +0000)]
Merge "MediaDrm API update" into jb-mr2-dev
Igor Murashkin [Tue, 2 Apr 2013 21:13:02 +0000 (14:13 -0700)]
am
b7c9d61b: Camera3: Fix metadata result not being rewritten after capture
* commit '
b7c9d61b9d398b272c8138a2c6aace069229ac03':
Camera3: Fix metadata result not being rewritten after capture
Igor Murashkin [Tue, 2 Apr 2013 19:32:32 +0000 (12:32 -0700)]
Camera3: Fix metadata result not being rewritten after capture
Generally this problem manifested itself as the Frame Count not being set,
which then errored out ProFrameProcessor with a "Success" error.
Change-Id: Ifa927f43d0ce92100651ad3f714099a2f1ec4c2a
The Android Automerger [Tue, 2 Apr 2013 16:18:40 +0000 (09:18 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 2 Apr 2013 15:39:28 +0000 (08:39 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Icef54451c7ccec9250f3d83a84558e2ed327264b
Andreas Huber [Tue, 2 Apr 2013 15:23:44 +0000 (08:23 -0700)]
am
848621d5: Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev
* commit '
848621d519636e2abdb8575ba0f964efc53da0d5':
Fix seek in response to OnPrepared() for HLS content
Eric Laurent [Tue, 2 Apr 2013 15:23:32 +0000 (08:23 -0700)]
am
0fb6aabf: Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev
* commit '
0fb6aabfb5edaa7687372fac1b1b7c329e7629a2':
ToneGenerator: fix overflow in stopTone
Jeff Tinker [Sat, 30 Mar 2013 23:19:44 +0000 (16:19 -0700)]
MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
Andreas Huber [Mon, 1 Apr 2013 21:40:34 +0000 (21:40 +0000)]
Merge "Fix seek in response to OnPrepared() for HLS content" into jb-mr2-dev
Andreas Huber [Mon, 1 Apr 2013 21:28:31 +0000 (14:28 -0700)]
Fix seek in response to OnPrepared() for HLS content
Change-Id: I0e52352845398a4db074e939487f6f6de94bd523
related-to-bug:
8225122
Eric Laurent [Mon, 1 Apr 2013 21:15:46 +0000 (21:15 +0000)]
Merge "ToneGenerator: fix overflow in stopTone" into jb-mr2-dev
Mike Lockwood [Mon, 1 Apr 2013 18:28:32 +0000 (11:28 -0700)]
am
ec24fa46: MTP: Implement date created field in GetObjectInfo
* commit '
ec24fa46443634cd29627182c5812ccf43682692':
MTP: Implement date created field in GetObjectInfo
Mike Lockwood [Mon, 1 Apr 2013 17:51:35 +0000 (10:51 -0700)]
MTP: Implement date created field in GetObjectInfo
Bug:
8293874
Change-Id: I6b74fe73362bd4fac34ca8a54e127ae91f82aef9
Lajos Molnar [Mon, 1 Apr 2013 17:32:50 +0000 (10:32 -0700)]
am
f9230087: Merge "stagefright: matroska: don\'t crash on parsing error" into jb-mr2-dev
* commit '
f92300875743fca7e264c731a4e2fe9860cd1b10':
stagefright: matroska: don't crash on parsing error
Lajos Molnar [Mon, 1 Apr 2013 17:31:15 +0000 (17:31 +0000)]
Merge "stagefright: matroska: don't crash on parsing error" into jb-mr2-dev
The Android Automerger [Mon, 1 Apr 2013 12:55:39 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Fri, 29 Mar 2013 16:48:53 +0000 (09:48 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia951d1acc654210e90b8eb1fd30d154440117127
Andreas Huber [Thu, 28 Mar 2013 20:55:54 +0000 (13:55 -0700)]
am
31215f2f: Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev
* commit '
31215f2f341bae9d1f6db6368b2b1539e077d571':
Fix SHUTDOWN after SETUP and before PLAY in wifi display.
Andreas Huber [Thu, 28 Mar 2013 20:54:55 +0000 (20:54 +0000)]
Merge "Fix SHUTDOWN after SETUP and before PLAY in wifi display." into jb-mr2-dev
Andreas Huber [Thu, 28 Mar 2013 20:34:10 +0000 (13:34 -0700)]
Fix SHUTDOWN after SETUP and before PLAY in wifi display.
Change-Id: Ieb8ce1ac3130254839975a3677162b64156735bc
related-to-bug:
8499893
Eric Laurent [Thu, 28 Mar 2013 18:58:45 +0000 (11:58 -0700)]
ToneGenerator: fix overflow in stopTone
Fix overflow in tone duration calculation introduced in
commit
681be039.
Bug
6607077
Change-Id: Ie12f13701345c2b2d3be0b3c4d71cbfa2394a29b
Andreas Huber [Thu, 28 Mar 2013 18:23:56 +0000 (11:23 -0700)]
am
d0b1fac1: Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
* commit '
d0b1fac13ead06231dcc0782d137d117e02d634e':
Make sure resume() and flush() are handled appropriately even if the codec
Andreas Huber [Thu, 28 Mar 2013 18:21:11 +0000 (18:21 +0000)]
Merge "Make sure resume() and flush() are handled appropriately even if the codec" into jb-mr2-dev
Andreas Huber [Thu, 28 Mar 2013 18:16:43 +0000 (11:16 -0700)]
Make sure resume() and flush() are handled appropriately even if the codec
is in Idle->Executing state.
Change-Id: I16a10791fae0e062a19299732c472cc93e4ed971
related-to-bug:
8347958
Marco Nelissen [Thu, 28 Mar 2013 16:18:59 +0000 (09:18 -0700)]
am
5952255a: Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev
* commit '
5952255a0259882cc32ee6e98018ced679303724':
Fix valgrind error in software h264 decoder
Marco Nelissen [Thu, 28 Mar 2013 16:15:14 +0000 (16:15 +0000)]
Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev
Eino-Ville Talvala [Thu, 28 Mar 2013 16:10:53 +0000 (09:10 -0700)]
am
636a5bd6: Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-dev
* commit '
636a5bd65bacb86dff10b6393a4776046254aa13':
Camera: Add output side to camera3 HAL device
Eino-Ville Talvala [Thu, 28 Mar 2013 16:07:36 +0000 (09:07 -0700)]
am
3a1d8b51: Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-dev
* commit '
3a1d8b515fcfcf27b4b04bd677429a7ce2db6bcb':
Camera: Add input side to camera3 HAL device
Eino-Ville Talvala [Thu, 28 Mar 2013 16:07:35 +0000 (09:07 -0700)]
am
8fc405ff: Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev
* commit '
8fc405fffb69cad88cfd8ee09130220f31ad28e2':
Camera: Add streams to camera3 HAL device
Eino-Ville Talvala [Thu, 28 Mar 2013 16:07:16 +0000 (16:07 +0000)]
Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-dev
Eino-Ville Talvala [Thu, 28 Mar 2013 16:06:21 +0000 (16:06 +0000)]
Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-dev
Eino-Ville Talvala [Thu, 28 Mar 2013 16:06:11 +0000 (16:06 +0000)]
Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev
Marco Nelissen [Thu, 28 Mar 2013 15:57:38 +0000 (08:57 -0700)]
am
d6a6bf3f: Merge "Fix valgrind error." into jb-mr2-dev
* commit '
d6a6bf3f29bfa86a02e33eabf041e6ec136308af':
Fix valgrind error.
Marco Nelissen [Thu, 28 Mar 2013 15:55:38 +0000 (15:55 +0000)]
Merge "Fix valgrind error." into jb-mr2-dev
The Android Automerger [Thu, 28 Mar 2013 12:55:36 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Lajos Molnar [Thu, 28 Mar 2013 02:04:12 +0000 (19:04 -0700)]
stagefright: matroska: don't crash on parsing error
MatroskaExtractor crashed with an assertion if mkvparser::ParseNext()
returned a negative number. Now handle all error values the same
way as the EOF.
Change-Id: I173c4f878d692a0cbdb915ad1118d0686249d625
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
8433794
Eric Laurent [Thu, 28 Mar 2013 01:19:26 +0000 (18:19 -0700)]
am
681be039: ToneGenerator: fix truncated tones
* commit '
681be0398a06da7e24db4ed934a92af64d1409b1':
ToneGenerator: fix truncated tones
Eric Laurent [Wed, 27 Mar 2013 19:05:40 +0000 (12:05 -0700)]
ToneGenerator: fix truncated tones
The first DTMF tone after a silent period is truncated.
This is because the phone app starts and stops the tone
when the user presses and releases the key.
This combined to the fact that the tones use the low latency path
and that when the output stream exists standby there is a period
of several milliseconds during which no audio is mixed until the
stream is "warmed up".
The result is that much less audio is generated than the actual
key press duration.
The fix consists in storing the tone start time and making sure that
the number of samples generated corresponds at least to the time difference
between the tone start and stop commands.
Bug
6607077
Change-Id: I070d20dd8600c25a9e5d5a60c1d3313b7917b00d
Eric Laurent [Thu, 28 Mar 2013 00:29:53 +0000 (17:29 -0700)]
am
2d595c0e: Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev
* commit '
2d595c0efc0eee9e0c94f4842c6fed07c19163c1':
ToneGenerator: fix stop/destroy concurrency
Eric Laurent [Thu, 28 Mar 2013 00:24:50 +0000 (00:24 +0000)]
Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev
Eino-Ville Talvala [Mon, 11 Mar 2013 21:13:50 +0000 (14:13 -0700)]
Camera: Add output side to camera3 HAL device
- Notifications
- Result queue and processing
Change-Id: Id6b4746708ce6c6dcc7262666b6ac3130fa3d225
Eino-Ville Talvala [Thu, 28 Feb 2013 02:02:26 +0000 (18:02 -0800)]
Camera: Add input side to camera3 HAL device
- Stream creation/deletion
- Request submission
- Request thread loop
- Add get() to CameraMetadata to allow HAL submission while retaining
ownership.
Change-Id: I271f72bcbe9557eded43cbcbfe789109857f8144
Eino-Ville Talvala [Thu, 7 Mar 2013 00:20:06 +0000 (16:20 -0800)]
Camera: Add streams to camera3 HAL device
- Generic stream interface
- Functional output stream
- Skeleton input/zsl stream
Change-Id: I143794eac1a2217031d62b51912662fc6d1db900
Marco Nelissen [Wed, 27 Mar 2013 23:44:54 +0000 (16:44 -0700)]
Fix valgrind error in software h264 decoder
h264bsdNextMbAddress could read past the end of an allocation, which
could conceivably result in a segfault if the allocation was at the
very end of a page.
Change-Id: Id7a0c5733d66e609f36feb0e15b2d67b9bbc0b4d
Igor Murashkin [Wed, 27 Mar 2013 22:44:57 +0000 (15:44 -0700)]
am
ad065d38: Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev
* commit '
ad065d38daace14281801127bd447114b7b4daa5':
Camera: Add hotplug support (for fixed # of cameras)
Igor Murashkin [Wed, 27 Mar 2013 22:43:14 +0000 (22:43 +0000)]
Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev
Marco Nelissen [Wed, 27 Mar 2013 20:48:36 +0000 (13:48 -0700)]
Fix valgrind error.
The constructor calls reset(), which in turn calls stop(), which then
accesses mCaptureTimeLapse before it has been initialized.
Change-Id: Ia94ac740b9bd1a0389c72647a5639dd25320d92c
Igor Murashkin [Wed, 27 Mar 2013 18:26:47 +0000 (11:26 -0700)]
am
bdeaccfd: Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev
* commit '
bdeaccfdfc26f9257d2d8036381cb5e8982fa6f5':
ProCamera: Fix memory leak in consumeFrameMetadata
Igor Murashkin [Wed, 27 Mar 2013 18:24:37 +0000 (18:24 +0000)]
Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev
Igor Murashkin [Wed, 27 Mar 2013 18:07:06 +0000 (11:07 -0700)]
ProCamera: Fix memory leak in consumeFrameMetadata
Bug:
8402301
Change-Id: I975990185f45bb8552712271b9ac457af08a170c
The Android Automerger [Wed, 27 Mar 2013 12:55:50 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Wed, 20 Mar 2013 22:56:31 +0000 (15:56 -0700)]
Camera: Add hotplug support (for fixed # of cameras)
* Minor: also change addListener to fire the current status upon subscription
* Minor: STATUS_AVAILABLE is now an alias for STATUS_PRESENT and deprecated
Change-Id: I254608a7332095e3ef201ffea64cff156cfc1b3e
Eric Laurent [Tue, 26 Mar 2013 23:37:19 +0000 (16:37 -0700)]
ToneGenerator: fix stop/destroy concurrency
There is a problem if the stopTone() method is called
from two different threads (for instance if the destructor is called
while stopTone() is waiting for the audio callback to finish).
In this case, the second call to stopTone() will not wait for the
condition to be signaled and call clearWaveGens() while the callback
can still be active, thus causing a crash.
There is a similar problem in case of concurrent calls to startTone()
and stopTone().
The fix consists in making sure that stopTone() always waits for call
back completion or timeout and exits before calling clearWaveGens()
if a concurrent start request is detected.
Bug
8163071
Change-Id: I9ddb4390407701dcad5bf83660fd9903f0d72268
Glenn Kasten [Tue, 26 Mar 2013 22:46:20 +0000 (15:46 -0700)]
am
4b6ed7f2: Merge "media.log dump" into jb-mr2-dev
* commit '
4b6ed7f255b696d1555ce71633ea08c961ec51dd':
media.log dump
Glenn Kasten [Tue, 26 Mar 2013 22:43:00 +0000 (22:43 +0000)]
Merge "media.log dump" into jb-mr2-dev
Glenn Kasten [Tue, 26 Mar 2013 22:09:04 +0000 (15:09 -0700)]
media.log dump
Bug:
8446008
Change-Id: Ia47b204f5c4c91b99591eec5420a25a3dc8e7631
Andreas Huber [Tue, 26 Mar 2013 21:59:16 +0000 (14:59 -0700)]
am
4fc3e841: Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev
* commit '
4fc3e841358164a661c78f78bc617f5ac879aa35':
Adapt frame rate instead of keeping that constant and tweaking bitrate
Andreas Huber [Tue, 26 Mar 2013 21:57:28 +0000 (21:57 +0000)]
Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev
Andreas Huber [Tue, 26 Mar 2013 20:52:43 +0000 (13:52 -0700)]
Adapt frame rate instead of keeping that constant and tweaking bitrate
Change-Id: I889abbbe1237e1a8fdd7135cdc91a2e9728ff39b
Eric Laurent [Tue, 26 Mar 2013 19:40:43 +0000 (12:40 -0700)]
am
6386b50b: ToneGenerator: fix AudioTrack pointer init
* commit '
6386b50b67185a966d43ee761acdfe7add569d10':
ToneGenerator: fix AudioTrack pointer init
Eric Laurent [Tue, 26 Mar 2013 19:25:30 +0000 (12:25 -0700)]
ToneGenerator: fix AudioTrack pointer init
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
The Android Open Source Project [Tue, 26 Mar 2013 17:49:21 +0000 (10:49 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: If7f39233ef7f924e88683aa3fbb7d4e99ab30a4c
Andreas Huber [Tue, 26 Mar 2013 17:43:59 +0000 (10:43 -0700)]
am
cd77d4a1: Identify network servers and clients with a OS version related string
* commit '
cd77d4a1d38b7609a03f6826a1ff5fa7c98aa34f':
Identify network servers and clients with a OS version related string
Andreas Huber [Tue, 26 Mar 2013 17:19:24 +0000 (10:19 -0700)]
Identify network servers and clients with a OS version related string
and put the logic to create that string in one location instead of many...
Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
Andreas Huber [Tue, 26 Mar 2013 16:11:09 +0000 (16:11 +0000)]
am
5d014f0f: Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev
* commit '
5d014f0fb4f7f20ed2f35a3c856b2d4e356f0beb':
In "special" mode we now establish a UDP RTCP channel in addition to the
Andreas Huber [Tue, 26 Mar 2013 16:08:49 +0000 (16:08 +0000)]
Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev
The Android Automerger [Tue, 26 Mar 2013 12:55:34 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev