summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add GSM 6.10 decoder"Marco Nelissen2012-11-1611-11/+605
|\
| * Add GSM 6.10 decoderMarco Nelissen2012-11-1611-11/+605
| | | | | | | | | | | | | | | | Supports Microsoft frame packing only, since that's what the sample file used. b/6620569 Change-Id: Ia89d95bcbf0f8dcbaad42148a7401728f60e079d
* | Use size_t for frame countsGlenn Kasten2012-11-157-36/+48
| | | | | | | | | | | | Also fix typo: bufferCount should be frameCount. Change-Id: Ibed539504db75ef99dc21c8ff1bf2987122063a5
* | Merge "wfd sink update."Andreas Huber2012-11-151-1/+4
|\ \
| * | wfd sink update.Andreas Huber2012-11-151-1/+4
| | | | | | | | | | | | Change-Id: Ib4e41ec1524d045699543536acdddc9a243db741
* | | The length information of the chunks making up vorbis codec specific infoAndreas Huber2012-11-152-15/+61
|/ / | | | | | | | | | | | | are "Xiph-style-lacing encoded" instead of individual bytes. Change-Id: Ic1274a5bd8f082197bae6831da04002762a920c5 related-to-bug: 7401329
* | Clean up frame size in AudioTrack and AudioFlingerGlenn Kasten2012-11-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Use uint32_t for sample rateGlenn Kasten2012-11-146-20/+20
| | | | | | | | Change-Id: Ie240b48fb54b08359f69ecd4e5f8bda3d15cbe80
* | Merge "Update audio comments"Glenn Kasten2012-11-141-3/+3
|\ \
| * | Update audio commentsGlenn Kasten2012-11-141-3/+3
| | | | | | | | | | | | Change-Id: I85d7d2f6381b251db5695202fec75128883a8662
* | | Merge "Remove deprecated AudioSystem methods"Glenn Kasten2012-11-141-10/+0
|\ \ \
| * | | Remove deprecated AudioSystem methodsGlenn Kasten2012-11-131-10/+0
| |/ / | | | | | | | | | Change-Id: I952d504e03af9a1d3e1e0aa379c82dfb00197d9f
* | | Merge "Fix build warnings"Glenn Kasten2012-11-141-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix build warningsGlenn Kasten2012-11-141-1/+1
| |/ | | | | | | Change-Id: Ic43bcca166a529a6431711b05a7fa21849b6a38b
* | am dbb74f4e: am f0937247: Merge "Properly signal an error if codec ↵Andreas Huber2012-11-141-1/+6
|\ \ | | | | | | | | | | | | | | | | | | configuration goes wrong." into jb-mr1.1-dev * commit 'dbb74f4ee1a971da71f26739d870fc9334100499': Properly signal an error if codec configuration goes wrong.
| * \ am f0937247: Merge "Properly signal an error if codec configuration goes ↵Andreas Huber2012-11-141-1/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | wrong." into jb-mr1.1-dev * commit 'f0937247b6d92b7d9457c64e36fe4c10927685ac': Properly signal an error if codec configuration goes wrong.
| | * \ Merge "Properly signal an error if codec configuration goes wrong." into ↵Andreas Huber2012-11-141-1/+6
| | |\ \ | | | | | | | | | | | | | | | jb-mr1.1-dev
| | | * | Properly signal an error if codec configuration goes wrong.Andreas Huber2012-11-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 911d5f93: am 0224bf17: Various improvements of wifi display codeAndreas Huber2012-11-1416-302/+633
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | * commit '911d5f937adbd177c69bd6959603b8a3b776097e': Various improvements of wifi display code
| * | | am 0224bf17: Various improvements of wifi display codeAndreas Huber2012-11-1416-302/+633
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '0224bf170a3904576bba81593eaab113c5d3a4e7': Various improvements of wifi display code
| | * | Various improvements of wifi display codeAndreas Huber2012-11-1316-302/+633
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | am 1c6833af: Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-11-061-0/+1
| |\ \ | | |/ | | | | | | | | | * commit '1c6833afd6cfdbc6c696ed0719ceedc37ec0b534': Ignore SIGPIPE during write() to broken pipe
| | * Ignore SIGPIPE during write() to broken pipeGlenn Kasten2012-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | This happens occasionally when taking a bugreport. Bug: 6447319 Change-Id: Ia6531a4a3658461f8fd3f7106e7996da7cc5933a
* | | Simplify AudioRecord::restoreTrack_l()Glenn Kasten2012-11-131-49/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Move frame size out of the control block"Glenn Kasten2012-11-132-25/+23
|\ \ \
| * | | Move frame size out of the control blockGlenn Kasten2012-11-122-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ifab1c42ac0f8be704e571b292713cd2250d12a3f
* | | | Scan .awb files tooMarco Nelissen2012-11-121-1/+1
|/ / / | | | | | | | | | | | | | | | b/6122599 Change-Id: Ied3e0392939231447f1fc5685ca1fade1e55ce08
* | | Fix regression for AudioTrack::write() 8-bit PCMGlenn Kasten2012-11-121-1/+1
| | | | | | | | | | | | | | | Bug: 7526532 Change-Id: I8ddd1f0e9d035b54401788dcc422591281dcd97a
* | | Move buffers pointer out of the control blockGlenn Kasten2012-11-082-8/+8
| | | | | | | | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ie474557db7cb360f2d9a0f11600a68f5a3d46f07
* | | Simplify AudioTrack::restoreTrack_l()Glenn Kasten2012-11-081-91/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add all-channel AudioTrack::setVolume() API"Glenn Kasten2012-11-082-8/+3
|\ \ \
| * | | Add all-channel AudioTrack::setVolume() APIGlenn Kasten2012-11-052-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add combined channel APIs setVolume to AudioTrack, and remove obsolete getVolume. Change-Id: I0c87bfdbff4f4292259fa33e65f67badbafd270b
* | | | Merge "Fix call to restoreTrack_l() without lock held"Glenn Kasten2012-11-081-0/+6
|\ \ \ \
| * | | | Fix call to restoreTrack_l() without lock heldGlenn Kasten2012-11-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also document lock order Change-Id: I2c1f273a0a51fa79ee3dd766de8d23083e270051
* | | | | Remove CBLK_DIRECTION from control block flagsGlenn Kasten2012-11-072-24/+22
|/ / / / | | | | | | | | | | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: I0265fece3247356b585d4d48fbda6f37aea8a851
* | | | Merge "Remove CBLK_FAST from control block flags"Glenn Kasten2012-11-072-7/+12
|\ \ \ \
| * | | | Remove CBLK_FAST from control block flagsGlenn Kasten2012-11-062-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ic881a3560d9547cb63fcc0cefec87aa3da480e0d
* | | | | Merge "Remove unused fields in AudioTrack::Buffer"Glenn Kasten2012-11-071-7/+0
|\ \ \ \ \
| * | | | | Remove unused fields in AudioTrack::BufferGlenn Kasten2012-11-061-7/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Iab75f6e2348d8b6d1f3cec95aeb3fcd5135dfb50
* | | | | Removed unused fields in AudioRecord::BufferGlenn Kasten2012-11-061-3/+0
|/ / / / | | | | | | | | | | | | Change-Id: I89fc6d8f695b48516d956b0a9a4a43d408f369f9
* | | | Cache mCblk in local variable cblkGlenn Kasten2012-11-061-62/+79
| | | | | | | | | | | | | | | | | | | | | | | | Use "iMem" for sp<IMemory> Change-Id: I2f1fbbc517fbd77cfc92f6c3b1f253c26bae93b0
* | | | Merge "Simplify control block flag names"Glenn Kasten2012-11-052-42/+42
|\ \ \ \
| * | | | Simplify control block flag namesGlenn Kasten2012-11-052-42/+42
| |/ / / | | | | | | | | | | | | | | | | | | | | Use only one symbol per flag Change-Id: Ia3582e2134abd60c896d11337face65383e79c7c
* | | | Merge "Remove deprecated AudioTrack APIs"Glenn Kasten2012-11-051-22/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove deprecated AudioTrack APIsGlenn Kasten2012-11-051-22/+0
| | | | | | | | | | | | | | | | Change-Id: I88be6525f3e33df529c0c3cb701d12a484809477
* | | | Turn off executable bit on ordinary filesGlenn Kasten2012-11-027-0/+0
|/ / / | | | | | | | | | Change-Id: I0abea25b58fb1d03975bed9cca40f826fcd4c5e4
* | | Fix spurious wakeup waiting for new IAudioTrackGlenn Kasten2012-11-021-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add NBAIO support for more sample rates"Glenn Kasten2012-11-021-39/+85
|\ \ \
| * | | Add NBAIO support for more sample ratesGlenn Kasten2012-11-011-39/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Remove unused default parameter for copyBuffer()James Dong2012-11-012-3/+3
| | | | | | | | | | | | | | | | Change-Id: I8002986ccb926165af393ca80cece60dee011204