summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio policy: session routes continued.Eric Laurent2015-04-3014-60/+214
| | | | | | | | | | | - Clear session routes when client process dies. - Enforce the route only when the requesting session is active. - Fix requested route not working if an output mix change is required (e.g forcing to SPEAKER when the default route is USB or A2DP). - Make sure all sessions sharing the strategy with a rerouted session have the same route (needed for volume control consistency) Change-Id: I0ab347a8fb97e73e2c5965374544c5f4fe509ef1
* Merge "DO NOT MERGE: The preview frame data is broken when sending via ↵Eino-Ville Talvala2015-04-281-1/+1
|\ | | | | | | Binder" into mnc-dev
| * DO NOT MERGE: The preview frame data is broken when sending via Binderdaisuke jinno2015-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | [Cause] CallbackProcessor uses always same buffer to send preview data. A buffer is written before it is read by user process. [Solution] Increment buffer index correctly. Change-Id: I87a7e3dc6546448a419c96aa58ace3b7d086bf70
* | Explicit routing in AudioRecordPaul McLean2015-04-2813-70/+193
|/ | | | 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
* | Merge "DO NOT MERGE libmediaplayerservice: set priority and operating rate ↵Ronghua Wu2015-04-279-0/+63
|\ \ | | | | | | | | | for the codec used by nuplayer." into mnc-dev
| * | DO NOT MERGE libmediaplayerservice: set priority and operating rate for the ↵Ronghua Wu2015-04-279-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | 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-274-8/+21
|/ / | | | | | | | | | | Bug: 20559813 Change-Id: If231cb44337ca7dc74c39fc3cd73e2b6f3cb85b8 (cherry picked from commit d4c1f6b4ecfef7323422359fc38bd1edb1abf205)
* | 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
| | | | | | | | | | | | | | | | | | This reverts commit 65c3781db3443531deacecfbda5c7e7e82868a34. Change-Id: Ib61cd70f97c4c4f4b503fb845643627d6896f4f9
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 01ce6a4f342b09da48414dbef49293e0107cc66e. Change-Id: I3f8f8a78ef68fa071faf422693c941c40e5e2ac2
* | | | 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
| |/ / | | | | | | | | | | | | Change-Id: Ic60be5ff8c45c4f19a58c39edbe4366a4227ca59 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a configurable version of the policy engine based on the parameter framework. This configurable engine shall be activated with a flag USE_CONFIGURABLE_AUDIO_POLICY within BoardConfig.mk This patch provides the generic configuration as an example. This configuration provides the same user experience as the default policy engine. Change-Id: Ic8217333ae370b89bfdd2ad11320c5f14ea4da34 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc related-to-bug: 18394494 related-to-bug: 19664283
* | | | MatroskaExtractor: skip track when codec id is NULL in addTracksRobert Shih2015-04-241-1/+4
| |/ / |/| | | | | | | | | | | Bug: 18872598 Change-Id: I0cdb2ffae202fc06b068c57dafae7523981b6000
* | | Merge "mediaresourcemanager: add dumpsys support."Ronghua Wu2015-04-246-0/+88
|\ \ \
| * | | mediaresourcemanager: add dumpsys support.Ronghua Wu2015-04-236-0/+88
| | | | | | | | | | | | | | | | | | | | Bug: 20233206 Change-Id: Ic253985e408b05b488e87cd5c50c0d619ac568ef
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ref counting on start/stop inputs to notify audio policy client of mix activity changes. Bug 20226914 Change-Id: Ic4f9c91301d0bcbc0ff749acebdc3b2300309c38
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 20071299 Change-Id: I932b40e46312db467fe88f8ff6cea028b63785cd
* | | | | 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
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disconnect HTTP connection when we absolutely won't resume bug: 19890444 Change-Id: Idee36b48741f6f8eb1d65bca32156e9e18349c67
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20537676 Change-Id: I0bd11527ccd022c39d94b7877df81de4da1b14a6
* | | | | | 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
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I5cfd3e1a9b4f56aaa6482facd55a22ed1e7ed3e6
* | | | | | 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 typo causing tuner open error to be ignored. Change-Id: I10735f0cf6ae64ff9c4efa2eb4b20d94d3597ae5
* | | | | | Fix format sorting order in AudioPortAndy Hung2015-04-232-12/+22
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise AUDIO_FORMAT_DEFAULT (used for dynamic formats) is no longer the first entry. Change-Id: I23869a9ca2ed138759d722e7c9838497f640921a
* | | | | Merge "MediaSync: fix the optimization code path to reduce messages posted ↵Wei Jia2015-04-231-13/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | to drain video."
| * | | | | MediaSync: fix the optimization code path to reduce messages posted to drain ↵Wei Jia2015-04-221-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | video. Bug: 19666434 Change-Id: I195a896033855ab3bfa43791b3c99f66776b007a
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia388fb012a0b6d81613ef87142a97d76836338f9
* | | | | | | Merge "Add channel index record to AudioPolicyManager"Andy Hung2015-04-222-12/+87
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Add channel index record to AudioPolicyManagerAndy Hung2015-04-222-12/+87
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Ic534bee084108a68c7818600df6e1c9dc9258a0d
* | | | | Merge "libmediaplayerservice: set priority and operating rate for the codec ↵Ronghua Wu2015-04-221-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | used by recorder."
| * | | | libmediaplayerservice: set priority and operating rate for the codec used by ↵Ronghua Wu2015-04-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recorder. Bug: 20481562 Change-Id: Ibff54395e00809500d98e3759f9677f8168c98ae
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id4bb9b973eeea16946fba3bc084c7ac270d9fa33
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mono channel playback without resampling and not using AUDIO_CHANNEL_OUT_MONO can show low frequency garbling. Bug: 20463456 Change-Id: I0c1bbf957ea439bb8d8da57b9e78938e1acb4793
* | | | | Merge "Use AudioPlaybackRate to hold TimestretchBufferProvider parameters"Ricardo Garcia2015-04-2211-136/+239
|\ \ \ \ \
| * | | | | Use AudioPlaybackRate to hold TimestretchBufferProvider parametersRicardo Garcia2015-04-2211-136/+239
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "audio policy: fix AudioTrack output device selection"Eric Laurent2015-04-224-14/+40
|\ \ \ \ \