summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* AudioFlinger: update openInput() and openOutput()Eric Laurent2014-07-2811-504/+564
| | | | | | | | | | Add parameters to openInput() and openOutput(): device address, input source. Allow caller to specify a given I/O handle Group parameters in a struct audio_config. Bug: 12378680. Change-Id: I7e9af74c0d996561cc13cbee7d9012d2daf33025
* Merge "audio policy: compatible sample rates and channel masks" into lmp-devGlenn Kasten2014-07-242-43/+162
|\
| * audio policy: compatible sample rates and channel masksGlenn Kasten2014-07-272-43/+162
| | | | | | | | Change-Id: I50d068a968aa6bd9e53e5b3111a1b09a6c2d219c
* | audiopolicy: fix output audio format selectionEric Laurent2014-07-271-2/+2
|/ | | | | | | | Fix two problems in output stream audio format selection added by commit 1e693b55: - flags must be set before picking the format. - fix logic error in best format selection. Change-Id: I6458b32725f771da5a08108932d64e71964ae9f1
* AudioPolicyManager: handle outputs for different addressesJean-Michel Trivi2014-07-272-29/+120
| | | | | | | | | | | | | | Add the notion of device types that cause the device address to be taken into account, i.e. multiple devices of the same type but with a different address can be connected/ disconnected. AUDIO_DEVICE_OUT_REMOTE_SUBMIX is such a device type. When making those devices available / unavailable, look for all outputs with a matching address. Bug 16009464 Change-Id: I260f8248b7794c4932094e876afdf29fdea007a3
* stagefright: add flexible YUV supportLajos Molnar2014-07-253-0/+119
| | | | | Bug: 10706245 Change-Id: Icd246f22edfc67ed5240d59f5a5bde3e5f749465
* stagefright: add ABuffer.CreateAsCopyLajos Molnar2014-07-252-0/+11
| | | | | Bug: 10706245 Change-Id: I8c4e96a2581a039e9e8237c3e09e2c22226da055
* Merge "DNG: Clean up logging." into lmp-devRuben Brunk2014-07-252-7/+11
|\
| * DNG: Clean up logging.Ruben Brunk2014-07-252-7/+11
| | | | | | | | Change-Id: Ie34d5a22c89a726215d740fef359d53e5a1a360b
* | Merge "NuPlayer: timed text support" into lmp-devRobert Shih2014-07-254-0/+78
|\ \
| * | NuPlayer: timed text supportRobert Shih2014-07-254-0/+78
| | | | | | | | | | | | | | | Bug: 16385674 Change-Id: Ifa9fbc17a1276aa774d57b82cdce500876a0b543
* | | Merge "CamcorderProfiles: add high speed profile constants" into lmp-devZhijun He2014-07-242-2/+24
|\ \ \
| * | | CamcorderProfiles: add high speed profile constantsZhijun He2014-07-232-2/+24
| | | | | | | | | | | | | | | | Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
* | | | Merge "Add multichannel capability to AudioFlinger" into lmp-devAndy Hung2014-07-247-34/+111
|\ \ \ \
| * | | | Add multichannel capability to AudioFlingerAndy Hung2014-07-247-34/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But not enabled (kEnableExtendedChannels == false). Change-Id: I62f7e31fbd29ad703a9a02f5d1a280b6972dd423
* | | | | Merge "Add multichannel capability to AudioMixer" into lmp-devAndy Hung2014-07-246-175/+420
|\ \ \ \ \ | |/ / / /
| * | | | Add multichannel capability to AudioMixerAndy Hung2014-07-246-175/+420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests/test-mixer updated to handle multichannel. New mixer path is still disabled (kUseNewMixer = false). Subsequent CL will enable multichannel capability. Change-Id: I71dafa94cc1d9af567c285e0ded7c5c94e3ff926
* | | | | Merge "audio policy: clean up checking for active input" into lmp-devGlenn Kasten2014-07-241-14/+18
|\ \ \ \ \
| * | | | | audio policy: clean up checking for active inputGlenn Kasten2014-07-241-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85cc089df32e6d469e8aef307599f1021ea5b835
* | | | | | Merge "-Making sure mAudioCommands list is empty before going to sleep. ↵Ricardo Garcia2014-07-241-5/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | -Wake_lock release before sleeping or quitting threadLoop()." into lmp-dev
| * | | | | | -Making sure mAudioCommands list is empty before going to sleep.Ricardo Garcia2014-07-241-5/+7
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wake_lock release before sleeping or quitting threadLoop(). Change-Id: Icab53d7984a3ba3eaf13e514667b4d60f40cbcd6
* | | | | | Merge "audio policy: add audio_input_flags_t and mOpenRefCount" into lmp-devGlenn Kasten2014-07-244-28/+58
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | audio policy: add audio_input_flags_t and mOpenRefCountGlenn Kasten2014-07-244-28/+58
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f9c7b5ebf03b9bc94efe70d3677edfabb99c194
* | | | | | Merge "reset battery stats when media player service is started" into lmp-devChong Zhang2014-07-241-0/+15
|\ \ \ \ \ \
| * | | | | | reset battery stats when media player service is startedChong Zhang2014-07-231-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12979595 Change-Id: Ia800de3e65ed4dec8334c6fde566edab12d23c42
* | | | | | | Merge "StagefrightRecorder: check for WEBM format instead of MP4" into lmp-devRobert Shih2014-07-241-5/+5
|\ \ \ \ \ \ \
| * | | | | | | StagefrightRecorder: check for WEBM format instead of MP4Robert Shih2014-07-241-5/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16544665 Change-Id: Idc45bd4cafc65a11132d10fdf21f8439e186f35f
* | | | | | | Merge "signal mFrameAvailableCondition when AudioSource is stopped" into lmp-devChong Zhang2014-07-241-0/+2
|\ \ \ \ \ \ \
| * | | | | | | signal mFrameAvailableCondition when AudioSource is stoppedChong Zhang2014-07-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows last read() to exit properly, otherwise it could get stuck waiting for the condition forever. Bug: 15849309 Change-Id: I79bba53630e59783a5fc041cfc5d3fdb2545cc2c
| * | | | | | | Fix initial audio glitch on startupAndy Hung2014-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also happens when restarting AudioFlinger. Bug: 16322824 Change-Id: I382b20174cb0639e04316130141f2094d7dd0cb3
* | | | | | | | Merge "Camera3: tear down Camera3 streams when they are deleted." into lmp-devZhijun He2014-07-245-2/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera3: tear down Camera3 streams when they are deleted.Zhijun He2014-07-245-2/+21
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also override the disconnectLocked method in Camera3ZslStream to make sure the Camera3ZslStream specific buffer queue is cleaned up properly. Also revert 0be123df1897fd3fe1b7ba30f24d8ae4c91b4dc7, as it was not the right fix. Change-Id: I89bdcb2e206379ae1f2602421e7fdbcde9a31399
* | | | | | | | Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15765976 (cherry picked from commit 56687f7cbf0a3d7909830fc1390a98c713a05e6f) Change-Id: Iacb225584c3acdbb512f46b638a215b75b32cdcb
* | | | | | | Reset the value for Vector of pointers.Wei Jia2014-07-241-0/+6
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 16467066 Change-Id: I3674e07779a59f4d4fa639d066ed1988df89b3f5
* | | | | | audio flinger: add patch connection between hw modulesEric Laurent2014-07-2412-233/+890
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for audio device connections between different audio hw modules. The patch is performed by creating a bridge between the playback thread connected to the sink device and the record thread connected to the source device using a pair of specialized PlaybackTrack and RecordTrack. - Added PatchTrack and PatchRecord classes. - Added TrackBase type to indicate more clearly the track behavior. - A TrackBase can allocate the buffer or reuse an existing one. - Factored some code in openOutput() and openInput() for internal use by PatchPanel. Bug: 14815883. Change-Id: Ib9515fcda864610458a4bc81fa8f59096ff4d7db
* | | | | audio policy: remove redundant fixed volume managementEric Laurent2014-07-231-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code handling fixed device volume in AudioPolicyManager::computeVolume() as this is already managed by AudioService. Change-Id: Ib2be7578e40652c85a7d44c685ff9cc703d0c969
* | | | | Merge "NuPlayer: save thread id in MediaPlayer::start" into lmp-devChong Zhang2014-07-231-9/+18
|\ \ \ \ \
| * | | | | NuPlayer: save thread id in MediaPlayer::startChong Zhang2014-07-231-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that when MediaPlayer::notify is called from within start, it doesn't try to lock itself again. Bug: 15323063 Change-Id: Idd77e892cd22538bbfe3e65c64c9dd2a216a0aee
* | | | | | Merge "Fix multichannel integer resampling and add tests" into lmp-devAndy Hung2014-07-232-35/+111
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix multichannel integer resampling and add testsAndy Hung2014-07-212-35/+111
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I384bf8317d4f03616bf9f2b458a8700965d5cf56
* | | | | | Hook up querying of VP8 temporal layering support.Wei Jia2014-07-231-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14562236 Change-Id: I0ec5866173f7fb84dd3f79b588d1b35b523ca08a
* | | | | | Merge "MediaRecorder: constants for webm recordering" into lmp-devLajos Molnar2014-07-221-0/+5
|\ \ \ \ \ \
| * | | | | | MediaRecorder: constants for webm recorderingRobert Shih2014-07-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16329805 Change-Id: Idcd603545352e36a88589d3e23ccf1ee37704695
* | | | | | | Merge "GenericSource: support track (de)selection" into lmp-devRobert Shih2014-07-224-67/+322
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | GenericSource: support track (de)selectionRobert Shih2014-07-224-67/+322
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 15153976 Change-Id: I522b1f9f0ffedf4edbea03a6654a6dbc0262860a
* | | | | | Merge "StagefrightRecorder: webm (video only) support" into lmp-devRobert Shih2014-07-225-33/+55
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | StagefrightRecorder: webm (video only) supportRobert Shih2014-07-225-33/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16329805 Change-Id: I8a0ecd100fca397add97a1416125bcc6aeb86364
* | | | | | Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-devRobert Shih2014-07-223-10/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MediaWriter: make get/setStartTimeOffsetMs virtualRobert Shih2014-07-173-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16329805 Change-Id: Ib971dd95b54829438c8af97528f9e00b87ab3f1e
* | | | | | Fall back to s/w decoding when audio offloading fails.Wei Jia2014-07-223-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icde3d65c964b2a13fb1c6636adcce52ae048a3fb