summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* Miscellaneous cleanup for NBAIOGlenn Kasten2014-03-071-1/+2
| | | | | | | | Finish removing Format_frameBitShift Fix type of mFrameSize Add FIXME Change-Id: I02039b97cb93af1a180e88f6575210bd752faf20
* NBAIO::Format_from_SR_C requires audio_format_t parameterGlenn Kasten2014-03-071-3/+2
| | | | Change-Id: I4b65f6ed2f6ca3608b3a5f88f52a93af0b9b1f4a
* Merge "Remove Format_frameBitShift()"Glenn Kasten2014-03-072-7/+0
|\
| * Remove Format_frameBitShift()Glenn Kasten2014-03-062-7/+0
| | | | | | | | Change-Id: Iae2e80a7330c5dd0f70a263051aa44c23cfe3541
* | Merge "Split mPacked into 4 separate fields"Glenn Kasten2014-03-061-1/+4
|\ \ | |/
| * Split mPacked into 4 separate fieldsGlenn Kasten2014-03-061-1/+4
| | | | | | | | Change-Id: I940324dce9b51fd8d7e2e362e12ad74b70e658dd
* | Merge "Add format parameter to Format_from_SR_C"Glenn Kasten2014-03-061-2/+4
|\ \ | |/
| * Add format parameter to Format_from_SR_CGlenn Kasten2014-03-061-2/+4
| | | | | | | | Change-Id: I891138b7754342fe2a4f02de30ee616dbd078474
* | Merge "Use mFrameSize instead of mBitShift"Glenn Kasten2014-03-062-2/+2
|\ \ | |/
| * Use mFrameSize instead of mBitShiftGlenn Kasten2014-03-062-2/+2
| | | | | | | | Change-Id: Idac335ae70cc9300bb3325839fe8ef1e9e097245
* | Merge "AudioTrack: When paused, return cached playback position"Eric Laurent2014-03-061-0/+1
|\ \ | |/ |/|
| * AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | An offload output can be re-used between two audio tracks having the same configuration. A timestamp query for a paused track while the other is running would return an incorrect time. To fix this, cache the playback position on a pause() and return this time when requested until the track is resumed. Bug: 12826612. Change-Id: I324112ea9827e52fff53ef44cd8513c8d85a0bc4
* | Add mFrameSize but do not remove mFrameBitShift yetGlenn Kasten2014-03-062-1/+4
|/ | | | Change-Id: Icb1edefeb6a0e659503f6b7a92c9d15784df9865
* Merge "Opus Matroska support in OpenMax"Lajos Molnar2014-03-042-0/+4
|\
| * Opus Matroska support in OpenMaxVignesh Venkatasubramanian2014-03-032-0/+4
| | | | | | | | | | | | | | | | Adding Openmax component for libopus software decoder. This can decode opus audio files embedded in matroska containers. Change-Id: I7e0691cfc6d719c4e927b9efbd05a3143be49abc Note: This CL is part of adding Opus support to Android.
* | Rename setStreamOutput to invalidateStreamGlenn Kasten2014-02-281-1/+1
| | | | | | | | | | | | And simplify by removing the unused I/O handle parameter 'output'. Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
* | 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
generated by cgit v1.1 at 2025-01-25 01:22:27 +0000