summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Fix type of AudioTrack/AudioRecord parameter frameCountGlenn Kasten2014-02-282-5/+5
| | | | | | It's size_t consistently Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
* Fix type of AudioTrack/AudioRecord parameter notificationFramesGlenn Kasten2014-02-282-5/+5
| | | | | | It's uint32_t consistently Change-Id: If8298c7e9aeea2b951fe47b675adbdf48d104846
* Merge "Simplify and cleanup error handling in AudioRecord::getMinFrameCount"Glenn Kasten2014-02-251-0/+1
|\
| * Simplify and cleanup error handling in AudioRecord::getMinFrameCountGlenn Kasten2014-02-251-0/+1
| | | | | | | | Change-Id: I8721ecedfb429c4e233453d1e768ddf69ecabbe4
* | Merge "Add method to get redirected Uri"Marco Nelissen2014-02-241-0/+1
|\ \ | |/ |/|
| * Add method to get redirected UriMarco Nelissen2014-02-211-0/+1
| | | | | | | | Change-Id: Id8aac1077c3de1bb1f58bfcfcca93d685abe9b79
* | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-222-0/+4
|\ \ | |/ |/|
| * support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-142-0/+4
| | | | | | | | | | Bug: 13032650 Change-Id: Iecbadf9f29c8c49353416fc467fb3acdde279595
* | Merge "Handle recording failure more gracefully."Ruben Brunk2014-02-191-1/+1
|\ \
| * | Handle recording failure more gracefully.Ruben Brunk2014-02-181-1/+1
| | | | | | | | | | | | | | | Bug: 13027666 Change-Id: Iec8239bfcd293c8f466b3780e69883b97f387949
* | | Add private method NBLog::Reader::dumpLine()Glenn Kasten2014-02-181-0/+6
| | | | | | | | | | | | | | | | | | | | | This allows us to abstract out fdprintf vs ALOGI so that callers don't need an 'if' at every location. Change-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8
* | | 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
generated by cgit v1.1 at 2024-05-17 06:42:26 +0000