summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix time vs. bytes units bug in getRenderPosition"Glenn Kasten2012-11-163-24/+21
|\
| * Fix time vs. bytes units bug in getRenderPositionGlenn Kasten2012-11-163-24/+21
| | | | | | | | | | | | | | Rename correctLatency since it requires thread to be locked. Use size_t for byte and frame counts. Change-Id: I178fdd18bdb823813b9563927bdff8c0d28ca5a5
* | Merge "Don't use control block frame count after create"Glenn Kasten2012-11-166-80/+100
|\ \
| * | Don't use control block frame count after createGlenn Kasten2012-11-166-80/+100
| | | | | | | | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: I7f4cb05aef63053f8e2ab05b286d302260ef4758
* | | Merge "Don't explicitly log tid"Glenn Kasten2012-11-163-18/+18
|\ \ \
| * | | Don't explicitly log tidGlenn Kasten2012-11-163-18/+18
| |/ / | | | | | | | | | | | | | | | If needed, it can be obtained with adb logcat -v threadtime Change-Id: I91b3911d20f7bcfc3361db4052db21ff9181f1cf
* | | am abae71d3: am d983364b: Static AudioTrack plays twice initiallyGlenn Kasten2012-11-160-0/+0
|\ \ \ | | | | | | | | | | | | | | | | * commit 'abae71d37d4860e297de7ee06f49efa5254b90ee': Static AudioTrack plays twice initially
| * \ \ am d983364b: Static AudioTrack plays twice initiallyGlenn Kasten2012-11-161-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'd983364b3655a547b55bb11dbe148103198c011d': Static AudioTrack plays twice initially
| | * | | Static AudioTrack plays twice initiallyGlenn Kasten2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7528721 Change-Id: I10bc16a26f33dba6572b730a170cb3bf00e68e30
* | | | | Fix a crash when the stop might be called due to some error before start in ↵James Dong2012-11-161-3/+4
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | RTSPSource o related-to-bug: 7507224 Change-Id: Ic8bfec13097b824ba337a01c9b00c98af2a33f43
* | | | Merge "Only pass the surface to the video decoder."Andreas Huber2012-11-161-2/+4
|\ \ \ \
| * | | | Only pass the surface to the video decoder.Andreas Huber2012-11-161-2/+4
| | |_|/ | |/| | | | | | | | | | Change-Id: Ice0cfc0021fdd9fe053be6ee324cbc64226ed122
* | | | resolved conflicts for merge of 205d7249 to masterMarco Nelissen2012-11-161-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
| * | am da33d66e: Merge "Add .mpga to acceptable file name extensions list."Marco Nelissen2012-11-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'da33d66e68791d0bfeccebc8253a59467b5ef670': Add .mpga to acceptable file name extensions list.
| | * \ Merge "Add .mpga to acceptable file name extensions list."Marco Nelissen2012-11-161-1/+1
| | |\ \
| | | * | Add .mpga to acceptable file name extensions list.Jan Bjernler2012-11-161-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Add GSM 6.10 decoder"Marco Nelissen2012-11-1612-11/+606
|\ \ \ \
| * | | | Add GSM 6.10 decoderMarco Nelissen2012-11-1612-11/+606
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports Microsoft frame packing only, since that's what the sample file used. b/6620569 Change-Id: Ia89d95bcbf0f8dcbaad42148a7401728f60e079d
* | | | | Merge "Use size_t for frame counts"Glenn Kasten2012-11-1614-77/+89
|\ \ \ \ \
| * | | | | Use size_t for frame countsGlenn Kasten2012-11-1514-77/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix typo: bufferCount should be frameCount. Change-Id: Ibed539504db75ef99dc21c8ff1bf2987122063a5
* | | | | | Merge "Static AudioTrack plays twice initially"Glenn Kasten2012-11-151-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Static AudioTrack plays twice initiallyGlenn Kasten2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7528721 Change-Id: I10bc16a26f33dba6572b730a170cb3bf00e68e30
* | | | | | Merge "wfd sink update."Andreas Huber2012-11-152-4/+8
|\ \ \ \ \ \
| * | | | | | wfd sink update.Andreas Huber2012-11-152-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Stagefright command line tool: input file name last"Jean-Michel Trivi2012-11-151-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Stagefright command line tool: input file name lastJean-Michel Trivi2012-11-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show in usage that the source file name comes last, and is preceded by the options. Change-Id: I8407fc36c8d19785cb2e6e1f7b7a352a8d86f889
* | | | | | Clean up frame size in AudioTrack and AudioFlingerGlenn Kasten2012-11-144-31/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1413-42/+44
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie240b48fb54b08359f69ecd4e5f8bda3d15cbe80
* | | | | | Merge "Update audio comments"Glenn Kasten2012-11-145-7/+19
|\ \ \ \ \ \
| * | | | | | Update audio commentsGlenn Kasten2012-11-145-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85d7d2f6381b251db5695202fec75128883a8662
* | | | | | | Merge "Remove deprecated AudioSystem methods"Glenn Kasten2012-11-142-16/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove deprecated AudioSystem methodsGlenn Kasten2012-11-132-16/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I952d504e03af9a1d3e1e0aa379c82dfb00197d9f
* | | | | | | Merge "Fix build warnings"Glenn Kasten2012-11-142-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix build warningsGlenn Kasten2012-11-142-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic43bcca166a529a6431711b05a7fa21849b6a38b
* | | | | | | Merge changes I2ce3479d,Ibb56664dMathias Agopian2012-11-142-50/+64
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: more optimizations... refactor code to improve neon code
| * | | | | | more optimizations...Mathias Agopian2012-11-102-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | refactor code to improve neon codeMathias Agopian2012-11-102-34/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | 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
* | | | | Merge "Rename TrackBase::mFrameCount to mStepCount"Glenn Kasten2012-11-132-9/+10
|\ \ \ \ \
| * | | | | Rename TrackBase::mFrameCount to mStepCountGlenn Kasten2012-11-132-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares for adding a new field TrackBase::mFrameCount with a different meaning. Change-Id: I6bbe2c59f2a882be57caeec2e2e06f439a0e9e83
* | | | | | Simplify AudioRecord::restoreTrack_l()Glenn Kasten2012-11-132-54/+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-137-57/+63
|\ \ \ \ \
| * | | | | Move frame size out of the control blockGlenn Kasten2012-11-127-57/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ifab1c42ac0f8be704e571b292713cd2250d12a3f
generated by cgit v1.1 at 2024-07-12 10:44:08 +0000