OSDN Git Service
Glenn Kasten [Thu, 1 Nov 2012 18:57:08 +0000 (11:57 -0700)]
Merge "Save copy of mic input, disabled by default"
Glenn Kasten [Sun, 30 Sep 2012 19:29:28 +0000 (12:29 -0700)]
Save copy of mic input, disabled by default
Change-Id: I4f5e95a5ddf016530d1b2747a0a5ca0962caabda
The Android Open Source Project [Thu, 1 Nov 2012 14:54:44 +0000 (07:54 -0700)]
am
8603c8ce: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
8603c8ce359a8c69f83305aff3fe5fa26fe4ca0a':
The Android Open Source Project [Thu, 1 Nov 2012 14:51:57 +0000 (07:51 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I0fd73e8e0b948c2d01fdb9f4c6e005ee9cd2ac44
The Android Automerger [Thu, 1 Nov 2012 01:33:54 +0000 (18:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Wed, 31 Oct 2012 20:20:02 +0000 (13:20 -0700)]
am
6776e7fe: am
90a92053: Various tweaks to wfd
* commit '
6776e7fea5aa4ab045ac3f7303e3ba5d9bbce007':
Various tweaks to wfd
Andreas Huber [Wed, 31 Oct 2012 20:18:27 +0000 (13:18 -0700)]
am
90a92053: Various tweaks to wfd
* commit '
90a92053219ae50ddf4bb54e3d54db2d309e2b8d':
Various tweaks to wfd
Glenn Kasten [Wed, 31 Oct 2012 18:27:23 +0000 (11:27 -0700)]
Merge "StateQueue comments"
The Android Open Source Project [Wed, 31 Oct 2012 16:22:41 +0000 (09:22 -0700)]
am
f0e55de3: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f0e55de3b1b099c413d430d8f9d46361454c85d2':
Andreas Huber [Tue, 30 Oct 2012 22:53:03 +0000 (15:53 -0700)]
Various tweaks to wfd
related-to-bug:
7426218
Squashed commit of the following:
commit
1553f1a1c66af998674168f7f7a3be23fcb0c794
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:51:27 2012 -0700
Add LPCM, AVC and AVC HRD descriptors as necessary.
Change-Id: Ibc836fced0fe37e8a25574c2295e886765b9ea6f
commit
4e74db61d2d31ebe239acbdec8f110f88016a4ea
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:52 2012 -0700
added copyright headers to Sender.{cpp,h}
Change-Id: If615ccb8767e32bd83ed1f0f669acc39a72489f6
commit
7144bf8ae68c5cdb8faa6e219547aabbd750f04e
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:25 2012 -0700
Reenable suspension of the RepeaterSource
Change-Id: I765338fcde89c65e4b69be45a5949eba6bcdcf6f
commit
812164bcfa0699821d7d8eefcc0dff96b2e2cd08
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 14:03:50 2012 -0700
Add 2 stuffing bytes to the PES headers for audio tracks.
Change-Id: I8b9c634f6a565ab7fa7ecdb610f7d8557e0b139b
commit
a084a741a63015d47c92d99fcd8b980fe615dc7d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:38 2012 -0700
Fix PCM audio packetization in WFD.
Change-Id: I99a435f9fe6b4397f24d6c22afae5ae2505ffc14
commit
c5cb9369585f701f34bce41534940d5f9b59248f
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:12 2012 -0700
Support extraction of PCM audio from transport streams.
Change-Id: I28a0516756ebcb5587325b6588df013ac871ffb9
commit
b0a0512300ae037d6b39c2d04952d34b5fc12b2d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 08:54:13 2012 -0700
disable suspend of the RepeaterSource
Change-Id: Ibf42a98185b0567f817ae582a82e6580f95d3d40
commit
4330e8b7668dc92a6d882b5622c0697cf292d04c
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 14:11:25 2012 -0700
Better handling of datagrams in ANetworkSession
reduce unnecessary copy overhead.
Change-Id: I2ed8c767274ba07764f03e8d4913041168e5755f
commit
a44e73c322ba3f2c336f7cc4e1d63d3a74faa75d
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 11:14:47 2012 -0700
Network traffic is now handled on a separate thread.
Audio and video are queued to ensure proper A/V interleaving.
Scheduled packet sends according to capture timestamps to reduce
send-jitter.
Change-Id: Ibd6357c1e663086cf87bec0a98f8e54dfdfaa0e5
related-to-bug:
7426218
Change-Id: Ia440129d656c35814abf18df06da50b73d5bb554
The Android Open Source Project [Wed, 31 Oct 2012 16:16:33 +0000 (09:16 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I7cd153e8ccfb7d572a5796ca353ec9777de789d6
Glenn Kasten [Tue, 30 Oct 2012 17:55:15 +0000 (10:55 -0700)]
Remove obsolete libmedia_native
Bug:
6654403
Change-Id: Ic979a7890e2f4ef3f5409af14372eb52196e6dea
Glenn Kasten [Tue, 30 Oct 2012 23:19:56 +0000 (16:19 -0700)]
Merge "Remove obsolete references to libmedia_native"
Mathias Agopian [Tue, 30 Oct 2012 21:54:32 +0000 (14:54 -0700)]
Merge changes Ide218785,I86d0bb82
* changes:
fix SINC resampler on non ARM architectures
fix another issue with generating FIR coefficients
Mathias Agopian [Tue, 30 Oct 2012 20:51:44 +0000 (13:51 -0700)]
fix SINC resampler on non ARM architectures
make sure the C version of the code generates the same
output than the ARM assemply version.
Change-Id: Ide218785c35d02598b2d7278e646b1b178148698
Mathias Agopian [Tue, 30 Oct 2012 19:49:07 +0000 (12:49 -0700)]
fix another issue with generating FIR coefficients
the impulse response of a low-pass is 2*f*sinc(2*pi*f*k), we were
missing the 2*f scale factor. This explains why we were seeing
clipping and had to manually scale the filter down.
Change-Id: I86d0bb82ecdd99681c8ba5a8112a8257bf6f0186
Glenn Kasten [Tue, 30 Oct 2012 17:51:39 +0000 (10:51 -0700)]
Remove obsolete references to libmedia_native
Bug:
6654403
Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
Glenn Kasten [Tue, 30 Oct 2012 17:36:00 +0000 (10:36 -0700)]
Merge "Document AudioMixer hard-coded limits"
Glenn Kasten [Tue, 30 Oct 2012 17:34:28 +0000 (10:34 -0700)]
Merge "Use ALOGVV instead of commented ALOGV"
Glenn Kasten [Tue, 30 Oct 2012 17:33:13 +0000 (10:33 -0700)]
Merge "Fix typo"
Glenn Kasten [Tue, 30 Oct 2012 17:32:47 +0000 (10:32 -0700)]
Merge "Clean up constructor and derivation whitespace"
Glenn Kasten [Tue, 30 Oct 2012 17:30:59 +0000 (10:30 -0700)]
Merge "Mark volume fields private"
Mathias Agopian [Tue, 30 Oct 2012 02:11:57 +0000 (19:11 -0700)]
Merge "fir a typo that caused up-sampling coefficiens to be wrong"
Mathias Agopian [Tue, 30 Oct 2012 02:01:57 +0000 (19:01 -0700)]
Merge "test-resample: clip instead of overflowing"
Mathias Agopian [Tue, 30 Oct 2012 00:13:20 +0000 (17:13 -0700)]
fir a typo that caused up-sampling coefficiens to be wrong
up-sample coefficient were generated with a cut-off frequency of 24KHz
intead of ~20KHz, which caused more aliasing in the audible band.
also increased the attenuation to 1.3 dB on both up and down
sampling coefficient to avoid clipping.
Change-Id: Ie8aeecf1429190541b656810c6716b6aae5ece2e
Mathias Agopian [Tue, 30 Oct 2012 00:13:16 +0000 (17:13 -0700)]
test-resample: clip instead of overflowing
Change-Id: I550e5a59e51c11e1095ca338222b094f92b96878
Dave Burke [Tue, 30 Oct 2012 00:13:15 +0000 (17:13 -0700)]
am
dd4e72b4: am
2295ce2c: Increase bitrate now that other issues have been resolved.
* commit '
dd4e72b44ddb7a1591bd2f81c46d20bb0939e9eb':
Increase bitrate now that other issues have been resolved.
Dave Burke [Tue, 30 Oct 2012 00:13:14 +0000 (17:13 -0700)]
am
dd974cc4: am
e815552c: Disable silence suppression (causes issues with dongles).
* commit '
dd974cc4f335b30731c452885bff3c396ed54724':
Disable silence suppression (causes issues with dongles).
Dave Burke [Mon, 29 Oct 2012 21:21:57 +0000 (14:21 -0700)]
am
2295ce2c: Increase bitrate now that other issues have been resolved.
* commit '
2295ce2c6fcf07ffaa134440691a8cea5fe35b43':
Increase bitrate now that other issues have been resolved.
Dave Burke [Mon, 29 Oct 2012 21:21:56 +0000 (14:21 -0700)]
am
e815552c: Disable silence suppression (causes issues with dongles).
* commit '
e815552c9cb17be79cb3b7eb6fbdfa9ad81c861b':
Disable silence suppression (causes issues with dongles).
The Android Automerger [Mon, 29 Oct 2012 18:19:49 +0000 (11:19 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Sat, 27 Oct 2012 06:49:43 +0000 (23:49 -0700)]
Increase bitrate now that other issues have been resolved.
Bug:
7426218
Change-Id: I67dfa1e4b85f326f355ad0ec5b6c699e87b45564
The Android Automerger [Sat, 27 Oct 2012 01:17:33 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Fri, 26 Oct 2012 23:24:43 +0000 (16:24 -0700)]
Disable silence suppression (causes issues with dongles).
Bug:
7426218
Change-Id: Ie1517a8017bae1f9a9b6c224cd3170dfcc5fb941
Glenn Kasten [Thu, 18 Oct 2012 22:51:03 +0000 (15:51 -0700)]
Use ALOGVV instead of commented ALOGV
Change-Id: I17bdb5274877760c7edaa31416020d349082e593
Glenn Kasten [Mon, 24 Sep 2012 18:27:56 +0000 (11:27 -0700)]
Fix typo
Change-Id: I8cc2969eb329a830ee866622a8633adcb4e967cc
Glenn Kasten [Fri, 26 Oct 2012 23:10:30 +0000 (16:10 -0700)]
StateQueue comments
Change-Id: Id8c76d1e2ab5201e7ab3875f1dbcc0a126e611a4
Mathias Agopian [Fri, 26 Oct 2012 23:04:41 +0000 (16:04 -0700)]
Merge "a test app for the resamplers"
Mathias Agopian [Fri, 26 Oct 2012 23:04:26 +0000 (16:04 -0700)]
Merge "reenable the cubic resampler"
Mathias Agopian [Fri, 26 Oct 2012 23:04:11 +0000 (16:04 -0700)]
Merge "improve SINC resampler coefficients"
Glenn Kasten [Thu, 8 Mar 2012 20:33:37 +0000 (12:33 -0800)]
Document AudioMixer hard-coded limits
Change-Id: I83ea8bed375f251260945db788bdb5f280dba12d
Glenn Kasten [Tue, 10 Jul 2012 18:44:31 +0000 (11:44 -0700)]
Clean up constructor and derivation whitespace
Change-Id: I47d688a9c10c4c3c868accc34102fb402ebcac62
Glenn Kasten [Tue, 6 Mar 2012 19:34:22 +0000 (11:34 -0800)]
Mark volume fields private
Change-Id: I8ffca0460195263d159aa13015c246122d8556a2
Igor Murashkin [Fri, 26 Oct 2012 22:26:03 +0000 (15:26 -0700)]
Merge "Camera2: Compile with warnings, fix warnings"
Igor Murashkin [Fri, 12 Oct 2012 23:56:11 +0000 (16:56 -0700)]
Camera2: Compile with warnings, fix warnings
Change-Id: I557350abb32b0480f5da7dcecadfbe9edbe53361
Mathias Agopian [Sun, 21 Oct 2012 08:01:38 +0000 (01:01 -0700)]
a test app for the resamplers
Change-Id: I66852d90d384f1d9e77b51ad1a1ebdbaf61d0607
Mathias Agopian [Fri, 26 Oct 2012 21:11:01 +0000 (14:11 -0700)]
reenable the cubic resampler
cubic resampler was disabled because it hadn't been qualified,
however after I did some tests, it does improve significantly
the sound quality over the order-1 resampler, even if it is
still quite bad.
also HIGH_QUALITY resampler was partially disabled, it's now
fully enabled. It's a big improvement over the cubic resampler
in terms of aliasing noise (it's not as good in the pass-band).
Change-Id: I70e3658c255896588642697be9eb594ff4ec0f8b
Mathias Agopian [Fri, 26 Oct 2012 20:48:42 +0000 (13:48 -0700)]
improve SINC resampler coefficients
- we increase the interpolation precision from 4 to 7 bits
this doesn't increase CPU power required, it only increases the
size of the filter table but significantly reduces the noise
introduced by the quantization of the impulse response.
- the parameters of the filter are set such that aliasing is
rejected at 80 dB below 20 KHz. Because we don't use a lot of
coefficient (to save compute power), there are quite a bit of
attenuation in the pass-band: starting at 9KHz for the
down-sampler (48 to 44.1), and starting at 13 KHz for the
up-sampler (44.1 to 48) -- the transition band is about 15 KHz.
Change-Id: I855548d2aab8a0fb0d2a2da3a364b6842d7d3838
Mathias Agopian [Fri, 26 Oct 2012 21:58:24 +0000 (14:58 -0700)]
Merge "improve fir tool: cleanup, better default, bug fixes"
Pixelflinger [Fri, 26 Oct 2012 02:43:49 +0000 (19:43 -0700)]
improve fir tool: cleanup, better default, bug fixes
- all parameters can be changed on the command-line
- added float output
- added debug option
- added an option to generate a polyphase filter coefficients
- added an attenuation option in dBFS
- added a lot of comments and references
- fixed kaiser window parameter
also the default should generate a filter with 80 dB rejection
(of the 24 KHz aliasing) above 20 KHz and a 15 KHz transition
band around ~20 KHz (for 48 KHz sampling rate).
It's not very good but corresponds to the current code.
Marco Nelissen [Thu, 25 Oct 2012 23:05:57 +0000 (16:05 -0700)]
Only export the symbols that need to be
The effects libraries were exporting many more symbols than needed.
This reduces the exported symbols to just the needed ones (basically
just "AELI"), which happens to also save about 28KB.
Change-Id: I115077e52e8dc845282e6f62a522908d26dd72d6
The Android Automerger [Thu, 25 Oct 2012 20:42:11 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Marco Nelissen [Thu, 25 Oct 2012 18:02:50 +0000 (11:02 -0700)]
Switch to new fx library API
Change-Id: I6603aef5e3821a8f911e3f33ef8565d04bd1e2e5
Eino-Ville Talvala [Thu, 25 Oct 2012 02:53:14 +0000 (19:53 -0700)]
am
203836b7: am
b8d6efba: Camera2: Don\'t hold locks while waiting to sync.
* commit '
203836b7584ccb7787202578259d27d70a8a3ede':
Camera2: Don't hold locks while waiting to sync.
Eino-Ville Talvala [Thu, 25 Oct 2012 02:50:19 +0000 (19:50 -0700)]
am
b8d6efba: Camera2: Don\'t hold locks while waiting to sync.
* commit '
b8d6efba8b87e6eeb049651cb67f9827198e658e':
Camera2: Don't hold locks while waiting to sync.
Eino-Ville Talvala [Thu, 25 Oct 2012 00:30:30 +0000 (17:30 -0700)]
Camera2: Don't hold locks while waiting to sync.
Bug:
7409877
Change-Id: Ia3a0bc4f0ab4e19fca868ba04a870cf8e8ee7adb
Marco Nelissen [Wed, 24 Oct 2012 20:43:32 +0000 (13:43 -0700)]
Make ThrottledSource more usable
Add reconnectAtOffset(), DrmInitialization() and getDrmInfo().
Also rearrange the code a bit so all the methods that just call through
to the wrapped DataSource are in the header.
Change-Id: If25b674df317b0f6da5d36241c694e32abb0a01c
The Android Automerger [Tue, 23 Oct 2012 23:46:59 +0000 (16:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 23 Oct 2012 22:14:23 +0000 (15:14 -0700)]
am
e3e639b1: am
ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into jb-mr1-dev
* commit '
e3e639b1714d35628f9b75276839ad55d8afc74c':
Don't attempt to seek audio and video separately.
Andreas Huber [Tue, 23 Oct 2012 22:11:29 +0000 (15:11 -0700)]
am
ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into jb-mr1-dev
* commit '
ac1a450a76c2f42f66c876200cb724d1e93ef4c7':
Don't attempt to seek audio and video separately.
Andreas Huber [Tue, 23 Oct 2012 22:06:11 +0000 (15:06 -0700)]
Merge "Don't attempt to seek audio and video separately." into jb-mr1-dev
The Android Automerger [Tue, 23 Oct 2012 21:37:12 +0000 (14:37 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 23 Oct 2012 20:25:05 +0000 (13:25 -0700)]
Don't attempt to seek audio and video separately.
The widevine extractor doesn't deal too well with that...
Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff
related-to-bug:
7262386
Eino-Ville Talvala [Tue, 23 Oct 2012 17:38:09 +0000 (10:38 -0700)]
am
9e83f44c: am
6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
* commit '
9e83f44c0b310a72a080c006ebc3c07bdccc7027':
Camera2: Increase mode update timeout.
Eino-Ville Talvala [Tue, 23 Oct 2012 17:36:05 +0000 (10:36 -0700)]
am
6ccc3c34: Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
* commit '
6ccc3c343e2751ebfe9fa77215bf84e1a97e38fc':
Camera2: Increase mode update timeout.
Eino-Ville Talvala [Tue, 23 Oct 2012 17:31:25 +0000 (10:31 -0700)]
Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
Eino-Ville Talvala [Tue, 23 Oct 2012 16:09:01 +0000 (09:09 -0700)]
Camera2: Increase mode update timeout.
During camera startup, it might take a few hundred milliseconds before
requests start to be dequeued by the HAL. Increase the timeout for
synchronizing mode changes and triggers so that triggers near startup
don't time out.
Bug:
6970465
Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
Eric Laurent [Tue, 23 Oct 2012 15:33:37 +0000 (08:33 -0700)]
am
9cdf6db5: am
5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
* commit '
9cdf6db50c0dab30f32291bf00c702ca79132674':
stagefright: discard audio at start of capture
Eric Laurent [Tue, 23 Oct 2012 15:31:29 +0000 (08:31 -0700)]
am
5f6f5b7d: Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
* commit '
5f6f5b7d6be5d7882102bf0fc3c691ef8fbe03a1':
stagefright: discard audio at start of capture
Eric Laurent [Tue, 23 Oct 2012 15:28:07 +0000 (08:28 -0700)]
Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
Glenn Kasten [Tue, 23 Oct 2012 14:35:31 +0000 (07:35 -0700)]
am
3aaa4e30: am
c4640c9e: Increase allowed number of VHQ resamplers to 3
* commit '
3aaa4e30f7663673f3453d3f4671b1119f1802fd':
Increase allowed number of VHQ resamplers to 3
Glenn Kasten [Tue, 23 Oct 2012 14:32:37 +0000 (07:32 -0700)]
am
c4640c9e: Increase allowed number of VHQ resamplers to 3
* commit '
c4640c9eef850bb1c754bd6b477f1cc8350c6081':
Increase allowed number of VHQ resamplers to 3
Eric Laurent [Tue, 23 Oct 2012 00:44:24 +0000 (17:44 -0700)]
stagefright: discard audio at start of capture
The new camcorder start sound is longer than previous one and we
must discard more audio when capture starts.
Ideally, camcorder should use synchronous record start.
Bug
7394330.
Change-Id: I219b4e231aba706776dc7ccc4f1c996eaf22f61a
Glenn Kasten [Tue, 23 Oct 2012 00:09:27 +0000 (17:09 -0700)]
Increase allowed number of VHQ resamplers to 3
Bug:
7378660
Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
The Android Automerger [Mon, 22 Oct 2012 23:41:58 +0000 (16:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Mon, 22 Oct 2012 18:54:12 +0000 (11:54 -0700)]
am
7f4d5714: am
e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
* commit '
7f4d5714f3f0ab4efaf2d0929a9f984467ef95c7':
Fix a typo that caused the high quality resampler to produce garbage
Mathias Agopian [Mon, 22 Oct 2012 18:52:14 +0000 (11:52 -0700)]
am
e384d75b: Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
* commit '
e384d75b95b9db30d64a18ada93e070cf07de306':
Fix a typo that caused the high quality resampler to produce garbage
Mathias Agopian [Mon, 22 Oct 2012 18:47:39 +0000 (11:47 -0700)]
Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
Andreas Huber [Mon, 22 Oct 2012 18:08:45 +0000 (11:08 -0700)]
am
dc5f12a2: am
0328ec08: WFD use of HDCP is now optional.
* commit '
dc5f12a217279d60444fc7243fe89ba4311eea88':
WFD use of HDCP is now optional.
Andreas Huber [Mon, 22 Oct 2012 18:06:12 +0000 (11:06 -0700)]
am
0328ec08: WFD use of HDCP is now optional.
* commit '
0328ec08dc1e90caa2a9e0c4e107d8ddaa74af20':
WFD use of HDCP is now optional.
Andreas Huber [Mon, 22 Oct 2012 17:45:08 +0000 (10:45 -0700)]
WFD use of HDCP is now optional.
if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't
we won't. If an HDCP session is established we'll tell our observer that
the connection is secure, otherwise we don't.
Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46
related-to-bug:
7368436
Mathias Agopian [Sun, 21 Oct 2012 10:04:05 +0000 (03:04 -0700)]
Fix a typo that caused the high quality resampler to produce garbage
the problem is that if libaudio_resampler is present, it is those
coefficients that will always be selected, but the correct
meta-data.
Bug:
7385994
Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621
The Android Automerger [Sun, 21 Oct 2012 06:14:02 +0000 (23:14 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Sat, 20 Oct 2012 00:29:22 +0000 (17:29 -0700)]
am
ad99e748: am
c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
* commit '
ad99e748ae97be7b0f769e1895ca7f69da6c9df8':
AAC DRC reference level for mobile is -16dB
Jean-Michel Trivi [Sat, 20 Oct 2012 00:26:43 +0000 (17:26 -0700)]
am
c3ed4a1c: Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
* commit '
c3ed4a1c3ea71681c71de48c206a899e702864bd':
AAC DRC reference level for mobile is -16dB
Jean-Michel Trivi [Sat, 20 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
Eino-Ville Talvala [Sat, 20 Oct 2012 00:21:46 +0000 (17:21 -0700)]
am
e50ba28a: am
9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
* commit '
e50ba28aa1846a7c2a296f122a5675476dacc4a5':
Camera2: Fix potential deadlock
Eino-Ville Talvala [Sat, 20 Oct 2012 00:19:35 +0000 (17:19 -0700)]
am
9e760d66: Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
* commit '
9e760d66c5dfae4d9688e32d7a02fca09569f7ef':
Camera2: Fix potential deadlock
Eino-Ville Talvala [Fri, 19 Oct 2012 23:47:32 +0000 (16:47 -0700)]
Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
The Android Automerger [Fri, 19 Oct 2012 22:46:06 +0000 (15:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Fri, 19 Oct 2012 21:52:16 +0000 (14:52 -0700)]
AAC DRC reference level for mobile is -16dB
Use -16dB as the default DRC reference level when decoding streams
with DRC metadata.
Bug
7370764
Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
Marco Nelissen [Fri, 19 Oct 2012 20:22:22 +0000 (13:22 -0700)]
am
febe48ae: am
3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-dev
* commit '
febe48aef0cb757e149d6f4494c9d220d6ba369a':
Fix valgrind issues
Glenn Kasten [Fri, 19 Oct 2012 20:22:21 +0000 (13:22 -0700)]
am
424b4a57: am
291f824e: Remove active track when thread goes to standby
* commit '
424b4a57f5e1e8bd99cb619398389a467ec41f92':
Remove active track when thread goes to standby
Marco Nelissen [Fri, 19 Oct 2012 19:41:50 +0000 (12:41 -0700)]
am
3c9e53c6: Merge "Fix valgrind issues" into jb-mr1-dev
* commit '
3c9e53c6ea2b01506addd4fb1164e6a9bbe6e16f':
Fix valgrind issues
Marco Nelissen [Fri, 19 Oct 2012 19:36:47 +0000 (12:36 -0700)]
Merge "Fix valgrind issues" into jb-mr1-dev
Glenn Kasten [Fri, 19 Oct 2012 19:35:14 +0000 (12:35 -0700)]
am
291f824e: Remove active track when thread goes to standby
* commit '
291f824e02ff517a34cfe50220b4e2b402ee998d':
Remove active track when thread goes to standby
Nick Kralevich [Fri, 19 Oct 2012 16:02:42 +0000 (09:02 -0700)]
am
4ad27b11: am
1baa01a5: Merge "hardening: eliminate more .text relocations"
* commit '
4ad27b11f8c883a3131d1f81d883de01b8076be1':
hardening: eliminate more .text relocations
Nick Kralevich [Fri, 19 Oct 2012 16:00:32 +0000 (09:00 -0700)]
am
1baa01a5: Merge "hardening: eliminate more .text relocations"
* commit '
1baa01a52f24566c134313fade8b19a582654638':
hardening: eliminate more .text relocations
Nick Kralevich [Fri, 19 Oct 2012 15:40:01 +0000 (08:40 -0700)]
Merge "hardening: eliminate more .text relocations"
Glenn Kasten [Thu, 18 Oct 2012 22:51:31 +0000 (15:51 -0700)]
Remove active track when thread goes to standby
Bug:
7369232
Change-Id: I7ff9f525dad4be0aef562a53015b06ee7d3d50f1