summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "MediaCodec: Fix deallocated pointer reference when calling reset()" ↵Andy Hung2014-09-221-1/+1
|\ | | | | | | into lmp-dev
| * MediaCodec: Fix deallocated pointer reference when calling reset()Andy Hung2014-09-221-1/+1
| | | | | | | | | | | | | | | | The name pointer argument in MediaCodec::init() was being implicitly deallocated. Bug: 17499622 Change-Id: If9409f95674e52d1478f969f77693c4d27ff1ff2
* | Merge "MediaBuffer: ABuffer will release MediaBuffer when it's destructed." ↵Wei Jia2014-09-223-3/+51
|\ \ | | | | | | | | | into lmp-dev
| * | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-193-3/+51
| | | | | | | | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
* | | Merge "AudioEffect acquires session" into lmp-devJean-Michel Trivi2014-09-181-0/+1
|\ \ \ | |_|/ |/| |
| * | AudioEffect acquires sessionJean-Michel Trivi2014-09-181-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "NuPlayer: use getTimestamp instead of getPosition" into lmp-devLajos Molnar2014-09-171-0/+2
|\ \
| * | NuPlayer: use getTimestamp instead of getPositionLajos Molnar2014-09-171-0/+2
| |/ | | | | | | | | Bug: 14659809 Bug: 16985287 Change-Id: I59ec72fbd40a9b8d28fe548ddad082c03000c045
* | Fix AudioTrack offloaded timestamp handling.Andy Hung2014-09-171-1/+10
|/ | | | | | | | | | 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-113-4/+20
| | | | | | | | | | | | | | | | | | | 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
* stagefright: don't use AAtomizer in AMessageLajos Molnar2014-09-101-1/+5
| | | | | Bug: 15094301 Change-Id: Ib82fb6d8fb6b48402d81f411123b3d924368eb93
* Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-devZhijun He2014-09-101-1/+2
|\
| * CamcorderProfile: Add QUALITY_HIGH_SPEED_2160PZhijun He2014-09-091-1/+2
| | | | | | | | | | Bug: 17059255 Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
* | Merge "Add error code for insufficient output protection" into lmp-devJeff Tinker2014-09-091-15/+17
|\ \ | |/ |/|
| * Add error code for insufficient output protectionJeff Tinker2014-08-281-15/+17
| | | | | | | | | | bug: 16034599 Change-Id: Ib52c8bdae83ea138cac897bce78ab651c36c1998
* | Cache audio attributes when player not availableJean-Michel Trivi2014-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | 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-033-1/+146
|\ \
| * | Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-023-1/+146
| |/ | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Fix more potential deadlocks in ALooperRoster" into lmp-devMarco Nelissen2014-09-031-2/+0
|\ \
| * | Fix more potential deadlocks in ALooperRosterMarco Nelissen2014-08-281-2/+0
| |/ | | | | | | | | Bug: 17059501 Change-Id: I242f2859527bed2d6e275c27de94fb19f4dcdc28
* | Tunneled Video Playback:Rachad2014-08-281-1/+1
| | | | | | | | | | | | | | Changed AudioHwSync token to int32_t to match Audio stack api. Bug: 17112525 Change-Id: I673819495c2e7b540e8d7572cc95796bddbf63bb
* | CameraService: Correct API2 error handlingEino-Ville Talvala2014-08-271-1/+5
|/ | | | | | | | | | | | | | - Add more error codes to the binder camera2 callbacks - Translate HAL errors to callback errors - When flushing, report failures for queued requests - Treat stream config failure as nonfatal - Send request errors when buffers aren't available for captures Bug: 15524101 Bug: 14448494 Bug: 11272459 Bug: 17160301 Change-Id: I81aa54e805a9cce1cb8a6a9374549daa7666deb2
* move cache prefill to GenericSource's message handlerChong Zhang2014-08-211-5/+1
| | | | | | | | | | | | This allows prepareAsync to be terminated by reset promptly. It also makes it easier to do buffer update as GenericSource can access the cache status now. Bug: 16892748 Bug: 17182378 Change-Id: Ia55c04a810fd805041cb2025f6739afa5120b5ed
* camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-08-181-0/+203
| | | | | | | | | | | | | As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Bug: 16654949 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
* stagefright/media: add support for codec features with text valueLajos Molnar2014-08-141-0/+1
| | | | | Bug: 11990470 Change-Id: I7600d999c5f4b6821d825d25fa7e8a2bb5a80c46
* Merge "MediaCodecList: handle errors gracefully" into lmp-devLajos Molnar2014-08-121-0/+1
|\
| * MediaCodecList: handle errors gracefullyLajos Molnar2014-08-121-0/+1
| | | | | | | | | | | | | | | | | | 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-0/+29
|\
| * Extend downsampling ratios greater than 2:1Andy Hung2014-08-111-0/+29
| | | | | | | | | | | | | | | | | | 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
* | Merge "Added Tunneled video playback support to ACodec" into lmp-devRachad2014-08-092-0/+7
|\ \ | |/ |/|
| * Added Tunneled video playback support to ACodecRachad2014-08-082-0/+7
| | | | | | | | | | Bug:16132368 Change-Id: I88d2d66b8548fc203f4a2c4797196af15e56ff38
* | NuPlayer: getSelectedTrackRobert Shih2014-08-081-1/+2
|/ | | | Change-Id: If5251f89b881e7f268e11a06cd3685d794c958b6
* Merge "AAC decoder: add support for controlling presentation parameters" ↵Jean-Michel Trivi2014-08-081-1/+10
|\ | | | | | | into lmp-dev
| * AAC decoder: add support for controlling presentation parametersJean-Michel Trivi2014-08-081-1/+10
| | | | | | | | | | | | | | | | | | Control the dowmixing of the AAC decoder Control the DRC processing of the AAC decoder Bug 16740915 Change-Id: I9b06ea8785f56213ea120ed85eeb360c88223297
* | Merge "Clarify and implement MediaCodec status codes" into lmp-devAndy Hung2014-08-072-2/+53
|\ \
| * | Clarify and implement MediaCodec status codesAndy Hung2014-08-072-2/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify MediaCodec status codes in MediaError.h When appropriate, return OMX error codes for status. Optionally return a status code from CreateByType() and CreateByComponentName(). Bug: 12034929 Bug: 13976475 Change-Id: I7463dd08d101074f730481b26127a69c9186c97e
* | | stagefright: support flexible YUV formatLajos Molnar2014-08-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | - Report flexible format for standard OMX formats that are flexible. - Accept flexible format when specifying video port formats. Bug: 10706245 Change-Id: I9e82bc895bb0d5d606eb05fdf83bec766eaa2046
* | | media/playerservice: add getCodecList() to MediaPlayerServiceLajos Molnar2014-08-071-0/+2
| | | | | | | | | | | | | | | Bug: 11990470 Change-Id: I8fa45946fd9b76f9b975fc59062819c57e6881ef
* | | stagefright: rework media codec list and infosLajos Molnar2014-08-074-36/+198
| | | | | | | | | | | | | | | | | | | | | | | | This is in preparation of serving the codec list and codec infos from the mediaserver Bug: 11990470 Change-Id: Ib8e2708679c9ce461a4ba179974a740cdcdf2731
* | | stagefright: add AString parceling, and equal/compareIgnoreCaseLajos Molnar2014-08-071-0/+7
| | | | | | | | | | | | | | | Bug: 11990470 Change-Id: If43ada5d2e768931f4409e499eaa268edade0500
* | | stagefright: move ARRAY_SIZE to foundationLajos Molnar2014-08-061-0/+2
| | | | | | | | | | | | | | | Bug: 11990470 Change-Id: Ifae790b774a0fb210acbe33a1310d3d6ba46e7fa
* | | Merge "some fixes for crash when extractor creation fails" into lmp-devChong Zhang2014-08-062-1/+9
|\ \ \
| * | | some fixes for crash when extractor creation failsChong Zhang2014-08-062-1/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | - prefetch data for sniffing - notify error instead of crashing if extractor is NULL Bug: 16818302 Change-Id: I56ff4996d99ac2811d19d141f7ff7acdd7c1da17
* | | AudioSystem: add API to query audio HW sync sourceEric Laurent2014-08-062-0/+7
|/ / | | | | | | | | | | | | | | | | | | | | 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
* | Merge "AAC encoder: add support for SBR mode selection" into lmp-devJean-Michel Trivi2014-08-051-1/+1
|\ \ | |/
| * AAC encoder: add support for SBR mode selectionJean-Michel Trivi2014-08-051-1/+1
| | | | | | | | Change-Id: Ibc07bff7710398929c135f38324dd29857fa0ea6
* | Add sound trigger control by audio policyEric Laurent2014-08-056-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "MediaCodecSource: stop puller from caller's thread instead of looper" ↵Chong Zhang2014-08-011-2/+1
|\ \ | | | | | | | | | into lmp-dev
| * | MediaCodecSource: stop puller from caller's thread instead of looperChong Zhang2014-08-041-2/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently CameraSource/AudioSource's stop() and read() are both called from the puller's looper. This works if source operates normally (i.e. read() returns regularly before source is stopped), as the stop() will eventually be handled by the looper. However, if for some reason the source hang, it will get stuck in read(), and the stop() will never be processed, which could lead to ANR (in addition to the source hang). We need to move the source's stop out of the puller's looper. It also can't be on MediaCodecSource's looper, because the source's stop synchrounously waits for all outstanding buffers to return, these are only returned when MediaCodecSource's looper processes the buffer. This change moves the stop to MediaCodecSource::stop, after encoder is shutdown. Bug: 16522726 Change-Id: Ie91f563c5d8a98ab091bf1945af4e51f662b9403