summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "mAudioRecord is always non-0 if set() is successful"Glenn Kasten2014-02-251-4/+4
|\
| * mAudioRecord is always non-0 if set() is successfulGlenn Kasten2014-02-241-4/+4
| | | | | | | | Change-Id: I0c2483210903c922f06f097ada373a37b9a90a02
* | Merge "Unify comments and whitespace between AudioTrack and AudioRecord"Glenn Kasten2014-02-252-1/+5
|\ \ | |/
| * Unify comments and whitespace between AudioTrack and AudioRecordGlenn Kasten2014-02-242-1/+5
| | | | | | | | Change-Id: I5320a6b2d7f7077cb12d7da4f2ca30a940100bf2
* | Merge "Update channel fields at same place in AudioTrack and AudioRecord"Glenn Kasten2014-02-251-4/+3
|\ \ | |/
| * Update channel fields at same place in AudioTrack and AudioRecordGlenn Kasten2014-02-241-4/+3
| | | | | | | | Change-Id: I4b649feeef47e7968a9fa3a460217017ca9b05fe
* | Merge "Update mReqFrameCount at same point in AudioTrack and AudioRecord"Glenn Kasten2014-02-251-5/+5
|\ \ | |/
| * Update mReqFrameCount at same point in AudioTrack and AudioRecordGlenn Kasten2014-02-241-5/+5
| | | | | | | | Change-Id: I12369dfbb9e75389f2cab015a706decdaf310a0d
* | am ed773ea8: am 8fc4d57d: Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
|\ \ | | | | | | | | | | | | * commit 'ed773ea8db3d4ea828f1220e234922a987fefb3b': Avoid a building error
| * \ am 8fc4d57d: Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
| |\ \ | | | | | | | | | | | | | | | | * commit '8fc4d57d41f532b90187b9404a8ac705770d75b4': Avoid a building error
| | * \ Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
| | |\ \
| | | * | Avoid a building errorChih-Wei Huang2013-01-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | &pDwmModule->config may equal to pConfig that triggers a building error using gcc 4.7: In file included from bionic/libc/include/signal.h:33:0, from bionic/libc/include/sys/select.h:34, from bionic/libc/include/unistd.h:34, from system/core/include/cutils/log.h:34, from frameworks/av/media/libeffects/downmix/EffectDownmix.c:19: In function 'memcpy', inlined from 'Downmix_Configure' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:651:11, inlined from 'Downmix_Init' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:605:9, inlined from 'DownmixLib_Create' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:233:9: bionic/libc/include/string.h:114:31: error: call to '__memcpy_overlap_error' declared with attribute error: memcpy called with overlapping regions Change-Id: Ia6c4aab72e38d00d8d526f3b56fc03b6530b4e44
* | | | | Merge "Fix 1:1 dynamic resampler rate setting"Andy Hung2014-02-251-0/+4
|\ \ \ \ \
| * | | | | Fix 1:1 dynamic resampler rate settingAndy Hung2014-02-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id69e98ebaaca8dd8c976eb823f1cc1024b0eddf5 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge "Permit AudioRecord to support non-linear formats in future"Glenn Kasten2014-02-251-2/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Permit AudioRecord to support non-linear formats in futureGlenn Kasten2014-02-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But still restricted to 16-bit PCM currently Change-Id: I5df0e5033da9144ca73e44addf14a63d31406034
* | | | | | Merge "Simplify and cleanup error handling in AudioRecord::getMinFrameCount"Glenn Kasten2014-02-252-17/+11
|\ \ \ \ \ \
| * | | | | | Simplify and cleanup error handling in AudioRecord::getMinFrameCountGlenn Kasten2014-02-252-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8721ecedfb429c4e233453d1e768ddf69ecabbe4
* | | | | | | Merge "Add log at entry to set() in AudioTrack and AudioRecord"Glenn Kasten2014-02-252-3/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Add log at entry to set() in AudioTrack and AudioRecordGlenn Kasten2014-02-242-3/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ife23b88474c1d62c0cf682c1a310d951f2c0f54a
* | | | | | Merge "Advance read pointer before failing"Marco Nelissen2014-02-241-22/+47
|\ \ \ \ \ \
| * | | | | | Advance read pointer before failingMarco Nelissen2014-02-241-22/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to prevent infinite loops when processing a truncated chunk b/13130358 Change-Id: I24c46788ebc76c242da52a8f059b7577bbaebff4
* | | | | | | Merge "The -O option now takes a CSV instead of a single value"Glenn Kasten2014-02-241-12/+81
|\ \ \ \ \ \ \
| * | | | | | | The -O option now takes a CSV instead of a single valueGlenn Kasten2014-02-211-12/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added -P option to provide a CSV list of provided values. Change-Id: I4e0d6fe8b062d27d95d33493f80bd8f1c510d2c8
* | | | | | | | Merge "LiveSession refactor: reverted loop indice change."Robert Shih2014-02-241-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | LiveSession refactor: reverted loop indice change.Robert Shih2014-02-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I465746b206e2253ad44aae0c59317473bc93f73e
* | | | | | | | | Merge "camera2: Fix race with stream deletion during disconnect."Ruben Brunk2014-02-241-6/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | camera2: Fix race with stream deletion during disconnect.Ruben Brunk2013-12-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11856804 - Shutdown order in Camera2Client allows a stream to be deleted before the corresponding processing thread has quit. This can result in updates being called on the processor thread without a valid stream.
* | | | | | | | | Merge "NuPlayer side support for seamless format switch."Robert Shih2014-02-243-1/+74
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NuPlayer side support for seamless format switch.Robert Shih2014-02-243-1/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid reinstantiating decoder if seamless format switch is supported. Change-Id: I2c2be08d6da90cc835ec747d04a76db2313dfc7c
* | | | | | | | | | Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback"Robert Shih2014-02-242-7/+157
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | stagefright: use CODECS field in EXT-X_STREAM-INF as fallbackRobert Shih2014-01-292-7/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the CODECS field in EXT-X-STREAM-INF as a viable fallback for identifying available streams in a variant playlist. Change-Id: I5011809dc7c56220b023eb1a16f2d6a392ddd6f1
* | | | | | | | | | Merge "Add method to get redirected Uri"Marco Nelissen2014-02-243-0/+26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Add method to get redirected UriMarco Nelissen2014-02-213-0/+26
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id8aac1077c3de1bb1f58bfcfcca93d685abe9b79
* | | | | | | | | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-228-12/+118
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-148-12/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13032650 Change-Id: Iecbadf9f29c8c49353416fc467fb3acdde279595
* | | | | | | | | | Merge "Account for unreleased frames when predicting resampler needs"Glenn Kasten2014-02-221-20/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Account for unreleased frames when predicting resampler needsGlenn Kasten2014-02-211-20/+28
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other changes related to resampling: - improve logs - use correct form of assert - don't round up max usable circular buffer sizes to power of 2; this gives more predictable results - add some FIXMEs Bug: 13133176 Change-Id: I8d3c90eed4eb0c0c1fbac3c864e179a2806c2301
* | | | | | | | | | Merge "Make tee sink work again"Glenn Kasten2014-02-212-2/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make tee sink work againGlenn Kasten2014-02-212-2/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was broken by this earlier change to NBAIO: > Change-Id: I5eda412648b094358f5eefc38300e9ec8a734cd3 But the code was not being compiled, so the error was not caught earlier. Also increase the default size of per-track pipe to a reasonable value. Change-Id: Ica05017e6c6533e1fea9df379a9b204eebed4a1f
* | | | | | | | | Merge "LiveSession refactor"Robert Shih2014-02-214-139/+93
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | LiveSession refactorRobert Shih2014-02-204-139/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia91dce109835e042f72934376d4838b4cc72cb10
* | | | | | | | | | Merge "audioflinger: fix race condition in SyncEvent callback"Eric Laurent2014-02-213-7/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | audioflinger: fix race condition in SyncEvent callbackEric Laurent2014-02-203-7/+10
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the SyncEvent callback is implemented by the RecordTrack instead of the RecordThread, there is a possibility that the callback is called after the track deletion. SyncEvent callback now uses a weak pointer instead of a raw pointer as cookie. This allows the callback implementer to acquire a strong reference on the object pointed to by the cookie. Bug: 13114128. Change-Id: Id61b8f06044ed1e52c6f7e7c666cdede68340de2
* | | | | | | | | | resolved conflicts for merge of aa0390b7 to masterMarco Nelissen2014-02-202-4/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | Change-Id: Ide9dfb5df75cac7c363a3c7fdbd8fabdc326a495
| * | | | | | | | am 4ee5d2b9: Merge "LiveSession: Use the actual, possibly redirected url as ↵Marco Nelissen2014-02-202-4/+13
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base in the M3U" * commit '4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae': LiveSession: Use the actual, possibly redirected url as base in the M3U
| | * | | | | | | Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"Marco Nelissen2014-02-202-4/+13
| | |\ \ \ \ \ \ \
| | | * | | | | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-102-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes playback of HLS streams where the M3U playlists use relative paths and the main playlist is opened via a redirect. Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
* | | | | | | | | | Allow specifying frames per call to resample()Glenn Kasten2014-02-191-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13073201 Change-Id: Id2f0fcd7562d9ba5a58c128d71bbba42dfea86cc
* | | | | | | | | | Merge "Fix resampler to allow output of single frame"Andy Hung2014-02-195-6/+38
|\ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-25 01:48:56 +0000