summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Explicit routing in AudioRecordPaul McLean2015-04-284-8/+24
| | | | Change-Id: I9cc5d54883a3e5c75d553fabb619fc8e49f4f9e5
* Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate ↵Ronghua Wu2015-04-271-0/+1
|\ | | | | | | for the codec used by nuplayer." into mnc-dev
| * DO NOT MERGE libmediaplayerservice: set priority and operating rate for the ↵Ronghua Wu2015-04-271-0/+1
| | | | | | | | | | | | | | | | codec used by nuplayer. Bug: 20481562 Change-Id: I9806414962352fbcda726f8274f1cd348c961de0 (cherry picked from commit f19f5d716b39a5d9dc1abdcd5a16a7aaf1b1ab8b)
* | DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.Ronghua Wu2015-04-272-1/+3
|/ | | | | | Bug: 20559813 Change-Id: If231cb44337ca7dc74c39fc3cd73e2b6f3cb85b8 (cherry picked from commit d4c1f6b4ecfef7323422359fc38bd1edb1abf205)
* Merge "mediaresourcemanager: add dumpsys support."Ronghua Wu2015-04-241-0/+2
|\
| * mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-231-0/+2
| | | | | | | | | | Bug: 20233206 Change-Id: Ic253985e408b05b488e87cd5c50c0d619ac568ef
* | Merge "Copy sei offset/size during ABuffer/MediaBuffer conversion"Robert Shih2015-04-241-0/+3
|\ \
| * | Copy sei offset/size during ABuffer/MediaBuffer conversionRobert Shih2015-04-231-0/+3
| |/ | | | | | | | | Bug: 20537676 Change-Id: I0bd11527ccd022c39d94b7877df81de4da1b14a6
* | MediaSync: allow users to query play time for pending audio frames.Wei Jia2015-04-231-0/+3
|/ | | | | Bug: 19666434 Change-Id: I5cfd3e1a9b4f56aaa6482facd55a22ed1e7ed3e6
* Use AudioPlaybackRate to hold TimestretchBufferProvider parametersRicardo Garcia2015-04-223-26/+86
| | | | | | | | 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
* Merge "HLS: reduce number of guessed wrong seq numbers"Chong Zhang2015-04-181-1/+1
|\
| * HLS: reduce number of guessed wrong seq numbersChong Zhang2015-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - account for playlist age in live streaming when calculating segment time - be more conservative on downswitching if bandwidth is unstable - adjust forward or backward if guessed wrong seq number - code refactor bug: 19567254 Change-Id: I0b61cea888fdffd1b3ee2446747ed10152e9e7d7
* | libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-175-5/+5
| | | | | | | | Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
* | stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-1717-32/+32
|/ | | | Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
* stagefright: initial timed id3 support in hlsRobert Shih2015-04-162-0/+3
| | | | Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
* MediaCodec: hold input buffers during FLUSHED stateChong Zhang2015-04-161-0/+1
| | | | | bug: 20267388 Change-Id: I21a12cb2ebb74e17dcdb7b502c3f674e9e64b5dc
* Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-168-3/+83
|\
| * Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-158-3/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+11
| | | | | | | | | | | | | | 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-2/+12
|\ \
| * | AudioPolicyManager: notification of dynamic policy mix activityJean-Michel Trivi2015-04-143-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Camera2: Add prepare for output streams"Eino-Ville Talvala2015-04-152-0/+8
|\ \ \
| * | | Camera2: Add prepare for output streamsEino-Ville Talvala2015-04-152-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The prepare call asynchronously pre-allocates buffers for a given output stream, and then fires the onPrepared callback. Not implemented for Camera2Device or used in Camera2Client. Change-Id: I1cccdfff846dd6985133c591dbdceed823929ade
* | | Merge "Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum.""Ronghua Wu2015-04-151-7/+1
|\ \ \
| * | | Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."Ronghua Wu2015-04-141-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ea20d117ef9b4e867ec3982c7d070e719617ba2f. Change-Id: Ia77448a81429814e6915eca9c1cd854ca0e623cc
* | | | Merge "media: use ResourceManagerService with MediaCodec"Ronghua Wu2015-04-151-0/+38
|\ \ \ \
| * | | | media: use ResourceManagerService with MediaCodecRonghua Wu2015-04-141-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I235a97e5195b28645b7834dda0dd77307d93f4a8
* | | | | Merge "HLS: parse stream resolution and set maxWidth/maxHeight"Chong Zhang2015-04-151-0/+2
|\ \ \ \ \
| * | | | | HLS: parse stream resolution and set maxWidth/maxHeightChong Zhang2015-04-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 20160436 Change-Id: Ic3adb84d3c65cc65f62fc509a99d09602db862a1
* | | | | | Merge "stagefright: metadata retriever changes for capture fps"Chong Zhang2015-04-142-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | stagefright: metadata retriever changes for capture fpsChong Zhang2015-04-132-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | bug: 19460202 Change-Id: I20afded0b7eec45b2f25b51cf59d9f48eada74d8
* | | | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-142-0/+14
|\ \ \ \ \
| * | | | | camera2: add reprocess supportChien-Yu Chen2015-04-132-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to create input stream, submit reprocess capture requests, and receive reprocess capture results. Change-Id: Iee2d4313f3d52616a484eaea7a28f5ef9d8a674b
* | | | | | Merge "AudioRecord::obtainBuffer() can return nonContig like AudioTrack"Glenn Kasten2015-04-141-2/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | AudioRecord::obtainBuffer() can return nonContig like AudioTrackGlenn Kasten2015-04-131-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix error handling in both AudioRecord and AudioTrack. Change-Id: I4853d736cc6d2c05de5b18b0eac62716edfa62ec
* | | | | | media: handle overrides and measure max codec instance.Ronghua Wu2015-04-133-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I68d5919284700f37ccc6c6b9f96cd87ccdd40e6a
* | | | | | Merge "libstagefright: parse global settings from codec xml file."Ronghua Wu2015-04-141-0/+3
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | libstagefright: parse global settings from codec xml file.Ronghua Wu2015-04-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also parse a new codec limit "max-supported-instances". Bug: 19620911 Change-Id: I6574c168b0c2b1aa649883958d3073edc01a4a03
* | | | | | mediaplayer: support async mode for widevine legacy modeLajos Molnar2015-04-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: Id224eb8c31ec148ca9a144758cc56ddbf5465f5c
* | | | | | libstagefright: handle MediaFormat "operating-rate" key.Ronghua Wu2015-04-101-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I846d3cc10308a13f2ed92bb82ba7e8236d9c67d1
* | | | | Merge "Add a method to associate MediaDrm session with MediaCrypto"Jeff Tinker2015-04-101-0/+5
|\ \ \ \ \
| * | | | | Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-101-0/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-103-2/+65
|\ \ \ \ \
| * | | | | Add playback rate to AudioTrackAndy Hung2015-04-093-2/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I6411e1d3ce652b711a71a6d9df020cb5f60d4714
* | | | | | Merge "Add playback rate to AudioMixer"Andy Hung2015-04-101-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add playback rate to AudioMixerAndy Hung2015-04-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I42d1f90e6297cf3f1304860d1691a5dfedd4c37d
* | | | | | Merge "MediaClock: allow user to query playback rate."Wei Jia2015-04-091-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | MediaClock: allow user to query playback rate.Wei Jia2015-04-091-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I306579e481cfcf923422d50d3d5cfae045ef2227
* | | | | Merge "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."Ronghua Wu2015-04-091-1/+7
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | stagefright: define CB_CODEC_RELEASED and ReleaseReason enum.Ronghua Wu2015-04-091-1/+7
| |/ / / | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I95e257c8aea2ef218f27ffaa2e62a8f12554d824
generated by cgit v1.1 at 2024-04-28 09:23:48 +0000