summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* Explicit routing in AudioRecordPaul McLean2015-04-283-7/+30
| | | | Change-Id: I9cc5d54883a3e5c75d553fabb619fc8e49f4f9e5
* Merge "HDCP: buffer over flow check" into mnc-devChong Zhang2015-04-281-2/+24
|\
| * HDCP: buffer over flow checkChong Zhang2015-04-271-2/+24
| | | | | | | | | | bug: 20222489 Change-Id: I3a64a5999d68ea243d187f12ec7717b7f26d93a3
* | DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.Ronghua Wu2015-04-271-0/+2
| | | | | | | | | | | | Bug: 20559813 Change-Id: If231cb44337ca7dc74c39fc3cd73e2b6f3cb85b8 (cherry picked from commit d4c1f6b4ecfef7323422359fc38bd1edb1abf205)
* | mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-231-0/+20
|/ | | | | Bug: 20233206 Change-Id: Ic253985e408b05b488e87cd5c50c0d619ac568ef
* Merge "Use AudioPlaybackRate to hold TimestretchBufferProvider parameters"Ricardo Garcia2015-04-222-30/+35
|\
| * Use AudioPlaybackRate to hold TimestretchBufferProvider parametersRicardo Garcia2015-04-222-30/+35
| | | | | | | | | | | | | | | | Use this struct to handle the parameters for TimestretchBufferProvider all across the system. Add stretch mode and fallback mode to TimestretchBuffer Provider. Change-Id: I19099924a7003c62e48bb6ead56c785cb129fba2
* | audio policy: fix AudioTrack output device selectionEric Laurent2015-04-221-3/+2
|/ | | | | | | | | | | | | | Have AudioTrack::setOutputDevice() set CBLK_INVALID flag instead of calling restoreTrack_l(). This allows restoreTrack_l() to be called in a safe context. Allow device change while the AudioTrack is active by forcing a new device selection in startOutput() if the output route for this session was changed. Remove some warnings. Change-Id: I2d921a63c9bfa0e122233645e2d6d39f95f5f17d
* libmedia: fix all warning, make warnings errors, use clangLajos Molnar2015-04-1712-16/+16
| | | | Change-Id: Ic00d2c5d0bbb1605e96666e25c9ccc22bea6d3ff
* stagefright: initial timed id3 support in hlsRobert Shih2015-04-161-0/+3
| | | | Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
* Merge "Work around lack of pitch adjustment in Timestretcher"Andy Hung2015-04-161-12/+40
|\
| * Work around lack of pitch adjustment in TimestretcherAndy Hung2015-04-161-12/+40
| | | | | | | | Change-Id: I3e057b97c250a826133248b6aa1ff9ed677d88df
* | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-166-0/+173
|\ \
| * | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-156-0/+173
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to implement MediaDataSource, which is modeled on stagefright's DataSource, to supply media data to the framework. This was already implemented for MediaExtractor, but it was renamed from DataSource. MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new overload: #setDataSource(android.media.MediaDataSource) Only NuPlayer supports this new data source. The change introduces: * IDataSource: The binder interface for DataSource. * JMediaDataSource: The native counterpart to the java interface. It implements IDataSource. * CallbackDataSource: A stagefright DataSource that wraps an IDataSource. Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
* | audio policy: add binder calls for audio source controlEric Laurent2015-04-152-0/+75
| | | | | | | | | | | | | | Add binder methods to IAudioPolicyService to control activity of external audio sources (e.g FM tuner). Change-Id: I2008308a6a996baeae502b68a790d87281efe2ff
* | Merge "AudioPolicyManager: notification of dynamic policy mix activity"Jean-Michel Trivi2015-04-153-1/+26
|\ \ | |/ |/|
| * AudioPolicyManager: notification of dynamic policy mix activityJean-Michel Trivi2015-04-143-1/+26
| | | | | | | | | | | | | | | | | | | | Implement non-stream type specific ref counting in output descriptors to keep track of mix activity. Notify audio policy client of mix activity changes. Bug 20226914 Change-Id: Iec939cb640c58056f88947b611d23b4bb6d8a11b
* | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack"Glenn Kasten2015-04-142-2/+14
|\ \
| * | AudioRecord::obtainBuffer() can return nonContig like AudioTrackGlenn Kasten2015-04-132-2/+14
| | | | | | | | | | | | | | | | | | And fix error handling in both AudioRecord and AudioTrack. Change-Id: I4853d736cc6d2c05de5b18b0eac62716edfa62ec
* | | media: handle overrides and measure max codec instance.Ronghua Wu2015-04-132-0/+39
| | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I68d5919284700f37ccc6c6b9f96cd87ccdd40e6a
* | | Merge "Add a method to associate MediaDrm session with MediaCrypto"Jeff Tinker2015-04-101-0/+42
|\ \ \
| * | | Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-101-0/+42
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, to associate a MediaDrm session with MediaCrypto, the MediaDrm sessionId was passed as initData to the MediaCrypto constructor. This is not ideal for two reasons: it's pretty obscure and you can't change the association without tearing down the MediaCodec/MediaCrypto and starting all over. Use cases like key rotation require being able to update the MediaDrm session post-construction. This CL addresses both of these issues. bug: 19570317 Change-Id: Ieb32d04d61742fc1dee2105dd904690d44c46c7b
* | | Merge "Add playback rate to AudioTrack"Andy Hung2015-04-102-15/+128
|\ \ \ | |/ / |/| |
| * | Add playback rate to AudioTrackAndy Hung2015-04-092-15/+128
| | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I6411e1d3ce652b711a71a6d9df020cb5f60d4714
* | | Merge "Pass crypto source data using a shared buffer"Jeff Tinker2015-04-091-9/+15
|\ \ \ | |/ / |/| |
| * | Pass crypto source data using a shared bufferJeff Tinker2015-04-081-9/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec was using a binder transaction buffer to pass encryption source data for protected content. On some 4K content, the max binder transaction buffer size was being exceeded. This change uses a shared buffer for the encryption source data instead of a binder transaction buffer, which avoids the problem and may be more efficient. bug: 20027687 Change-Id: I36a24ebf600d7e1064b78e48b167fdc29b2c65e9
* | Enable 8 bit and float pcm record formats for AudioFlingerAndy Hung2015-04-081-7/+3
| | | | | | | | | | | | | | Update sampling rate handling as well. Bug: 19570772 Change-Id: I872248e64c0578b2e48869a68fee0d51bd0640c3
* | Adding explicit routing API to AudioTrackPaul McLean2015-04-083-9/+32
|/ | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
* Merge "HLS: misc bug fixes"Chong Zhang2015-04-031-0/+3
|\
| * HLS: misc bug fixesChong Zhang2015-04-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix no target-duration case - fix for audio-only <=> audio/video switching - disable audio-only variants if there is at least one variant with video - fix mpeg2ts PTS wraparound when bandwidth adapting - tweak up/down switch marks bug: 19567254 Change-Id: Ib46144203c56dfc96eccd6ddaa3867e8a4f2c6a9
* | IAudioFlinger: add checks on binder callsEric Laurent2015-04-021-10/+36
| | | | | | | | | | | | | | | | | | | | Limit number of ports and patches listed by LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS. Also fix typo causing wrong pointer to be used when writing to Parcel. Bug: 19573085. Change-Id: I41a9c710e45738a4f11990160587856c429a4646
* | audio port: support multiple clientsEric Laurent2015-04-011-23/+68
| | | | | | | | | | | | Add support for more than one audio port callback client per process. Change-Id: I657c4fc28d5d2d993307551e3e69567dc60196cb
* | Reject sample rate changes for fast tracksAndy Hung2015-03-311-3/+7
|/ | | | | | | This is needed for a SoundPool fix. Bug: 19970735 Change-Id: I46b69e059aabf0d06b16b31ea436bb71f7146750
* Merge "AudioRecord TRANSFER_OBTAIN can be used with FAST flag"Glenn Kasten2015-03-241-3/+6
|\
| * AudioRecord TRANSFER_OBTAIN can be used with FAST flagGlenn Kasten2015-03-231-3/+6
| | | | | | | | Change-Id: I001ba1a88150dddf79d99baf5927f31799745eef
* | Merge "AudioRecord::read() can be non-blocking to match AudioTrack"Glenn Kasten2015-03-241-2/+3
|\ \
| * | AudioRecord::read() can be non-blocking to match AudioTrackGlenn Kasten2015-03-231-2/+3
| |/ | | | | | | Change-Id: I23b9466b81ab6037d0bccd5e6f5974b7bd4aeacb
* | Merge "set() in AudioRecord and AudioTracks needs no lock"Glenn Kasten2015-03-242-4/+2
|\ \
| * | set() in AudioRecord and AudioTracks needs no lockGlenn Kasten2015-03-232-4/+2
| |/ | | | | | | Change-Id: I9d61b3d117e9b21fbbfad772d8981a5abb8fafae
* | Merge "media: add ResourceManagerService"Ronghua Wu2015-03-245-0/+357
|\ \
| * | media: add ResourceManagerServiceRonghua Wu2015-03-235-0/+357
| | | | | | | | | | | | | | | Bug: 19620911 Change-Id: Iea173d310d31781bc50effe3d9bd6553cb5139eb
* | | Merge "Report key request message type for unprefixed EME"Jeff Tinker2015-03-241-5/+9
|\ \ \ | |_|/ |/| |
| * | Report key request message type for unprefixed EMEJeff Tinker2015-03-161-5/+9
| | | | | | | | | | | | | | | bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
* | | LoggingGlenn Kasten2015-03-232-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move log of latency to where it is first computed. Log more parameters when a fast track is denied by client. Log session ID in destructor. Remove obsolete ALOGV that were for debugging a particular problem. Log more parameters of set(). Change-Id: I0156bceaf397f2faa053214572c57136705685ee
* | | Merge "Fix position when restoring streaming audio track"Andy Hung2015-03-231-1/+1
|\ \ \
| * | | Fix position when restoring streaming audio trackAndy Hung2015-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 19802225 Change-Id: I19ca7836bc89627f6cead4961641b94c6b27b5f6
* | | | Update AudioTrack code to match AudioRecordGlenn Kasten2015-03-231-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | session ID check buffer error code check Change-Id: I092a61adfd249122f9127dceedf67c0a3bdcfe7b
* | | | AudioRecord::releaseBuffer() buffer is const *, like AudioTrackGlenn Kasten2015-03-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: If09689a8411392281ad06fcf781f3198941c642d
* | | | Deprecate AudioRecord::getInput() and AudioTrack::getOutput()Glenn Kasten2015-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not completely fix the bug, but is a step in the right direction. Bug: 12593118 Change-Id: Id591cd700ab58fd927ae44c71c81dac55b5cac2d
* | | | namespace does not need a closing semicolonGlenn Kasten2015-03-2331-31/+31
| | | | | | | | | | | | | | | | Change-Id: Ie8f9d42fc061f6d558f23b98414e04eb3d14b376