summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-091-0/+1
| | | | | Bug: 17059255 Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
* Fix potential deadlock between AudioPolicyService and AudioSystemAndy Hung2014-09-081-1/+5
| | | | | Bug: 17109761 Change-Id: I315c1c5066f62b05e1c13b04fae1272b5fbce977
* Cache audio attributes when player not availableJean-Michel Trivi2014-09-051-2/+19
| | | | | | | | | | | Cache the audio attributes stored in a Parcel in the client-side MediaPlayer object if they are set through setParameter() before the server-side MediaPlayer is available. Apply them when the player is prepared. Bug 17280746 Change-Id: I72f1a7fc4e2b076fae8cbdede77a2f74e98b2a03
* Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-devMarco Nelissen2014-09-035-183/+51
|\
| * Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-025-183/+51
| | | | | | | | | | | | | | | | | | | | | | instead of media scanner. This way the java MediaMetadataRetriever API will give the same result as the media scanner. Also apply some tweaks to the encoding detector to improve handling of ISO-8859-1 tags. Bug: 16302581, 17205395 Change-Id: I1682a7a6a8bf04cffaa455044ba72dd7fd152d49
* | [AU]Sync libmedia/Android.mk modification from KLP-SproutHochi Huang2014-08-291-1/+1
|/ | | | | | Bug: 17322146 Change-Id: If29fbd87252710bd794f2e0bb270bc846380ef1d Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
* stagefright/media: add support for codec features with text valueLajos Molnar2014-08-141-0/+6
| | | | | Bug: 11990470 Change-Id: I7600d999c5f4b6821d825d25fa7e8a2bb5a80c46
* Merge "MediaCodecList: handle errors gracefully" into lmp-devLajos Molnar2014-08-121-0/+8
|\
| * MediaCodecList: handle errors gracefullyLajos Molnar2014-08-121-0/+8
| | | | | | | | | | | | | | | | | | Handle missing OMX codecs, and codecs that do not load. Fix NULL dereference when initializing codec with no type. Bug: 16907578 Bug: 16905025 Change-Id: I5d103db36ebb029d1aab03222bf6e9324beb1566
* | MediaCodecList: don't return referencesLajos Molnar2014-08-121-2/+2
|/ | | | Bug: 16905025 Change-Id: I5b42b294f0cc785b8e4dda0e82c8f8377a46f487
* Merge "Extend downsampling ratios greater than 2:1" into lmp-devAndy Hung2014-08-111-4/+4
|\
| * Extend downsampling ratios greater than 2:1Andy Hung2014-08-111-4/+4
| | | | | | | | | | | | | | | | | | Also improve robustness to choice of sampling rate or buffer size such that increasing either by 10x does not cause overflow. Bug: 12979141 Bug: 15933066 Change-Id: If7989bd745d1bee3bdf811b8b7c978543ccafb65
* | Added Tunneled video playback support to ACodecRachad2014-08-081-0/+38
|/ | | | | Bug:16132368 Change-Id: I88d2d66b8548fc203f4a2c4797196af15e56ff38
* media/playerservice: add getCodecList() to MediaPlayerServiceLajos Molnar2014-08-071-0/+15
| | | | | Bug: 11990470 Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef
* stagefright: rework media codec list and infosLajos Molnar2014-08-073-0/+418
| | | | | | | | This is in preparation of serving the codec list and codec infos from the mediaserver Bug: 11990470 Change-Id: Ib8e2708679c9ce461a4ba179974a740cdcdf2731
* AudioSystem: add API to query audio HW sync sourceEric Laurent2014-08-062-1/+25
| | | | | | | | | | | Add a method to query from the audio HAL the HW sync source used for a given audio session. Modify audio policy to select a direct output with HW sync when requested. Bug: 16132368. Change-Id: I03038f9188f2d389f8a5fd76a671854013a4513e
* Add sound trigger control by audio policyEric Laurent2014-08-052-1/+81
| | | | | | | | | | | | | | | | | Audio policy: - Added active capture indication to sound trigger service: recognition stops if concurrent capture is not supported. - Added generation of reserved I/O handle and session ID for utterance capture. Sound trigger service - Added sound model update callback handling. - Added service state callback - Simplified callback shared memory allocation. Bug: 12378680. Change-Id: Ib0292c2733e6df90fdae480633dd9953d0016ef1
* Allow device to be unprovisionedJeff Tinker2014-08-011-1/+19
| | | | | bug: 12247651 Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
* audio policy: pass session ID to capture activity methodsEric Laurent2014-07-283-13/+25
| | | | | | | | Indicate the audio session ID when calling getInput(), startInput(), stopInput(), releaseInput(). Bug: 12378680. Change-Id: I763793752f93e2f4e1445a5ab217c895af011038
* rename AudioSystem::newAudioSessionId()Eric Laurent2014-07-284-8/+8
| | | | | | | | | Rename AudioSystem::newAudioSessionId() to AudioSystem::newAudioUniqueId() as it can be used also for I/O handles. Bug: 12378680. Change-Id: I611ea3b5eb57a4b0774437f477ee87dc4ccc2cc2
* AudioFlinger: update openInput() and openOutput()Eric Laurent2014-07-281-119/+82
| | | | | | | | | | 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 "CamcorderProfiles: add high speed profile constants" into lmp-devZhijun He2014-07-241-2/+16
|\
| * CamcorderProfiles: add high speed profile constantsZhijun He2014-07-231-2/+16
| | | | | | | | Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
* | 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 "StagefrightRecorder: webm (video only) support" into lmp-devRobert Shih2014-07-221-2/+5
|\ \ | |/ |/|
| * StagefrightRecorder: webm (video only) supportRobert Shih2014-07-221-2/+5
| | | | | | | | | | Bug: 16329805 Change-Id: I8a0ecd100fca397add97a1416125bcc6aeb86364
* | audio_attributes_t for SoundPoolJean-Michel Trivi2014-07-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | Add support for the audio_attributes_t structure in the SoundPoool constructor. Remove SRC quality which was never implemented. Remove stream types. Add file to contain audio helper functions related to policy. Change-Id: I1720ff15e7b23ea7b713a4395fdfac26dc3fd4da
* | Move AudioRecord frame count calculations to serverGlenn Kasten2014-07-172-45/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buffer frame count and notification frame count are now calculated by server instead of by client. The server has more information and can do a better job. Also fix a few bugs: - If a fast track was re-created, even with same pipe depth, it would fail. Now it can correctly re-create a fast track provided the pipe depth is same. - Notification frame count for fast tracks was calculated by client as 1/2 of the total frame count, which is a large value due to the pipe. Now the notification frame count is set by server to the HAL frame count. This should reduce latency for fast tracks. - EVENT_OVERRUN were happening frequently when there was sample rate conversion, because the client didn't know about the sample rate conversion, and under-estimated the necessary buffer size. Now since server calculates the buffer sizes, EVENT_OVERRUN is unlikely. - RecordThread::createRecordTrack_l was checking for mono and stereo for fast tracks. This is not necessary, and now we can handle a multi-channel fast track. Bug: 7498763 Change-Id: I0c581618e8db33084d5ff9ed50a592990c9749e8
* | Add audio_input_flags_t to IAudioPolicyService::getInputGlenn Kasten2014-07-173-7/+12
| | | | | | | | Change-Id: I9f37be05f8dc7b85a8827a94e76ca0f45453e170
* | Add audio_input_flags_t to IAudioFlinger::openInputGlenn Kasten2014-07-171-2/+6
|/ | | | | | | For backward compatibility, until flags are correctly calculated, we will assume that the request is for a low latency input stream. Change-Id: I76746834e870df00833dc77cbdaa2edd2ffeec95
* resolved conflicts for merge of 373e21cc to masterElliott Hughes2014-07-091-2/+2
|\ | | | | | | Change-Id: I91afd8f9cba04559d21e1c84e25c5c60c990165d
| * am be44e0e0: am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the ↵Elliott Hughes2014-07-101-1/+1
| |\ | | | | | | | | | | | | | | | | | | new icu." * commit 'be44e0e0ffda04725c4864d894a7cc80bd74b5ca': Switch frameworks/av/media/libmedia to the new icu.
| | * Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
| | | | | | | | | | | | Change-Id: I45349756bac6d89b02dba082ba6d606f4c489dcf
| * | am 90732a3b: Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-131-2/+2
| |\ \ | | |/ | | | | | | | | | * commit '90732a3be5e70156486aca94bde8aa81106329ba': Remove dependency on Parcel::{read,write}IntPtr
| | * Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-101-2/+2
| | |\
| | | * Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 15424960 bug: 15107693 (cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96) Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
| * | | resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-131-64/+68
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
| | * | Update OMX messages for 64 bitAndy Hung2014-06-121-64/+68
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | | IAudioFlinger::openRecord now suggests notificationFramesGlenn Kasten2014-07-032-0/+13
| | | | | | | | | | | | Change-Id: I08885cc381d03c522a23289e74f0e1ed46563863
* | | Support for audio attributes on audio output of media playerJean-Michel Trivi2014-07-012-5/+29
| | | | | | | | | | | | Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
* | | libmedia: 64-bit compile warningsMark Salyzyn2014-06-2012-58/+76
| | | | | | | | | | | | Change-Id: I600f062fa7148c01851023c1240c39939e648002
* | | AudioTrack: add support for compressed audioEric Laurent2014-06-191-15/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for compressed audio playback by use of an AudioTrack attached to a direct output thread. Bug: 9428304. Change-Id: I4a61be9cf0e31003ca85935d6e0ee38ca8192e03
* | | AudioPolicyManager: return output for audio attributesJean-Michel Trivi2014-06-183-10/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AudioPolicyManager, support querying an output or playback strategy for audio attributes, instead of a stream type, In AudioTrack creation, use the output returned for the track's attributes. Change-Id: I0fef05845ba676404775e2e338c10e6a96237268
* | | AudioTrack construction with audio attributesJean-Michel Trivi2014-06-171-10/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store audio attributes in AudioTrack class. When an AudioTrack is "set" with non null audio attributes, derive a stream type that reflects the attributes. When an AudioTrack is "set" without attributes, and only has a stream type, derive default audio attributes. Change-Id: I322b91fa9a7e193118960c5e78cdddd85d66f9ad
* | | Merge "AudioSystem: remove unused stream type"Jean-Michel Trivi2014-06-122-17/+11
|\ \ \
| * | | AudioSystem: remove unused stream typeJean-Michel Trivi2014-06-112-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio stream type is not used in the getSampleRate() and getFrameCount() methods. Change-Id: I3d065ae272bd039204cd323cdab9b60460034f2d
* | | | am 3bcffa13: force command flush after releasing a reference to shared memoryEric Laurent2014-06-132-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '3bcffa136909c1fb6e88ee4efd12ccac18360a85': force command flush after releasing a reference to shared memory
| * | | | force command flush after releasing a reference to shared memoryEric Laurent2014-06-132-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After releasing a reference to a shared memory interface, IPCThreadState::self()->flushCommands() must be called to ensure that the corresponding reference is also cleared immediately in the remote process. Otherwise the binder implementaiton will not push the clear systematically causing the memory region not to be freed. See issues 10711502 and 2801375. Bug: 14057166. Change-Id: If55f36f00d452d6cf00cf83bd2fba1c8f3abcb57
| * | | | Squashed commit of the following:Glenn Kasten2014-06-052-22/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9128d6ffec43731d723f9b394f243d940f4c7e41 Author: Glenn Kasten <gkasten@google.com> Date: Tue May 13 10:38:42 2014 -0700 Use of fast capture by normal capture Will only configure fast capture path if the input buffer size is less than 10 ms and the input sample rate is same as the primary output sample rate. Change-Id: I4a7cdc6069d750845412c626d27e83f72a1ab397 commit 2e5e0806a5abe7499848358ef5fde5c26405000d Author: Glenn Kasten <gkasten@google.com> Date: Mon Jun 2 08:29:22 2014 -0700 Add mPrimaryOutputSampleRate Change-Id: I46b527fc3f2b5a5720a74b4f0b9a8f2e0d570b09 commit baf1d73467923996d1b1f2a9237260cc5697e050 Author: Andy Hung <hunga@google.com> Date: Fri May 30 10:42:03 2014 -0700 Change parameter type for volume to float in AudioMixer Change-Id: I4da1505ce852505f86f8e5b87f60e8edceeb30e0 commit 40fe20fa9760cd03c69778c2021cf7a490d75ece Author: Andy Hung <hunga@google.com> Date: Fri May 30 10:35:47 2014 -0700 Rename UNITY_GAIN to UNITY_GAIN_INT in AudioMixer Change-Id: Ic040311305026f0b4c4280a5b3bef7a447ac1da3 commit 37c9a2b49f876abc5ff537a9ec036d7f0a423775 Author: Andy Hung <hunga@google.com> Date: Thu May 29 21:33:13 2014 -0700 Refactor setVolumeRampVariables in AudioMixer Change-Id: I8fcf3101bcea292de7c65433fa578f1c9cdd0974 commit 397070eca31f121d5d3993de1bfea99aaea5d4f3 Author: Andy Hung <hunga@google.com> Date: Thu May 29 18:52:38 2014 -0700 Fix floating point output from mixer A buffer pointer was being erroneously reset to buffer start, potentially causing an audio glitch. The floating point output mode is not enabled at this time, but will be in the future. Change-Id: If8b6414d232f064f3a2e2c5a6da889a91b27fb24 commit 2e61aa5b33b2247bbc5d4eaa0b519df9accd4bbc Author: Andy Hung <hunga@google.com> Date: Fri May 23 21:22:17 2014 -0700 Add multiple format capability to FastMixer Floating point data from MixerThread into FastMixer. Multiple output format capability from FastMixer to Sink. Change-Id: I0da17810ee71381a39a006c46faec71108d22c26 commit b9ea653c702a785bbd23a66c5e588d40b4192c4e Author: Andy Hung <hunga@google.com> Date: Thu May 29 15:53:09 2014 -0700 Avoid resetting BufferProviders in mixer unnecessarily Change-Id: Iad85c4dfd21be1dbf89dc11906106b34219376f8 commit 7f1a6d6da21c616f80cf9ba21bea11b419ec561b Author: Andy Hung <hunga@google.com> Date: Tue May 27 12:32:17 2014 -0700 Update dynamic resampler buffer fetching Make the criteria tight for fetching to avoid storing excessive frame data internal to the resampler. This should reduce jitter in frame delivery computation. Bug: 14962343 Change-Id: I7adaf714d11c272696ccdbf218bda994c7217477 commit b5e4aac07b9a02f0c803c090058602b03ac09ebb Author: Glenn Kasten <gkasten@google.com> Date: Tue May 27 12:30:54 2014 -0700 Allow kFastTrackMultiplier to be specified per device Change-Id: I4eaaaf038df720cec4f5d9221d1b632970f9e3dd commit b93cd97a52af31122df2da2cc0415cda888c8c73 Author: Andy Hung <hunga@google.com> Date: Fri May 23 21:13:31 2014 -0700 Rename mixBuffer to mMixerBuffer in FastMixer Likewise mixBufferState becomes mMixerBufferState. This harmonizes with the naming in AF::MixerThread. Change-Id: I1255d7c07cc2c6ee925d7430925236d2bd163122 commit 8340758622b9711365a8801806cbdf934803c63f Author: Andy Hung <hunga@google.com> Date: Mon May 12 16:51:41 2014 -0700 Add multiple format capability to AudioMixer Change-Id: I04ac1cafd90b6ed652f8d51888ad07576678f0bc Signed-off-by: Andy Hung <hunga@google.com> commit 6b695b9d094820c232a897a3fabbe83d2b7193fe Author: Glenn Kasten <gkasten@google.com> Date: Thu Mar 13 14:59:31 2014 -0700 Start adding FastCapture based on FastThread WIP This version supports at most one fast capture client. Change-Id: Idf609bfc80ae22433433d66a5232c043c65506df commit e951ad05a2c388471d7e2806d91e7d51325a150a Author: Glenn Kasten <gkasten@google.com> Date: Mon May 12 11:06:26 2014 -0700 Move validation of frameCount from set to openRecord_l This move is needed because frameCount is validated on server side for fast tracks (as should be done for normal tracks too). Change-Id: I6d99e80869fd90fab373cf60ef348c01f075fbca commit 73e76992dbba794894837c38e5472312ea829cf3 Author: Glenn Kasten <gkasten@google.com> Date: Tue May 13 10:41:52 2014 -0700 Allow track buffer "allocation" to be from pipe Change-Id: Ib9ac170f8e8b7746b3588157a56cbee3b753a1cb commit 60de1d7ded05c6304037d4858b401094b1d2b4d3 Author: Andy Hung <hunga@google.com> Date: Fri May 9 15:02:21 2014 -0700 Add format parameter to getTrackName() and track_t Change-Id: Ia152a839014e235fbfb656104c15d7c1b456d02e Signed-off-by: Andy Hung <hunga@google.com> Change-Id: Ied0ade8b25d23e89bb03319a7e3135c238f735b9