summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Track pid for each session"Marco Nelissen2014-02-133-7/+11
|\
| * Track pid for each sessionMarco Nelissen2014-02-113-7/+11
| | | | | | | | | | | | so they can be properly freed. Change-Id: I6f389035bc29e74e7c367c1c6d0252b180f666b3
* | Merge "warnings be gone."Andreas Huber2014-02-111-1/+1
|\ \
| * | warnings be gone.Andreas Huber2014-02-111-1/+1
| |/ | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | Support "data:" URIs again in mediaplayer...Andreas Huber2014-02-111-0/+49
|/ | | | | Change-Id: I6dac35c7e606f738a60f985f6dca977dc92c82a4 related-to-bug: 12957757
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-112-3/+3
|\ | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-112-4/+4
| |\ | | | | | | | | | | | | * commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01': Make frameworks/av 64-bit compatible
| | * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
| * | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-041-0/+2
| |\ \ | | | | | | | | | | | | | | | | * commit 'dd432ce03eccf280d83672f95076b6fbd561047f': [DO NOT MERGE] Support TS + AC3 for ATSC standard
| | * | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-031-0/+2
| | | | | | | | | | | | | | | | Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
| * | | am 90903383: [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-042-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '9090338367bd9f3fc5678032332a44d457a4a2fe': [DO NOT MERGE] Support AC3 in stagefright
| | * | [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-032-0/+3
| | | | | | | | | | | | | | | | Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
* | | | Fix clang warnings in AudioFlingerGlenn Kasten2014-02-103-3/+3
| | | | | | | | | | | | | | | | Change-Id: I0fa61025c979709ad7d655bc717df5f194b6089e
* | | | Merge "Change Format_frameBitShift() API for non-power-of-2 sizes"Glenn Kasten2014-02-071-1/+2
|\ \ \ \
| * | | | Change Format_frameBitShift() API for non-power-of-2 sizesGlenn Kasten2014-02-031-1/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie39ff51ab8c403ca9d9898396297efdaa3193588
* | | | | Merge "Add FIXMEs about audio_format_t assumption"Glenn Kasten2014-02-071-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add FIXMEs about audio_format_t assumptionGlenn Kasten2014-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0d38241b61f70013573f4a0b9306547afe5f38ad
* | | | | Merge "Change NBAIO_Format from typedef to struct"Glenn Kasten2014-02-071-1/+4
|\ \ \ \ \ | |/ / / /
| * | | | Change NBAIO_Format from typedef to structGlenn Kasten2014-02-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to support arbitrary sample rates, channel counts, and sample formats in NBAIO. Change-Id: I5eda412648b094358f5eefc38300e9ec8a734cd3
* | | | | Merge "Add Format_isValid() and Format_isEqual() to NBAIO"Glenn Kasten2014-02-071-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Add Format_isValid() and Format_isEqual() to NBAIOGlenn Kasten2014-02-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for changing the typedef to a struct. Change-Id: I8eb1c7d98fd12f997641e462359864fdb834abe6
* | | | | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-064-1/+138
|\ \ \ \ \
| * | | | | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-054-1/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12305192 Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
* | | | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-063-11/+0
|\ \ \ \ \ \
| * | | | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-053-11/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we started to use java's HTTPConnection instead of the native implementation. Also remove other remnants of the previous http implementation, such as accounting for the http user's uid. Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
* | | | | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-051-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-051-1/+5
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I62d6534a9581e84ae20c2422f7ad9aeda9b7c4df
* | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-0513-9/+210
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | available to media code"
| * | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-0413-9/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | | | Change Format_Invalid from enum to global constGlenn Kasten2014-02-031-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for changing the typedef to a struct Change-Id: I36d1fe81d2f974224750f753453753303c224591
* | | | | Merge "Use const NBAIO_Format& in parameter lists"Glenn Kasten2014-02-034-11/+11
|\ \ \ \ \
| * | | | | Use const NBAIO_Format& in parameter listsGlenn Kasten2014-01-314-11/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for changing the typedef to a struct. Change-Id: I8d73a6b29580c65105afd78f24db7e2f4a1eb872
* | | | | Merge "Added support to query ACodec whether adaptive playback is enabled."Robert Shih2014-02-031-0/+3
|\ \ \ \ \
| * | | | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-01-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b0308aa8550c643706959277e46dad586c37297
* | | | | | am af1aa00e: am c4eef29a: Merge "fix deadlock issues that arise when there ↵Eric Laurent2014-02-031-24/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds" * commit 'af1aa00e5e6fa3dcd5b7d9145ac6f7659f98bb68': fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
| * | | | | am c4eef29a: Merge "fix deadlock issues that arise when there are ↵Eric Laurent2014-02-031-24/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds" * commit 'c4eef29af4e306319d8741e0c3ade1ede9a0a2b5': fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
| | * | | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-311-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds Whenever there are parallel calls to proxy and non sub-effects wrappers, some of the calls are not completed. This is due to deadlock arsing out of Proxy waiting for the subeffect call to return and subeffect waiting for proxy to release lock. The call flow is changed to a cleaner and simple one - Proxy gets the aeli(effect library info) of subeffects during the EffectGetSubEffects() call. Therby, proxy will manage the sub effects by itself rather than going through effects factory. Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com> Bug: 12424044 Change-Id: I16852222f1d0e94e433a19177729323a4bb1c090
* | | | | Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-032-6/+18
|\ \ \ \ \
| * | | | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-01-282-6/+18
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Eventually we may want to use uint64_t, but will need to confirm atomicity. Bug: 12381724 Change-Id: Ia2c591d262d22b47b6f7dab4b9d9faa14b86d865
* | | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-01-302-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In the scenario of cast mirroring, encoding could be suspended for prolonged periods. Limiting the pts gap to workaround the problem where encoder's rate control logic produces huge frames after a long period of suspension. - Repeat last frame a couple more times to get better quality on static scenes. - Fix the timestamp on repeat frames (it was not set) Bug: 11971963 Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7
* | | | Remove the redundant parameters from createTrack_l()Glenn Kasten2014-01-241-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioRecord::openRecord_l() code was refactored earlier to remove the redundant parameters: > Change-Id: I124dce344b1d11c2dd66ca5e2c9aec0c52c230e2 This changelist refactors AudioTrack similarly. Change-Id: Iefd2bd662870ea81d04eff7b7c26f9c8b0dadd26
* | | | Refactor code related to I/O handles to reduce chance for leaksGlenn Kasten2014-01-242-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioRecord input handle code was refactored earlier to fix a potential handle leak, and to simplify the code: > Change-Id: I124dce344b1d11c2dd66ca5e2c9aec0c52c230e2 This changelist refactors AudioTrack similarly, and adds further cleanup of both AudioTrack and AudioRecord. We attempt to implement the rules for referencing counting I/O handles, but there is still the possibility of a handle leak if the client process dies after allocating the handle reference but before releasing it. That issue is being tracked separately. Details: - AudioSystem::getOutput() is now called within createTrack_l - restoreTrack_l was missing offload info now it has the info available, but is not yet being called for offloaded tracks - AudioTrack::getOutput() is now const - Remove getOutput_l() Change-Id: I44a0a623d24fc5847bcac0939c276400568adbca
* | | | Merge "Replace control block frameCount_ by explicit in/out parameter"Glenn Kasten2014-01-242-7/+3
|\ \ \ \
| * | | | Replace control block frameCount_ by explicit in/out parameterGlenn Kasten2013-12-202-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in IAudioFlinger::createTrack and IAudioFlinger::openRecord Change-Id: I09c644c80e92c8e744b1b99055988a2588b2a83d
* | | | | Merge "Use uint32_t sequence numbers for IAudioRecord"Glenn Kasten2014-01-171-1/+1
|\ \ \ \ \
| * | | | | Use uint32_t sequence numbers for IAudioRecordGlenn Kasten2014-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it the same as for IAudioTrack. Previously we had a mix of int, int32_t and uint32_t, which could cause comparisons to fail. Change-Id: Ic72ef650ee81f65db11e42ed16d818fdf3e310f4
* | | | | | Merge "Document the reference count rules for I/O handles"Glenn Kasten2014-01-172-0/+15
|\ \ \ \ \ \
| * | | | | | Document the reference count rules for I/O handlesGlenn Kasten2014-01-162-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7cd27ad84bbd7bf2657011057f89386f938a807
* | | | | | | Merge "Make copy of audio_offload_info_t for future use"Glenn Kasten2014-01-171-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make copy of audio_offload_info_t for future useGlenn Kasten2014-01-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I515970aa0660418d5d1640fb1bf477e112c89bdd
generated by cgit v1.1 at 2024-05-18 06:22:58 +0000