OSDN Git Service
Andreas Huber [Wed, 28 Nov 2012 17:42:18 +0000 (09:42 -0800)]
am
b7c8e918: Add support for HLS playlists of type \'event\'.
* commit '
b7c8e91880463ff4981e3e53e98e45d68e2fe374':
Add support for HLS playlists of type 'event'.
Andreas Huber [Tue, 27 Nov 2012 23:02:53 +0000 (15:02 -0800)]
Add support for HLS playlists of type 'event'.
related-to-bug:
6870049
Squashed commit of the following:
commit
eee2f3ba6bb7335f4e285632726db85645669929
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 15:02:01 2012 -0800
Make everything a lot less verbose by default.
Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3
commit
6bbdb837ed5bd88008e45efb8faf595e4051ba26
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:34:46 2012 -0800
HLS now properly signals media time changes at discontinuities including
the start of playback (which may not necessarily be at time 0 if the playlist
is of type 'event' and hasn't completed yet).
Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e
commit
1555589832b1878a144a976a643e1af4d61f877c
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:32:28 2012 -0800
As part of a time discontinuity, clients of IStreamListener can now
signal the corresponding media time after the discontinuity, i.e. the first PTS
timestamp following the discontinuity will be considered equivalent to the
specified media time and media buffers timestamped accordingly.
Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92
commit
5c24c605c073a11c426d025b1e7478fc1ad8365a
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 13:00:56 2012 -0800
NuPlayer sources now expose flags() and can announce
that duration may change (increase) dynamically, in which case duration
will be polled at 1 second intervals and communicated to the upper layers.
Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea
commit
ecb71de8e281e61971a2cd73e7161a97540bc357
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 12:57:47 2012 -0800
Stop caching duration in MediaPlayer, duration could increase dynamically.
Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791
commit
544aec5823e6d7a3e97e15b6b23546616bcd343e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 08:46:28 2012 -0800
An attempt to add support for "event" style HLS playlists.
Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60
Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
Glenn Kasten [Tue, 27 Nov 2012 23:05:48 +0000 (15:05 -0800)]
resolved conflicts for merge of
41829f30 to jb-mr1-dev-plus-aosp
Change-Id: I952d333c2e88b6b28663793046a136822d1b6838
Glenn Kasten [Tue, 27 Nov 2012 22:51:19 +0000 (14:51 -0800)]
Merge "New VHQ resampler" into jb-mr1.1-dev
Glenn Kasten [Mon, 19 Nov 2012 17:00:47 +0000 (09:00 -0800)]
New VHQ resampler
Squashed commit of the following:
commit
12b6952da9f25e94d06dd7185bce255924e7e791
Author: Mathias Agopian <mathias@google.com>
Date: Mon Nov 19 15:27:26 2012 -0800
fix a typo in SINC resampler that prevented tracks to be mixed
we were always erasing the current mix instead of mixing into it.
Change-Id: Ib229245f9e5a0d384f1727640a59e9f0469211a2
commit
0019ce082df430278f14ab922e900ce33b64897d
Author: Dave Bort <dbort@google.com>
Date: Tue Nov 13 01:30:32 2007 -0800
Rename "TARGET" to "MODULE" in the build system.
Part one of the grand renaming.
API_CHANGE: Third parties may need to update their makefiles.
Any variables with "LOCAL" and "TARGET" in their names
should now use "MODULE" instead of "TARGET"; e.g., LOCAL_MODULE,
LOCAL_MODULE_TAGS.
PRESUBMIT=passed
OCL=39840
Change-Id: Ica9a7937d3d9552ab84db46ac6eea8a290e404fe
Signed-off-by: Glenn Kasten <gkasten@google.com>
commit
f01adc0cef0e39e75c76d9195ac26a94cac0a100
Author: Glenn Kasten <gkasten@google.com>
Date: Wed Nov 14 08:32:08 2012 -0800
Fix build warnings
Change-Id: Ic43bcca166a529a6431711b05a7fa21849b6a38b
commit
9bb031a565c753a03d9c9397edea318947d80528
Author: Mathias Agopian <mathias@google.com>
Date: Sat Nov 10 04:44:30 2012 -0800
more optimizations...
calculate the offsets from the phase differently, this happens
to reduce the register pressure in the main loop, which in turns
allows the compiler to generate much better code (doesn't need
to spill a lot of stuff on the stack).
this gives another 15% performance increase
Change-Id: I2ce3479dd48b9e6941adb80e6d443d6e14d64d96
commit
5a951598f31217b8cd2babd0720c9608ee17291a
Author: Mathias Agopian <mathias@google.com>
Date: Sat Nov 10 03:26:39 2012 -0800
refactor code to improve neon code
we want to make sure we don't transfer data from the
neon unit to the arm register file, as this can be quite
slow. instead we do all the calculation on the neon side
and write the result directly to main memory.
Change-Id: Ibb56664d3ab03098ae2798b75e2b6927ac900187
commit
b381ee9e83bc9fd18986e79c7809841514ed590e
Author: Mathias Agopian <mathias@google.com>
Date: Sun Nov 4 15:16:13 2012 -0800
NEON optimized SINC resampler
this currently gives us a 60% to 80% boost depending
on the quality level selected.
Change-Id: I7db385007e811ed7bffe5fd3403b44e300894f5b
commit
bea077354210242ea193a50b0dbab0fedab25df3
Author: Mathias Agopian <mathias@google.com>
Date: Mon Nov 5 01:51:37 2012 -0800
minor cleanups
Change-Id: Ia12ee4fb59e90221761bec85e6450db29197591f
commit
8f4ed7decbe161a5ff38200b218f5216d80aba46
Author: Mathias Agopian <mathias@google.com>
Date: Sun Nov 4 18:49:14 2012 -0800
improve resample test
- handle stereo input
- input file can now be ommited, in this case
a linear chirp will be used automatically
- better usage information
Change-Id: I5d62a6c26a9054a1c1a517a065b4df5a2cdcda22
commit
5fcd634ea6cb4df27c495abe20f5f9b8ff55d128
Author: Mathias Agopian <mathias@google.com>
Date: Sun Nov 4 02:03:49 2012 -0800
change how we store the FIR coefficients
The coefficient table is now transposed and shows
much better its polyphase nature: we now have a FIR
per line, each line corresponding to a phase.
This doesn't change at all the results produced by
the filter, but allows us to make slightly better
use of the data cache and improves performance a bit
(although not as much as I thought it would).
The main benefit is that it is the first step
before we can make much larger optimizations
(like using NEON).
Change-Id: Iebf7695825dcbd41f25861efcaefbaa3365ecb43
commit
d652231abf4c7e2ea1fc89caae730cec1f7259a1
Author: Mathias Agopian <mathias@google.com>
Date: Sat Nov 3 23:37:53 2012 -0700
improve SINC resampler performance
The improvement is about 60% by just tweaking a few
things to help the compiler generate better code.
It turns out that inlining too much stuff manually was hurting us.
Change-Id: I8068f0f75051f95ac600e50ce552572dd1e8c304
commit
9dc68ef5b94c700c4ee68790e8cbb334c90a538d
Author: Mathias Agopian <mathias@google.com>
Date: Thu Nov 1 21:03:46 2012 -0700
new coefficients for the vhq resampler
previous coefficients were provided by a 3rd party and didn't have a
way to re-generate them. we're now using the 'fir' utility.
the performance of the filter is virtually identical, except for
the down-sampling case which seems slightly better now:
It looks like both the previous and new coefficients are generating
some sort of clipping for full-scale signals in the down-sampling case
(although the new ones seem better), the reason for that is
unknown (see bug:
7453062)
Also updated the HQ coefficients for the down-samplers, previous ones
were a little bit too conservative -- the new ones push the cut-off
frequency up by about 1 KHz.
Change-Id: I54a827b5c707c7cc41268ed01283758dce1d7647
commit
38e0b8560a6fc1b7124e22e0e09a84a285182f8e
Author: Mathias Agopian <mathias@google.com>
Date: Tue Oct 30 13:51:44 2012 -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
commit
a1878128b182696ba508569b4d211d0dfae92463
Author: Mathias Agopian <mathias@google.com>
Date: Tue Oct 30 12:49:07 2012 -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
commit
1a0fb993430acc9f601e6c538305bc407c20ac5d
Author: Mathias Agopian <mathias@google.com>
Date: Mon Oct 29 17:13:20 2012 -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
commit
9520ad6862bd682ad075a9d9e3e94ada9f6e58b6
Author: Mathias Agopian <mathias@google.com>
Date: Mon Oct 29 17:13:16 2012 -0700
test-resample: clip instead of overflowing
Change-Id: I550e5a59e51c11e1095ca338222b094f92b96878
commit
ba36656300f250f7f1fdeb75149749344260e6cb
Author: Mathias Agopian <mathias@google.com>
Date: Sun Oct 21 01:01:38 2012 -0700
a test app for the resamplers
Change-Id: I66852d90d384f1d9e77b51ad1a1ebdbaf61d0607
commit
056a08b9bfd33cf27228c992adc8293a56b01be8
Author: Mathias Agopian <mathias@google.com>
Date: Fri Oct 26 14:11:01 2012 -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
commit
8c0241d3ff50ae85167f69b3bd369244894cfa44
Author: Mathias Agopian <mathias@google.com>
Date: Fri Oct 26 13:48:42 2012 -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
commit
69e7dab2192adc1f780464146810629ebd01b145
Author: Pixelflinger <mathias.agopian@gmail.com>
Date: Thu Oct 25 19:43:49 2012 -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.
commit
8347499d105a50257c18e9dac652e750b06428b1
Author: Glenn Kasten <gkasten@google.com>
Date: Mon Oct 22 17:09:27 2012 -0700
Increase allowed number of VHQ resamplers to 3
Bug:
7378660
Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
commit
f91cf3cad7f5c4d52614271c89ab468741c5d24c
Author: Mathias Agopian <mathias@google.com>
Date: Sun Oct 21 03:04:05 2012 -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
commit
e158a9e4262a174c59469a205658bc3ca4078234
Author: Dan Bornstein <danfuzz@google.com>
Date: Fri Oct 3 10:34:57 2008 -0700
Manually merge change #111620 from tc3 to mainline, to keep the
automerger from choking on it.
p4 sync
p4 integrate -r -b android_to_tc3 //...@111620,111620
p4 resolve -a
p4 resolve # resolve a couple merge travesties
PRESUBMIT=passed
BUG=
1399648
TBR=edheyl
OCL=111902
Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2
Signed-off-by: Glenn Kasten <gkasten@google.com>
commit
b9f3c26032be7a6ea01a10d93d94826f449e68ab
Author: Dave Bort <dbort@google.com>
Date: Fri Jan 18 14:51:05 2008 -0800
Rename "Makefile" to "Android.mk" throughout the tree.
For <http://b/issue?id=960416>.
I've tested this as much as I can, but 1500 open files =
easy to mess things up. Please let me know if there's
a problem rather than rolling back this change.
PRESUBMIT=passed
BUG=960416
TBR=joeo
OCL=46537
Change-Id: I5a404caf0f398a7afa7ae7abaf2f2a1c6ab490eb
Signed-off-by: Glenn Kasten <gkasten@google.com>
commit
0c22a9a44c4103483fba1d944acf1354c5eb1617
Author: Mathias Agopian <mathias@google.com>
Date: Mon Oct 29 23:44:25 2007 -0700
Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
Change-Id: I50ac7e6c6702a427fa36ab6d976c507155057507
Signed-off-by: Glenn Kasten <gkasten@google.com>
commit
b85e41487983ad085b859acf8251e7e54480308a
Author: Mathias Agopian <mathias@google.com>
Date: Mon Oct 29 04:34:36 2007 -0700
A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
Change-Id: I80eb5185e13ebdb907e0b85c49ba1272c23d60ec
Signed-off-by: Glenn Kasten <gkasten@google.com>
commit
ba3949ef17cac2ba71cc3096c413782a49c922e5
Author: Mathias Agopian <mathias@google.com>
Date: Thu Aug 23 21:01:28 2007 -0700
fix a few small typos in the FIR computation
Change-Id: I6e56b514fe520f30f7487f85c64ea5d2a7c19b40
Signed-off-by: Glenn Kasten <gkasten@google.com>
commit
7474bfa7de2604021963794dddfe44985648db6a
Author: Mathias Agopian <mathias@google.com>
Date: Thu Aug 23 03:16:02 2007 -0700
This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
Change-Id: I99be2505139b8e0e7647200e1647509d4f7e6067
Signed-off-by: Glenn Kasten <gkasten@google.com>
Bug:
7577965
Change-Id: I2c84a9283a1668723bad83e1a119c849c88c3e6b
Igor Murashkin [Tue, 27 Nov 2012 19:39:22 +0000 (11:39 -0800)]
am
aa9e3e01: Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !null
* commit '
aa9e3e01b86bd9bfb5ac36c0f360d5fe478cbb2d':
Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !null
Andreas Huber [Tue, 27 Nov 2012 17:39:12 +0000 (09:39 -0800)]
am
5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"
* commit '
5768fa034ede834656697d3612c525595ff85ef9':
Crash in android::MyHandler::parsePlayResponse
Andreas Huber [Tue, 27 Nov 2012 17:39:11 +0000 (09:39 -0800)]
am
3eb46d17: Merge "Fix of uninitialized mIsDrm variable."
* commit '
3eb46d179b1f62cde21077fde466925d4c5c79ad':
Fix of uninitialized mIsDrm variable.
Andreas Huber [Tue, 27 Nov 2012 16:50:52 +0000 (08:50 -0800)]
Merge "Crash in android::MyHandler::parsePlayResponse"
Andreas Huber [Tue, 27 Nov 2012 16:49:34 +0000 (08:49 -0800)]
Merge "Fix of uninitialized mIsDrm variable."
Patric Frederiksen [Mon, 26 Sep 2011 08:51:35 +0000 (10:51 +0200)]
Crash in android::MyHandler::parsePlayResponse
This fix handles problems with several asynchronous calls
within streaming. This case is when the phone has sent a
request to the server and while the response is being sent
back by the server the request is aborted by the user.
The fix is an if case that checks if we have aborted while
waiting for a response from the server. If we have aborted
we should ignore the late response instead of continuing.
Change-Id: I1264bb992f6abcaee1f10a89479e08b54a95e3c2
Henrik B Andersson [Wed, 31 Oct 2012 12:02:47 +0000 (13:02 +0100)]
Fix of uninitialized mIsDrm variable.
The mIsDrm is a bool that isn't initialized.
This causes it to be true in most default cases.
Change-Id: I41b534514bf6a3ca88a9f0994b814d55fcd7453b
Igor Murashkin [Mon, 26 Nov 2012 18:50:55 +0000 (10:50 -0800)]
Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !null
Bug:
7564718
Change-Id: Ie7821cdee57966d88af048759578439a3e6ecb2e
Andreas Huber [Mon, 26 Nov 2012 22:37:22 +0000 (14:37 -0800)]
am
79fd6853: Merge "MediaCodec: Add a method for getting the component name"
* commit '
79fd685323e34e0fde22d17fd6848d33f171f4ae':
MediaCodec: Add a method for getting the component name
Andreas Huber [Mon, 26 Nov 2012 21:48:41 +0000 (13:48 -0800)]
Merge "MediaCodec: Add a method for getting the component name"
Marco Nelissen [Mon, 26 Nov 2012 18:00:09 +0000 (10:00 -0800)]
am
5865ddf7: Merge "AudioTrack::dump null mCblk check test"
* commit '
5865ddf769d368d714af630aba18392ea1387bc7':
AudioTrack::dump null mCblk check test
Marco Nelissen [Mon, 26 Nov 2012 16:59:50 +0000 (08:59 -0800)]
Merge "AudioTrack::dump null mCblk check test"
Zbigniew Mazur [Thu, 11 Oct 2012 11:56:41 +0000 (13:56 +0200)]
AudioTrack::dump null mCblk check test
This fix is protecting AudioTrack::dump from SIGSEGEV
when calling dumpsys shell command.
Change-Id: I30d136e195a12d6fdad41e14f557b0ad9e59b8a2
Marco Nelissen [Tue, 20 Nov 2012 20:47:56 +0000 (12:47 -0800)]
am
2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"
* commit '
2da6e4ae488896df10b22166b0aa0b2cc15492f1':
Avoid memory leaks when handling metadata strings
Marco Nelissen [Tue, 20 Nov 2012 20:28:27 +0000 (12:28 -0800)]
Merge "Avoid memory leaks when handling metadata strings"
David Williams [Mon, 19 Nov 2012 08:52:16 +0000 (09:52 +0100)]
Avoid memory leaks when handling metadata strings
Don't duplicate strings when retrieveing metadata from media
files. As any requests for metadata strings would pass through
the binder, this would cause the reference to the duplicate string
to be lost, causing a memory leak as the duplicate would not be
freed.
Change-Id: I2593733472b1bb589bc502b2c11080f581015bb5
Andreas Huber [Tue, 20 Nov 2012 17:24:25 +0000 (09:24 -0800)]
am
7013209c: Merge "Handle large AVCC chunks"
* commit '
7013209cdf393b3d958ddd46ed50394349378826':
Handle large AVCC chunks
Marco Nelissen [Tue, 20 Nov 2012 17:24:24 +0000 (09:24 -0800)]
am
dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"
* commit '
dca2b5d7c29ee06f3c82527dd7264fcc21cac9a6':
Changed parsing of trkn and disk from 8 bits to 16 bits
Andreas Huber [Tue, 20 Nov 2012 16:52:44 +0000 (08:52 -0800)]
Merge "Handle large AVCC chunks"
Marco Nelissen [Tue, 20 Nov 2012 16:18:38 +0000 (08:18 -0800)]
Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"
Martin Storsjo [Tue, 25 Sep 2012 08:43:02 +0000 (11:43 +0300)]
MediaCodec: Add a method for getting the component name
If the codec was chosen based on mime type, the caller does
not know what component actually was chosen. This allows
getting essential information (such as supported color formats,
for a video encoder) for this component.
Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
Andreas Lillvik [Wed, 13 Oct 2010 13:37:01 +0000 (15:37 +0200)]
Changed parsing of trkn and disk from 8 bits to 16 bits
The MPEG4Extractor was parsing 8 bits instead of 16 bits when parsing
'trkn' and 'disk'. Also added support for 16 bytes size 'disk'.
Change-Id: I22b4de2ac800881884d5759776cb380917522a87
Jan Olof Svensson [Wed, 26 Sep 2012 07:08:11 +0000 (09:08 +0200)]
Handle large AVCC chunks
If enabling seq_scaling_matrix_present_flag = 1 the AVCC chunk can
be larger than the original buffer size. Changed to using ABuffer
instead.
Change-Id: Idacc14b45ea2634c5e608919f3ce567f23363135
Glenn Kasten [Fri, 16 Nov 2012 22:44:05 +0000 (14:44 -0800)]
am
d983364b: Static AudioTrack plays twice initially
* commit '
d983364b3655a547b55bb11dbe148103198c011d':
Static AudioTrack plays twice initially
Glenn Kasten [Thu, 15 Nov 2012 22:13:16 +0000 (14:13 -0800)]
Static AudioTrack plays twice initially
Bug:
7528721
Change-Id: I10bc16a26f33dba6572b730a170cb3bf00e68e30
Marco Nelissen [Fri, 16 Nov 2012 17:34:19 +0000 (09:34 -0800)]
am
da33d66e: Merge "Add .mpga to acceptable file name extensions list."
* commit '
da33d66e68791d0bfeccebc8253a59467b5ef670':
Add .mpga to acceptable file name extensions list.
Marco Nelissen [Fri, 16 Nov 2012 16:59:14 +0000 (08:59 -0800)]
Merge "Add .mpga to acceptable file name extensions list."
Jan Bjernler [Fri, 16 Nov 2012 15:40:42 +0000 (16:40 +0100)]
Add .mpga to acceptable file name extensions list.
The *.mpga files are playable, but are not correctly scanned.
This is because they are prevented from being scanned in
StagefrightMediaScanner.cpp.
What this fix does is to add the extension to the list of valid
file extensions so that the scanner handles the filetype properly.
We have previously added the .mpga extension to the framework to
make it playable, but not added it so that the scanner scans it.
Change-Id: I02a44d770adb80d38e8bed77d0d76efa1b28a861
Andreas Huber [Wed, 14 Nov 2012 19:49:55 +0000 (11:49 -0800)]
am
f0937247: Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev
* commit '
f0937247b6d92b7d9457c64e36fe4c10927685ac':
Properly signal an error if codec configuration goes wrong.
Andreas Huber [Wed, 14 Nov 2012 19:49:54 +0000 (11:49 -0800)]
am
0224bf17: Various improvements of wifi display code
* commit '
0224bf170a3904576bba81593eaab113c5d3a4e7':
Various improvements of wifi display code
Andreas Huber [Wed, 14 Nov 2012 19:45:51 +0000 (11:45 -0800)]
Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev
Andreas Huber [Wed, 14 Nov 2012 17:06:33 +0000 (09:06 -0800)]
Properly signal an error if codec configuration goes wrong.
previously any error signaled by setupXXX inside ACodec::configureCodec
would be overwritten with the result of setMinBufferSize at the end
of the function.
Change-Id: Id4beb571ca52ea4646239d0af006e09ce1130268
related-to-bug:
7542181
Andreas Huber [Mon, 12 Nov 2012 21:08:44 +0000 (13:08 -0800)]
Various improvements of wifi display code
- manually prepend SPS/PPS if encoder doesn't support it
- latency improvements
- support for "our" method of optional RTP retransmission
- improvements to the wfd commandline tool for testing
- make it easier to turn on/off suspension of the video pipeline on idle
- fixes an issue where an error during encryption would cause a SEGV
- add HDCP descriptor if necessary
Squashed commit of the following:
commit
1115be0ebb3b885b4f1b7dba56761ca013d0ec4a
Author: Andreas Huber <andih@google.com>
Date: Fri Nov 9 11:32:23 2012 -0800
Better shutdown of wfd -l sessions.
Change-Id: Id898a14ae21efd3b065b00a729830063d39195a7
commit
0e7d106dfe4eb6e2640b0b66c65deaba265f7ff0
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 16:38:55 2012 -0800
No more sending delay, create rtp packets upfront.
Change-Id: I809a225f664fdb485c7d9a49a27886601a6a26b2
commit
d399e8571b77353d59afb57508dfd2a82c1ef93a
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 14:19:43 2012 -0800
Restore AudioSource buffer size, factor out TimeSeries, make
suspending video optional.
Change-Id: Ifdfe4d447b901e714abf52856b4641d1d55a5d41
commit
f8b649f0b8f917d59f4b8a2e8e6d7db61a684a78
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 09:34:06 2012 -0800
Pull 480 frames at a time from AudioSource/AudioRecord
Change-Id: I1e215abd329faec3da026631122c0f4c800c0ac4
commit
1bc13452eb35eebbba00f5da93fa86535be5db59
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 8 08:50:30 2012 -0800
fixed bitrate traffic simulation
Change-Id: Ic5efb7cbb0b5d3b4917bc77b8ba73d447249e695
commit
016cdff18e74bdc631a5679e97192645ed095aa2
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 7 14:00:03 2012 -0800
resurrected "our" style of retransmission.
Change-Id: I34d757aba67428437cb39b8293a9651750ad20d9
commit
384cf1a3c8fb4ec410bdf8fa5722c298e6028f3e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 6 09:38:55 2012 -0800
Changes to make wfd work on manta.
Change-Id: I7a4e00cf16581fe2146edd1b359af195774090e4
commit
9628f24b22b35f28630d99dda3614babf51bc07e
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 7 09:15:44 2012 -0800
Patch up rtp timestamps to more accurately measure network jitter.
Change-Id: I9502a4615575f97f98a215a13131a89a6ae93c6d
commit
7c891a1a24f08bbd50f55be13f7d05f43e807eb8
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 6 09:37:24 2012 -0800
Additions to the "wfd" tool to create a local wfd source.
Change-Id: I99558653a70fdc703f9d13990b3ce1c4d3ae227a
Change-Id: Ia94c63fc390f597014531073485f0cfc53b3418a
The Android Open Source Project [Tue, 6 Nov 2012 20:24:38 +0000 (12:24 -0800)]
am
78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
78b012f5bc05706d1ce412811ccfaa9385dae0ab':
The Android Open Source Project [Tue, 6 Nov 2012 20:16:54 +0000 (12:16 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Idf4c25115d89397ba668fc290344b2e7c1ea1993
Glenn Kasten [Tue, 6 Nov 2012 19:06:20 +0000 (11:06 -0800)]
am
1c6833af: Ignore SIGPIPE during write() to broken pipe
* commit '
1c6833afd6cfdbc6c696ed0719ceedc37ec0b534':
Ignore SIGPIPE during write() to broken pipe
Glenn Kasten [Wed, 17 Oct 2012 19:16:50 +0000 (12:16 -0700)]
Ignore SIGPIPE during write() to broken pipe
This happens occasionally when taking a bugreport.
Bug:
6447319
Change-Id: Ia6531a4a3658461f8fd3f7106e7996da7cc5933a
The Android Open Source Project [Fri, 2 Nov 2012 14:28:14 +0000 (07:28 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Icad86b92debd9605c745283aeffc3f459a3549ce
The Android Automerger [Fri, 2 Nov 2012 02:05:16 +0000 (19:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Thu, 1 Nov 2012 23:02:16 +0000 (16:02 -0700)]
am
96076964: Make video encoders\' bitrate mode (constant, variable, ...) configurable
* commit '
96076964863ee6887f0bed9d0f11f424b48ab9b9':
Make video encoders' bitrate mode (constant, variable, ...) configurable
Andreas Huber [Thu, 1 Nov 2012 22:48:44 +0000 (15:48 -0700)]
Make video encoders' bitrate mode (constant, variable, ...) configurable
through the desired output format. Configure the video encoder to use
constant bitrate mode for WFD.
Change-Id: Id7bd619598153c13448a9c5acd69d80f8a01f333
related-to-bug:
7459597
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:18:27 +0000 (13:18 -0700)]
am
90a92053: Various tweaks to wfd
* commit '
90a92053219ae50ddf4bb54e3d54db2d309e2b8d':
Various tweaks to wfd
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
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
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
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
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: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: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: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: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: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: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: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: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 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: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
Nick Kralevich [Thu, 18 Oct 2012 23:52:53 +0000 (16:52 -0700)]
hardening: eliminate more .text relocations
In
74bc3e133bd59a65dbed70b5fc89549f04a545e2, a bunch of text relocations
were cleaned up from amrwbenc. Looks like we forgot one. Fixed.
Change-Id: I80d4c68be435c3461731374d2b6d3bdbd61354a5
The Android Automerger [Thu, 18 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 17 Oct 2012 23:32:34 +0000 (16:32 -0700)]
Camera2: Fix potential deadlock
setPreviewWindow was holding a lock during long-lasting HAL calls
which may cause deadlock if the HAL calls back into the service during
the call. Stop holding the lock during these calls, since it's not
essential to do so.
Bug:
7320517
Change-Id: I4a35703d751e22ac32979b5a1288e291610576e7
James Dong [Wed, 17 Oct 2012 23:42:10 +0000 (16:42 -0700)]
am
ccd08439: Added some extra failure logging messages
* commit '
ccd08439c7914d86264c7ad81bfd03cf39aaa9f7':
Added some extra failure logging messages
James Dong [Wed, 17 Oct 2012 21:53:16 +0000 (14:53 -0700)]
Added some extra failure logging messages
o related-to-bug:
7282066
Change-Id: I0896551a45aab61fb571fef19061397ff84321d9
Glenn Kasten [Wed, 17 Oct 2012 22:07:05 +0000 (15:07 -0700)]
am
6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
* commit '
6a2d62c1a972da25de53b1718c165f2b7df85a0e':
Manually merge change #111620 from tc3 to mainline, to keep the
Glenn Kasten [Wed, 17 Oct 2012 22:07:04 +0000 (15:07 -0700)]
am
dbe1be24: Merge "Rename "Makefile" to "Android.mk" throughout the tree."
* commit '
dbe1be24c9e6fb92a88a38adbd12a56aa5337f74':
Rename "Makefile" to "Android.mk" throughout the tree.
Glenn Kasten [Wed, 17 Oct 2012 22:07:03 +0000 (15:07 -0700)]
am
4cd2275d: Merge "Rename "TARGET" to "MODULE" in the build system."
* commit '
4cd2275d93a65296e20be27422a00f9e2a78d3a9':
Rename "TARGET" to "MODULE" in the build system.