OSDN Git Service
Jean-Michel Trivi [Thu, 15 Nov 2012 17:32:05 +0000 (09:32 -0800)]
Merge "Stagefright command line tool: input file name last"
Glenn Kasten [Thu, 21 Jun 2012 19:56:37 +0000 (12:56 -0700)]
Clean up frame size in AudioTrack and AudioFlinger
TrackBase::mFrameSize, mChannelMask, and mChannelCount are now const.
Use TrackBase::mFrameSize instead of re-calculating frame size.
AudioFlinger only sees 16-bit PCM format, conversion from 8-bit is
now entirely on the client side. Previously a small part of the
responsibility was on server side also.
size_t is unsigned, so use %u in logs.
Fix theoretical bug where TrackBase constructor was over-allocating space
for non-linear AudioTrack or 8-bit PCM AudioRecord (probably benign).
Change-Id: I7cbbba0bf4dba29ea751d8af341ab8e5cbbdc206
Glenn Kasten [Wed, 14 Nov 2012 16:44:39 +0000 (08:44 -0800)]
Use uint32_t for sample rate
Change-Id: Ie240b48fb54b08359f69ecd4e5f8bda3d15cbe80
Glenn Kasten [Thu, 15 Nov 2012 00:14:31 +0000 (16:14 -0800)]
Merge "Update audio comments"
Glenn Kasten [Wed, 14 Nov 2012 23:43:41 +0000 (15:43 -0800)]
Merge "Remove deprecated AudioSystem methods"
Glenn Kasten [Wed, 14 Nov 2012 23:43:18 +0000 (15:43 -0800)]
Merge "Fix build warnings"
Mathias Agopian [Wed, 14 Nov 2012 22:51:36 +0000 (14:51 -0800)]
Merge changes I2ce3479d,Ibb56664d
* changes:
more optimizations...
refactor code to improve neon code
Glenn Kasten [Wed, 7 Nov 2012 22:03:00 +0000 (14:03 -0800)]
Update audio comments
Change-Id: I85d7d2f6381b251db5695202fec75128883a8662
Andreas Huber [Wed, 14 Nov 2012 19:51:31 +0000 (11:51 -0800)]
am
dbb74f4e: am
f0937247: Merge "Properly signal an error if codec configuration goes wrong." into jb-mr1.1-dev
* commit '
dbb74f4ee1a971da71f26739d870fc9334100499':
Properly signal an error if codec configuration goes wrong.
Andreas Huber [Wed, 14 Nov 2012 19:51:30 +0000 (11:51 -0800)]
am
911d5f93: am
0224bf17: Various improvements of wifi display code
* commit '
911d5f937adbd177c69bd6959603b8a3b776097e':
Various improvements of wifi display code
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
Glenn Kasten [Wed, 14 Nov 2012 16:32:08 +0000 (08:32 -0800)]
Fix build warnings
Change-Id: Ic43bcca166a529a6431711b05a7fa21849b6a38b
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
Glenn Kasten [Tue, 13 Nov 2012 23:01:05 +0000 (15:01 -0800)]
Remove deprecated AudioSystem methods
Change-Id: I952d504e03af9a1d3e1e0aa379c82dfb00197d9f
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
Glenn Kasten [Tue, 13 Nov 2012 20:25:44 +0000 (12:25 -0800)]
Merge "Rename TrackBase::mFrameCount to mStepCount"
Glenn Kasten [Tue, 13 Nov 2012 17:58:55 +0000 (09:58 -0800)]
Rename TrackBase::mFrameCount to mStepCount
This prepares for adding a new field TrackBase::mFrameCount
with a different meaning.
Change-Id: I6bbe2c59f2a882be57caeec2e2e06f439a0e9e83
Glenn Kasten [Mon, 12 Nov 2012 23:46:10 +0000 (15:46 -0800)]
Simplify AudioRecord::restoreTrack_l()
Finish removing CBLK_RESTORING and CBLK_RESTORED from control block flags,
and remove constant RESTORE_TIMEOUT_MS.
Also minor cleanup:
- Cache mCblk in local variable cblk and make cblk allocatable in a register.
- Use "iMem" for sp<IMemory>.
- Add missing error log to AudioRecord; it was already in AudioTrack.
This is part of a series to clean up the control block.
Change-Id: Ia5f5ab4763c392bc06a45851b167ddaee29e3455
Glenn Kasten [Tue, 13 Nov 2012 16:48:57 +0000 (08:48 -0800)]
Merge "Move frame size out of the control block"
Marco Nelissen [Wed, 7 Nov 2012 23:36:59 +0000 (15:36 -0800)]
Scan .awb files too
b/
6122599
Change-Id: Ied3e0392939231447f1fc5685ca1fade1e55ce08
Glenn Kasten [Mon, 12 Nov 2012 15:58:20 +0000 (07:58 -0800)]
Move frame size out of the control block
This is part of a series to clean up the control block.
Change-Id: Ifab1c42ac0f8be704e571b292713cd2250d12a3f
Jean-Michel Trivi [Thu, 25 Oct 2012 19:07:27 +0000 (12:07 -0700)]
Stagefright command line tool: input file name last
Show in usage that the source file name comes last, and is preceded
by the options.
Change-Id: I8407fc36c8d19785cb2e6e1f7b7a352a8d86f889
Glenn Kasten [Mon, 12 Nov 2012 22:32:06 +0000 (14:32 -0800)]
Fix regression for AudioTrack::write() 8-bit PCM
Bug:
7526532
Change-Id: I8ddd1f0e9d035b54401788dcc422591281dcd97a
Mathias Agopian [Sat, 10 Nov 2012 12:44:30 +0000 (04:44 -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
Mathias Agopian [Sat, 10 Nov 2012 11:26:39 +0000 (03:26 -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
Glenn Kasten [Fri, 9 Nov 2012 01:13:02 +0000 (17:13 -0800)]
Merge "Move buffers pointer out of the control block"
Mathias Agopian [Sun, 4 Nov 2012 23:16:13 +0000 (15:16 -0800)]
NEON optimized SINC resampler
this currently gives us a 60% to 80% boost depending
on the quality level selected.
Change-Id: I7db385007e811ed7bffe5fd3403b44e300894f5b
Mathias Agopian [Mon, 5 Nov 2012 09:51:37 +0000 (01:51 -0800)]
minor cleanups
Change-Id: Ia12ee4fb59e90221761bec85e6450db29197591f
Glenn Kasten [Thu, 8 Nov 2012 20:13:58 +0000 (12:13 -0800)]
Move buffers pointer out of the control block
This is part of a series to clean up the control block.
Change-Id: Ie474557db7cb360f2d9a0f11600a68f5a3d46f07
Glenn Kasten [Wed, 7 Nov 2012 18:13:08 +0000 (10:13 -0800)]
Simplify AudioTrack::restoreTrack_l()
Remove CBLK_RESTORING and CBLK_RESTORED from control block flags,
for AudioTrack only. They are still used by AudioRecord.
This is part of a series to clean up the control block.
Change-Id: Iae4798f5b527c492bdaf789987ff3a1dadd0cb37
Glenn Kasten [Thu, 8 Nov 2012 18:35:06 +0000 (10:35 -0800)]
Merge "Add all-channel AudioTrack::setVolume() API"
Glenn Kasten [Thu, 8 Nov 2012 18:04:06 +0000 (10:04 -0800)]
Merge "Fix call to restoreTrack_l() without lock held"
Glenn Kasten [Fri, 2 Nov 2012 20:05:14 +0000 (13:05 -0700)]
Fix call to restoreTrack_l() without lock held
Also document lock order
Change-Id: I2c1f273a0a51fa79ee3dd766de8d23083e270051
Glenn Kasten [Wed, 7 Nov 2012 00:15:41 +0000 (16:15 -0800)]
Remove CBLK_DIRECTION from control block flags
This is part of a series to clean up the control block.
Change-Id: I0265fece3247356b585d4d48fbda6f37aea8a851
Glenn Kasten [Wed, 7 Nov 2012 16:29:30 +0000 (08:29 -0800)]
Merge "Remove CBLK_FAST from control block flags"
Glenn Kasten [Wed, 7 Nov 2012 16:09:22 +0000 (08:09 -0800)]
Merge "Remove unused fields in AudioTrack::Buffer"
Glenn Kasten [Wed, 7 Nov 2012 16:03:13 +0000 (08:03 -0800)]
Merge "Removed unused fields in AudioRecord::Buffer"
Glenn Kasten [Tue, 6 Nov 2012 23:03:34 +0000 (15:03 -0800)]
Remove CBLK_FAST from control block flags
This is part of a series to clean up the control block.
Change-Id: Ic881a3560d9547cb63fcc0cefec87aa3da480e0d
Mathias Agopian [Tue, 6 Nov 2012 23:39:59 +0000 (15:39 -0800)]
Merge changes I5d62a6c2,Iebf76958,I8068f0f7
* changes:
improve resample test
change how we store the FIR coefficients
improve SINC resampler performance
Glenn Kasten [Tue, 6 Nov 2012 22:25:20 +0000 (14:25 -0800)]
Remove unused fields in AudioTrack::Buffer
Change-Id: Iab75f6e2348d8b6d1f3cec95aeb3fcd5135dfb50
Glenn Kasten [Thu, 21 Jun 2012 23:24:32 +0000 (16:24 -0700)]
Removed unused fields in AudioRecord::Buffer
Change-Id: I89fc6d8f695b48516d956b0a9a4a43d408f369f9
The Android Open Source Project [Tue, 6 Nov 2012 20:29:13 +0000 (12:29 -0800)]
am
33cf49b1: (-s ours) am
78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
33cf49b168a88a88167c46b01787a57b49cd875f':
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:34:30 +0000 (11:34 -0800)]
Merge "Cache mCblk in local variable cblk"
Glenn Kasten [Tue, 6 Nov 2012 19:08:29 +0000 (11:08 -0800)]
am
3b31d805: am
1c6833af: Ignore SIGPIPE during write() to broken pipe
* commit '
3b31d805517c0bde8a0ebed219cbd4b8409c71c2':
Ignore SIGPIPE during write() to broken pipe
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 [Thu, 1 Nov 2012 21:58:02 +0000 (14:58 -0700)]
Cache mCblk in local variable cblk
Use "iMem" for sp<IMemory>
Change-Id: I2f1fbbc517fbd77cfc92f6c3b1f253c26bae93b0
Glenn Kasten [Tue, 6 Nov 2012 18:27:58 +0000 (10:27 -0800)]
Merge "AudioRecord comments"
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
Glenn Kasten [Mon, 5 Nov 2012 21:39:09 +0000 (13:39 -0800)]
Merge duplicate code in TrackBase::TrackBase()
Change-Id: Id8a7db4d94888796a9dcbed4cac99941705cd174
Glenn Kasten [Tue, 6 Nov 2012 00:32:24 +0000 (16:32 -0800)]
Merge "Simplify control block flag names"
Glenn Kasten [Tue, 28 Feb 2012 00:21:04 +0000 (16:21 -0800)]
Add all-channel AudioTrack::setVolume() API
Add combined channel APIs setVolume to AudioTrack,
and remove obsolete getVolume.
Change-Id: I0c87bfdbff4f4292259fa33e65f67badbafd270b
Glenn Kasten [Mon, 5 Nov 2012 22:58:23 +0000 (14:58 -0800)]
Merge "Remove deprecated AudioTrack APIs"
Glenn Kasten [Tue, 28 Feb 2012 00:05:09 +0000 (16:05 -0800)]
Remove deprecated AudioTrack APIs
Change-Id: I88be6525f3e33df529c0c3cb701d12a484809477
Glenn Kasten [Mon, 5 Nov 2012 21:38:15 +0000 (13:38 -0800)]
Simplify control block flag names
Use only one symbol per flag
Change-Id: Ia3582e2134abd60c896d11337face65383e79c7c
Mathias Agopian [Mon, 5 Nov 2012 02:49:14 +0000 (18:49 -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
Mathias Agopian [Sun, 4 Nov 2012 10:03:49 +0000 (02:03 -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
Mathias Agopian [Sun, 4 Nov 2012 06:37:53 +0000 (23:37 -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
Glenn Kasten [Fri, 26 Oct 2012 21:28:05 +0000 (14:28 -0700)]
Turn off executable bit on ordinary files
Change-Id: I0abea25b58fb1d03975bed9cca40f826fcd4c5e4
Mathias Agopian [Fri, 2 Nov 2012 22:21:25 +0000 (15:21 -0700)]
Merge "new coefficients for the vhq resampler"
Glenn Kasten [Fri, 2 Nov 2012 16:59:51 +0000 (09:59 -0700)]
Fix spurious wakeup waiting for new IAudioTrack
If there was a spurious wakeup while waiting for another thread to create
a new IAudioTrack, we assumed that the track has been created when it
might not have been.
Change-Id: I5f3999b4f7a06a00aabd65a746cc7222fff396ab
Glenn Kasten [Thu, 1 Nov 2012 22:41:48 +0000 (15:41 -0700)]
AudioRecord comments
Change-Id: Ibec910608948d778dc655d900255a80384e9b06f
Glenn Kasten [Fri, 2 Nov 2012 17:51:32 +0000 (10:51 -0700)]
Merge "Add NBAIO support for more sample rates"
Glenn Kasten [Fri, 2 Nov 2012 17:20:53 +0000 (10:20 -0700)]
Merge "AudioTrack comments"
Glenn Kasten [Thu, 1 Nov 2012 22:45:06 +0000 (15:45 -0700)]
AudioTrack comments
Change-Id: I08988f635c5bc6f4c35e9c4188f3d6fa557bc4c2
James Dong [Fri, 2 Nov 2012 17:15:33 +0000 (10:15 -0700)]
Merge "Remove unused default parameter for copyBuffer()"
The Android Open Source Project [Fri, 2 Nov 2012 14:30:27 +0000 (07:30 -0700)]
am
8b6ce0a2: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
8b6ce0a269ba67995766980f5b83937302143e64':
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
Mathias Agopian [Fri, 2 Nov 2012 04:03:46 +0000 (21:03 -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
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
James Dong [Fri, 2 Nov 2012 01:54:43 +0000 (18:54 -0700)]
Remove unused default parameter for copyBuffer()
Change-Id: I8002986ccb926165af393ca80cece60dee011204
Andreas Huber [Thu, 1 Nov 2012 23:03:19 +0000 (16:03 -0700)]
am
d37ee8fb: am
96076964: Make video encoders\' bitrate mode (constant, variable, ...) configurable
* commit '
d37ee8fb36c972bf8d07868700a2c47358e25eb4':
Make video encoders' bitrate mode (constant, variable, ...) configurable
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
Glenn Kasten [Thu, 1 Nov 2012 18:11:38 +0000 (11:11 -0700)]
Line length 100
Change-Id: Ib28fd7b9ce951a6933f006e7f8812ba617625530
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
Glenn Kasten [Mon, 1 Oct 2012 16:47:30 +0000 (09:47 -0700)]
Add NBAIO support for more sample rates
This will be used for audio capture but it is not scalable,
and we need a better approach in the long term.
Change-Id: I8b12f6b64a3fd8e8a8c425c82574260fe8ffbed6
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"