summaryrefslogtreecommitdiffstats
path: root/include/private
Commit message (Collapse)AuthorAgeFilesLines
* New control block for AudioTrack and AudioRecordGlenn Kasten2013-06-121-124/+267
| | | | | | | | Main differences between old and new control block: - removes the mutex, which was a potential source of priority inversion - circular indices into shared buffer, which is now always a power-of-2 size Change-Id: I4e9b7fa99858b488ac98a441fa70e31dbba1b865
* Add template class SingleStateQueueGlenn Kasten2013-03-051-0/+35
| | | | Change-Id: If7e2bc9b2a216524ee9cbb68682e2634933b4973
* Start isolating control block accesses in a proxyGlenn Kasten2012-12-121-45/+183
| | | | | | | | | | | | | | | | | | | | | The proxy object will eventually be the only code that understands the details of the control block. This should make it easier to change the control block in the future. Initial set of control block fields that are isolated: - sample rate - send level - volume Prepare for streaming/static separation by adding a union to the control block for the new fields. Fix bug in handling of max sample rate on a track. It was only checking at re-configuration, not at each mix. Simplify OutputTrack::obtainBuffer. Change-Id: I2249f9d04f73a911a922ad1d7f6197292c74cd92
* am ba6b1bc3: am e7550eb2: Merge "Initialize and copy mRotationAngle in ↵Andreas Huber2012-11-301-1/+3
|\ | | | | | | | | | | | | VideoFrame" * commit 'ba6b1bc38e0c355277f69af286469adb5f02e876': Initialize and copy mRotationAngle in VideoFrame
| * Initialize and copy mRotationAngle in VideoFrameChrister Fletcher2012-11-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | When thumbnails were generated they could be generated at random angles as the mRotationAngle variable was not initialized to any value. This variable would have to be explicitly overwritten to not cause random rotation. Changed the implementation to initialize the value to 0 (no rotation). mRotationAngle was also missing in the copy constructor. Change-Id: I67a5340fdd807c6ab3a3da5eecb09b5b9d5f4666
* | Don't use control block frame count after createGlenn Kasten2012-11-161-11/+18
| | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: I7f4cb05aef63053f8e2ab05b286d302260ef4758
* | Update audio commentsGlenn Kasten2012-11-141-1/+2
| | | | | | | | Change-Id: I85d7d2f6381b251db5695202fec75128883a8662
* | Simplify AudioRecord::restoreTrack_l()Glenn Kasten2012-11-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Move frame size out of the control blockGlenn Kasten2012-11-121-5/+2
| | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ifab1c42ac0f8be704e571b292713cd2250d12a3f
* | Move buffers pointer out of the control blockGlenn Kasten2012-11-081-4/+5
| | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ie474557db7cb360f2d9a0f11600a68f5a3d46f07
* | Simplify AudioTrack::restoreTrack_l()Glenn Kasten2012-11-081-0/+2
| | | | | | | | | | | | | | | | | | 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
* | Remove CBLK_DIRECTION from control block flagsGlenn Kasten2012-11-071-12/+26
| | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: I0265fece3247356b585d4d48fbda6f37aea8a851
* | Remove CBLK_FAST from control block flagsGlenn Kasten2012-11-061-1/+0
| | | | | | | | | | | | This is part of a series to clean up the control block. Change-Id: Ic881a3560d9547cb63fcc0cefec87aa3da480e0d
* | Simplify control block flag namesGlenn Kasten2012-11-051-22/+9
| | | | | | | | | | | | Use only one symbol per flag Change-Id: Ia3582e2134abd60c896d11337face65383e79c7c
* | Line length 100Glenn Kasten2012-11-011-2/+4
|/ | | | Change-Id: Ib28fd7b9ce951a6933f006e7f8812ba617625530
* Log track name on obtain/releaseBuffer warningsGlenn Kasten2012-06-131-3/+1
| | | | | | | This should help diagnose problems by allowing us to correlate the logs with the dumpsys media.audio_flinger output. Change-Id: I8c7c592b4f87d13b0f29c66ce7a2f301a0f063c9
* Configure policy of mediaserver threadsGlenn Kasten2012-04-221-0/+1
| | | | Change-Id: Ifd825590ba36996064a458f64453a94b84722cb0
* AV Android make files changesJames Dong2012-03-281-67/+0
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Use a status_t return type for GL functorsRomain Guy2012-03-261-0/+17
| | | | | | | | | WebView needs more fine-grained control over the behavior of the framework upon execution of the display lists. The new status_t allows WebView to requests its functor to be re-executed directly without causing a redraw of the entire hierarchy. Change-Id: I97a8141dc5c6eeb6805b6024cc1e76fce07d24cc
* Whitespace and indentationGlenn Kasten2012-03-131-5/+5
| | | | | | | | | | | | | | Fix indentation to be multiple of 4. Make it easier to search: sp< not sp < to "switch (...)" instead of "switch(...)" (also "if" and "while") Remove redundant blank line at start or EOF. Remove whitespace at end of line. Remove extra blank lines where they don't add value. Use git diff -b or -w to verify. Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
* remove files that moved to frameworks/nativeMathias Agopian2012-03-077-584/+0
| | | | Change-Id: I140d291e520097b1148930f736823650e08488f7
* fix libgui header locationMathias Agopian2012-02-272-2/+1
| | | | Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
* libagl shouldn't export anythingMathias Agopian2012-02-271-640/+0
| | | | Change-Id: Ia823dbc56aab2a0b8a6063df4348fe6baac124c6
* remove dependency on android_native{s_priv|buffer}.hMathias Agopian2012-02-241-17/+0
| | | | Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
* Update commentsGlenn Kasten2012-02-141-6/+23
| | | | | | We no longer put the filename at start of file. Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
* Don't double destruct audio_track_cblk_tGlenn Kasten2012-02-031-0/+1
| | | | | | | | | Fortunately audio_track_cblk_t doesn't have a destructor, but for clarity remove the double destruction. Also add warning not to add any virtuals to audio_track_cblk_t. Change-Id: I70ebe1a70460c7002145b2cdf10f9f137396e6f3
* Make AudioTrack control block volume field privateGlenn Kasten2012-01-201-1/+14
| | | | | | | This is part of the process of abstracting the control block to make it easier to maintain. Change-Id: Idb8f461e68dab3bcf268159cc0781651c6fb7094
* Track volume cleanupGlenn Kasten2012-01-171-4/+7
| | | | | | | | | | | | | | | | | | | | Always read and write track volumes atomically. In most places this was already being done, but there were a couple places where the left and right channels were read independently. Changed constant MAX_GAIN_INT to be a uint32_t instead of a float. It is always used as a uint32_t in comparisons and assignments. Use MAX_GAIN_INT in more places. Now that volume is always accessed atomically, removed the union and alias for uint16_t volume[2], and kept only volumeLR. Removed volatile as it's meaningless. In AudioFlinger, clamp the track volumes read from shared memory before applying master and stream volume. Change-Id: If65e2b27e5bc3db5bf75540479843041b58433f0
* Merge "Use size_t for frame size"Glenn Kasten2012-01-171-1/+1
|\
| * Use size_t for frame sizeGlenn Kasten2012-01-131-1/+1
| | | | | | | | | | | | | | | | | | except in the control block, where we don't have room. In AudioFlinger::ThreadBase::TrackBase::getBuffer, read the frame size from control block only once. Change-Id: Id6c4bccd4ed3e07d91df6bbea43bae45524f9f4e
* | AudioTrack and AudioFlinger send level cleanupGlenn Kasten2012-01-131-1/+16
|/ | | | | | | | | | | Add an API to control block for getting/setting send level. This allow us to make the mSendLevel field private. Document the lack of barriers. Use 0.0f to initialize floating-point values (for doc only). Change-Id: I59f83b00adeb89eeee227e7648625d9a835be7a4
* Audio C++ commentsGlenn Kasten2011-12-141-2/+2
| | | | Change-Id: I84906ebb9dfcfa5b96b287d18364b407f02a30c1
* split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-281-0/+53
| | | | Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
* fix Surface positions are not floatsMathias Agopian2011-08-301-2/+2
| | | | | | | | Added Surface.setPosition(float, float) which allows to set a surface's position in float. Bug: 5239859 Change-Id: I903aef4ad5b5999142202fb8ea30fe216d805711
* Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator buildMike Lockwood2011-07-131-115/+0
| | | | | Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba Signed-off-by: Mike Lockwood <lockwood@android.com>
* SF transactions are now O(1) wrt IPC instead of O(N).Mathias Agopian2011-06-291-0/+8
| | | | Change-Id: I57669852cbf6aabae244ea86940a08a5a27ffc43
* unify SurfaceTexture and SurfaceMathias Agopian2011-06-131-346/+2
| | | | | | | Add the concept of synchronous dequeueBuffer in SurfaceTexture Implement {Surface|SurfaceTextureClient}::setSwapInterval() Add SurfaceTexture logging fix onFrameAvailable
* Remove unnecessary level of priority indirectionGlenn Kasten2011-06-011-1/+0
| | | | Change-Id: I942d43973c20a7ace8b0d3f78b4da97e45e996c6
* Use channel mask instead of channel count for track creationJean-Michel Trivi2011-06-011-1/+2
| | | | | | | | | | | | | | | | | Record and playback objects (resp AudioRecord and AudioTrack) are created using a channel mask, but this information is lost in the mixer because only the channel count is known to AudioFlinger. A channel count can always be derived from a channel mask. The change consists in: - disambiguiting variable names for channel masks and counts - passing the mask information from the client to AudioFlinger and the mixer. - when using the DIRECT ouput, only verifying the format of the track is compatible with the output's for PCM. Change-Id: I50d87bfb7d7afcabdf5f12d4ab75ef3a54132c0e
* remove last traces of copybitMathias Agopian2011-05-021-16/+0
| | | | Change-Id: Ia0f13a0ee6f702256482b5eb29d7fa2aa840bfc7
* get rid of dependency on copybit HAL moduleMathias Agopian2011-04-281-2/+0
| | | | Change-Id: Ia608099a2426c11a91d33063ba53c93e1eccb428
* New fix for issue 4111672: control block flagsEric Laurent2011-04-051-4/+4
| | | | | | | | | | | | | | | The first fix (commit 913af0b4) is problematic because it makes threads in mediaserver process block on the cblk mutex. This is not permitted as it can cause audio to skip or worse have a malicious application prevent all audio playback by keeping the mutex locked. The fix consists in using atomic operations when modifying the control block flags. Also fixed audio_track_cblk_t::framesReady() so that it doesn't block when called from AudioFlinger (only applies when a loop is active). Change-Id: Ibf0abb562ced3e9f64118afdd5036854bb959428
* Send WebView the current transform and whether we're drawing a layer.Romain Guy2011-03-171-0/+50
| | | | | | | | | Bug #3275491 These can be used by WebView to correctly apply alpha and geometric transforms. Change-Id: I2ecd4376d68df886dead3c9240317de33f56828f
* Fix issue 3439872: video chat and bluetooth SCOEric Laurent2011-03-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes the stability problems experienced when using a bluetooth headset supporting both A2DP and SCO. Problems occur when starting the video chat at which time the A2DP output is being stopped to start SCO. At that time, active AudioTracks are invalidated by AudioFlinger so that a new AudioTrack binder interface can be recreated by the client process on the new mixer thread with correct parameters. The problem was that the process to restore the binder interface was not protected against concurrent requests which caused 2 binder interfaces to be created sometimes. This could lead to permanent client deadlock if one of the client threads was waiting for a condition of the first created binder interface while the second one was created (as the AudioFlinger would only signal conditions on the last one created). This concurrent request situation is more likely to happen when a client uses the JAVA AudioTrack as the JNI implementation uses simultaneously the native AudioTrack callback and write push mechanisms. By doing so, the code that checks if the binder interface should be restored (in obtainBuffer()) is much more likely to be called concurrently from two different threads. The fix consists in protecting the critical binder interface restore phase with a flag in the AudioTrack control block. The first thread acting upon the binder interface restore request will raise the flag and the second thread will just wait for a condition to be signaled when the restore process is complete. Also protected all accesses to the AudioTrack control block by a mutex to prevent access while the track is being destroyed and restored. If a mutex cannot be held (e.g because we call a callback function), acquire a strong reference on the IAudioTrack to prevent its destruction while the cblk is being accessed. Modified AudioTrack JNI to use GetByteArrayElements() instead of GetPrimitiveArrayCritical() when writing audio buffers. Entering a critical section would cause the JNI to abort if a mediaserver crash occurs during a write due to the AudioSystem callback being called during the critical section when media server process restarts. Anyway with current JNI implementation, either versions do not copy data most of the times and the criticial version does not guaranty no data copy. The same modifications have been made to AudioRecord. Change-Id: Idc5aa711a04c3eee180cdd03f44fe17f3c4dcb52
* Add support for up to 32 buffers per SurfaceMathias Agopian2011-03-011-3/+3
| | | | | | Bug: 3488016 Change-Id: Ie5536ad77d42a4d0e8270e0fd87ecb73471bcbbc
* clean-up unneeded codeMathias Agopian2011-01-201-8/+1
| | | | | | | | | | now that we removed the notion of a "inUse" buffer in surfaceflinger a lot of code can be simplified / removed. noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete" is also gone. Change-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d
* fix [3259708] Graphic Buffer Mapper does not support YV12Mathias Agopian2010-12-081-83/+0
| | | | | | remove a bunch of a code that was there only to support broken gralloc implementations Change-Id: I3c1a9172224cbcc283601abfbbd695a20815451f
* Implement reducing the buffer count of a Surface.Jamie Gennis2010-11-111-0/+10
| | | | | Change-Id: I7f979c60c06d654aa8265002836277434bc1a64f Bug: 3095167
* Support extracting thumbnail from rotated video tracksJames Dong2010-11-081-0/+1
| | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
* fix [2835280] Add support for cancelling buffers to ANativeWindowMathias Agopian2010-10-041-4/+6
| | | | | | | | | | There is a new ANativeWindow::cancelBuffer() API that can be used to cancel any dequeued buffer, BEFORE it's been enqueued. The buffer is returned to the list of availlable buffers. dequeue and cancel are not mutually thread safe, they must be called from the same thread or external synchronization must be used. Change-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61
generated by cgit v1.1 at 2024-06-04 06:12:53 +0000