summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
|\
| * Use standard syntax to initialize fields.Chih-Hung Hsieh2014-11-141-712/+712
| | | | | | | | | | | | | | Clang compiler gives warning to old gnu syntax. BUG: 18193625 Change-Id: I1b5237d60866fc357fc808f6a6955ab20418a7d8
* | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
| | | | | | | | Change-Id: I79f9a53b95dcf84dff62ed4b3c0661c7c1e1fc64
* | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-2/+0
| | | | | | | | Change-Id: Ib91ff0696ab2472c62168eb5261bbda5d22f623e
* | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1719-60/+60
|/ | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* Resolve conflictThe Android Open Source Project2014-11-0636-2010/+5622
|\
| * Fix AudioTrack retrograde getPosition when restoring tracksAndy Hung2014-10-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | mReleased represents the number of frames written to the track, but was cleared on start() causing a mismatch if the client wrote to the track before starting. Moved the clearing to entering the STATE_STOPPED or STATE_FLUSHED state. Bug: 18017947 Bug: 18022276 Change-Id: I3788c98c4c3c4d9cc004378432797b3f3138e22e
| * AudioTrack: fix AudioTrackThread crash upon exitEric Laurent2014-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | In case of error during createTrack_l(), there is a possibility that a newly created AudioTrackThread is resumed by requestExit() just after entering the Thread class _threadLoop() but before entering the class threadLoop(). In this case, processAudioBuffer() is executed once with mCblk == 0 and we assert. Bug: 17894033. Change-Id: I93d0d0d4dbf14bcb88dad23e6ad49d2ecd47badd
| * audio: fix stream type for accessibility usageEric Laurent2014-09-253-2/+36
| | | | | | | | | | | | | | | | | | Make sure that accessibility prompts are heard when a ringtone is active by forcing stream type to AUDIO_STREAM_RING when phone state is AUDIO_MODE_RINGTONE. Bug: 17558149. Change-Id: Ia3bead8052fca5cbf282c267f7b9b06014fef628
| * Reduce log spam from getTimestamp errorsGlenn Kasten2014-09-191-1/+1
| | | | | | | | | | Bug: 17576481 Change-Id: I07d99e7c42b7d4f0994b5a6d9c9fe8eb29fbbe40
| * Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-3/+10
| |\
| | * AudioEffect acquires sessionJean-Michel Trivi2014-09-181-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, users of audio sessions, AudioTrack and AudioRecord, are acquiring and releasing audio sessions according to their life-cycle. AudioEffect instances were not counting as users of an audio session. This caused an effect used on a session to be purged by AudioFlinger::purgeStaleEffects_l() whenever the last user of that session went away. This CL makes AudioEffect acquire and release a session when created and destroyed. Bug 15432115 Change-Id: I922532150009988d43872f9b5928044a830ae0b3
| * | Fix AudioTrack offloaded timestamp handling.Andy Hung2014-09-171-5/+93
| |/ | | | | | | | | | | | | | | | | | | getTimestamp for offloaded tracks now returns WOULD_BLOCK for situations where the timestamp is unavailable due to the previous track still flushing or the timestamp is stale. It is fixed for normal playback conditions. Bug: 14659809 Bug: 17428188 Change-Id: Ic9ec07ccabc604236979769db5c4ea2dec252660
| * Clean up AudioTrack position and timestamp handlingGlenn Kasten2014-09-111-18/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace epoch concept by observing and accumulating server delta positions. The advantage of using server deltas instead of absolute values is that they (1) are not sensitive to 32-bit wraparound, (2) are not sensitive to server behavior for stop(), and (3) prepare for future 64-bit client positions without requiring 64-bit positions on server. Add comments to AudioTrack::getTimestamp() and friends that the timestamp output parameter is undefined on error. Don't allow getTimestamp to return a negative frame position after stop(). Accumulate the client released frames, which may be useful for a future API. Bug: 11815245 Change-Id: I652940fa2db2f34a78c012a3ead0d9204fa29c6e
| * 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.
| | * \ 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
| | * \ \ resolved conflicts for merge of cbd74fcb to klp-modular-dev-plus-aospNarayan Kamath2014-06-131-64/+68
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I00270ef6fe813c0d3649483cbc3aba6af789e033
| * | | | | IAudioFlinger::openRecord now suggests notificationFramesGlenn Kasten2014-07-032-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I08885cc381d03c522a23289e74f0e1ed46563863
generated by cgit v1.1 at 2024-05-22 03:35:33 +0000