summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "DO NOT MERGE: The preview frame data is broken when sending via Binder...Eino-Ville Talvala2015-04-281-1/+1
|\
| * DO NOT MERGE: The preview frame data is broken when sending via Binderdaisuke jinno2015-04-281-1/+1
* | Explicit routing in AudioRecordPaul McLean2015-04-2813-70/+193
|/
* Merge "HDCP: buffer over flow check" into mnc-devChong Zhang2015-04-281-2/+24
|\
| * HDCP: buffer over flow checkChong Zhang2015-04-271-2/+24
* | Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate fo...Ronghua Wu2015-04-279-0/+63
|\ \
| * | DO NOT MERGE libmediaplayerservice: set priority and operating rate for the c...Ronghua Wu2015-04-279-0/+63
* | | DO NOT MERGE libmedia: add sub resource type audio-codec and video-codec.Ronghua Wu2015-04-274-8/+21
|/ /
* | Merge "Revert "Add a configurable version of the policy engine based on PFW""Eric Laurent2015-04-2564-9242/+2
|\ \
| * | Revert "Add a configurable version of the policy engine based on PFW"Eric Laurent2015-04-2564-9242/+2
* | | Merge "Revert "Fix M Issue on configurable policy engine version.""Eric Laurent2015-04-257-29/+38
|\ \ \
| * | | Revert "Fix M Issue on configurable policy engine version."Eric Laurent2015-04-257-29/+38
* | | | Merge "Fix M Issue on configurable policy engine version."Eric Laurent2015-04-257-38/+29
|\ \ \ \ | |/ / /
| * | | Fix M Issue on configurable policy engine version.François Gaffie2015-04-247-38/+29
| |/ /
* | | Merge "Add a configurable version of the policy engine based on PFW"Eric Laurent2015-04-2564-2/+9242
|\ \ \ | |/ /
| * | Add a configurable version of the policy engine based on PFWFrançois Gaffie2015-04-2464-2/+9242
* | | Merge "Lock drm plugin API calls globally, not per MediaDrm instance"Jeff Tinker2015-04-252-1/+2
|\ \ \
| * | | Lock drm plugin API calls globally, not per MediaDrm instanceJeff Tinker2015-04-222-1/+2
* | | | MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-241-1/+4
| |/ / |/| |
* | | Merge "mediaresourcemanager: add dumpsys support."Ronghua Wu2015-04-246-0/+88
|\ \ \
| * | | mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-236-0/+88
* | | | Merge "AudioPolicyManager: notification of dynamic policy mix activity (input)"Jean-Michel Trivi2015-04-241-0/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | AudioPolicyManager: notification of dynamic policy mix activity (input)Jean-Michel Trivi2015-04-211-0/+13
* | | | Merge "MediaCodec: ignore error when linkToDeath to batterystats"Chong Zhang2015-04-241-8/+5
|\ \ \ \
| * | | | MediaCodec: ignore error when linkToDeath to batterystatsChong Zhang2015-04-241-8/+5
* | | | | Merge "HLS: make disconnect faster to prevent ANR"Chong Zhang2015-04-248-330/+510
|\ \ \ \ \
| * | | | | HLS: make disconnect faster to prevent ANRChong Zhang2015-04-238-330/+510
| |/ / / /
* | | | | Merge "Copy sei offset/size during ABuffer/MediaBuffer conversion"Robert Shih2015-04-243-0/+16
|\ \ \ \ \
| * | | | | Copy sei offset/size during ABuffer/MediaBuffer conversionRobert Shih2015-04-233-0/+16
* | | | | | Merge "MediaSync: allow users to query play time for pending audio frames."Wei Jia2015-04-242-0/+39
|\ \ \ \ \ \
| * | | | | | MediaSync: allow users to query play time for pending audio frames.Wei Jia2015-04-232-0/+39
| | |_|_|/ / | |/| | | |
* | | | | | Merge "RadioService: fix error handling in attach()."Eric Laurent2015-04-241-4/+3
|\ \ \ \ \ \
| * | | | | | RadioService: fix error handling in attach().Eric Laurent2015-04-231-4/+3
| |/ / / / /
* | | | | | Fix format sorting order in AudioPortAndy Hung2015-04-232-12/+22
|/ / / / /
* | | | | Merge "MediaSync: fix the optimization code path to reduce messages posted to...Wei Jia2015-04-231-13/+29
|\ \ \ \ \
| * | | | | MediaSync: fix the optimization code path to reduce messages posted to drain ...Wei Jia2015-04-221-13/+29
* | | | | | Merge "Add floating and multichannel record to AudioFlinger"Andy Hung2015-04-224-80/+162
|\ \ \ \ \ \
| * | | | | | Add floating and multichannel record to AudioFlingerAndy Hung2015-04-224-80/+162
* | | | | | | Merge "Add channel index record to AudioPolicyManager"Andy Hung2015-04-222-12/+87
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Add channel index record to AudioPolicyManagerAndy Hung2015-04-222-12/+87
| | |/ / / | |/| | |
* | | | | Merge "libmediaplayerservice: set priority and operating rate for the codec u...Ronghua Wu2015-04-221-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | libmediaplayerservice: set priority and operating rate for the codec used by ...Ronghua Wu2015-04-221-0/+6
* | | | | Merge "Make record buffer in RecordThread variable format"Andy Hung2015-04-222-9/+9
|\ \ \ \ \
| * | | | | Make record buffer in RecordThread variable formatAndy Hung2015-04-212-9/+9
* | | | | | Merge "Fix single channel playback that does not use AUDIO_CHANNEL_OUT_MONO"Andy Hung2015-04-221-2/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Fix single channel playback that does not use AUDIO_CHANNEL_OUT_MONOAndy Hung2015-04-211-2/+3
* | | | | Merge "Use AudioPlaybackRate to hold TimestretchBufferProvider parameters"Ricardo Garcia2015-04-2211-136/+239
|\ \ \ \ \
| * | | | | Use AudioPlaybackRate to hold TimestretchBufferProvider parametersRicardo Garcia2015-04-2211-136/+239
| | |_|/ / | |/| | |
* | | | | Merge "audio policy: fix AudioTrack output device selection"Eric Laurent2015-04-224-14/+40
|\ \ \ \ \
| * | | | | audio policy: fix AudioTrack output device selectionEric Laurent2015-04-224-14/+40