summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
| | | | | bug: 18194977 Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
* Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-devRobert Shih2014-11-101-0/+4
|\
| * HTTPLiveSource: NULL check in getFormatRobert Shih2014-11-081-0/+4
| | | | | | | | Bug: 18297916 Change-Id: I14c5de8d28202ee1b68e369d33e01bd26dbe968d
* | Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-devGlenn Kasten2014-11-072-19/+31
|\ \
| * | Improve AudioTrack recovery from mediaserver deathGlenn Kasten2014-11-052-19/+31
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix race condition in handling of binder death notifications. AudioSystem has a mixture of APIs for both ordinary app clients, and the AudioFlinger and AudioPolicy services within mediaserver. Due to this mix of uses, it is possible for there to be "surprising" sequences of calls on the call stack. Previously, we used a single mutex for all global variables, but this caused a deadlock. To avoid the deadlock, we unlocked the mutex during the critical sequence of calls. But this was a a crucial place where it should have stayed locked; see Change-Id I315c1c5066f62b05e1c13b04fae1272b5fbce977 Now we use separate mutexes for the AudioFlinger, AudioPolicy, and audio port related global variables. This allows us to correctly hold each mutex throughout the atomic region, even when AudioFlinger calls AudioPolicy via AudioSystem, or vice-versa. 2. AudioSystem::clearAudioConfigCache now clears the IAudioFlinger reference. 3. Make AudioSystem::get_audio_policy_service more like get_audio_flinger. Bug: 18242291 Change-Id: I9761443d8337df5bf66d4ca2316a9fd0bd11be94
* | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-073-3/+3
|\ \
| * | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Passes the BufferItem for the queued buffer to the onFrameAvailable callback so the consumer can track the BufferQueue's contents. Bug: 18111837 Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
* | | Merge "AudioSystem: remove obsolete method." into lmp-mr1-devEric Laurent2014-11-071-15/+0
|\ \ \
| * | | AudioSystem: remove obsolete method.Eric Laurent2014-11-061-15/+0
| | | | | | | | | | | | | | | | | | | | Bug: 18067208. Change-Id: I9bbf9088485f5162c765ca504d9b784b956234c6
* | | | Merge "Fix memory leak" into lmp-mr1-devGlenn Kasten2014-11-071-3/+3
|\ \ \ \
| * | | | Fix memory leakGlenn Kasten2014-11-061-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I3f4110a88679b7e7841f40c6acdbf5dcde40fb19
* | | | | Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer ↵Wei Jia2014-11-069-57/+55
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | resulted from seek." into lmp-mr1-dev
| * | | | AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted ↵Wei Jia2014-11-069-57/+55
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from seek. This will remove the unnecessary flush for seek. Bug: 17511837 Change-Id: I4b7acfc71a410372f5c630afb94b6a95d09d8974
* | | | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-devJeff Tinker2014-11-064-1/+41
|\ \ \ \
| * | | | Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-034-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56cd557ce3525fe625db8c312d2557d3c8b51101 related-to-bug: 16034599
* | | | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-063-2/+71
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Add missing secure stop methodsJeff Tinker2014-10-313-2/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18053197 b/18076411 Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
* | | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-051-3/+6
| |_|/ |/| | | | | | | | | | | Bug: 18226810. Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124
* | | Merge "audio: fix talkback why alarm is playing" into lmp-mr1-devEric Laurent2014-11-041-4/+11
|\ \ \ | |_|/ |/| |
| * | audio: fix talkback why alarm is playingEric Laurent2014-11-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Convert attributes usage "assistance accessibility" to a stream type guarantying that the prompt is audible and not muted by policy manager. Bug: 17994328. Change-Id: I89f53f2ce84b499b859336c0a1a3a0332ee670f5
* | | Support speaker routing for FLAG_BEACONJean-Michel Trivi2014-10-311-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for routing audio stream to the speaker when audio attributes carry the FLAG_BEACON value: - associate streams with FLAG_BEACON to the up-to-now unused STREAM_TTS ("Transmitted Through Speaker"). The remapping happens in AudioTrack. - AudioPolicyManager: define new strategy for handling the Beacon behavior, that only goes to speaker. Define new volume curves for STREAM_TTS that are not silence only for the speaker device category. Keep ref count of other streams and never play Beacon streams when anything else is playing: either don't start playback if something else is playing, or unmute STREAM_TTS when it's allowed to play and mute when it's done. - Take into account muting latency when starting an output. Bug 15415971 Change-Id: I26539c7ec1a486accd85bbeb1623e9c7d3a1192f
* | | AudioTrack::flush() will no longer flush later dataGlenn Kasten2014-10-301-5/+22
|/ / | | | | | | | | Bug: 17832076 Change-Id: I4915d782acb8077923e419406b0dcea5b6aab961
* | Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-devEric Laurent2014-10-292-2/+2
|\ \
| * | NuPlayer: reduce offload pause teardown timeout.Eric Laurent2014-10-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Waiting 60 seconds to teardown an offloaded path when paused is not needed and causes unecessary battery drain. 10 seconds is enough to avaoid teardown when it would be problematic (seek, pause for notifications, buffering...). Bug: 13505340. Change-Id: Ibcaa609b59e86ba2bc49539620bd77504d534c0c
* | | Merge "NuPlayer: merge start() and resume()." into lmp-mr1-devWei Jia2014-10-293-105/+103
|\ \ \ | |_|/ |/| |
| * | NuPlayer: merge start() and resume().Wei Jia2014-10-283-105/+103
| |/ | | | | | | | | | | | | NuPlayerDriver: allow seekTo called in STOPPED_AND_PREPARED state. Bug: 18127606 Change-Id: I92ff9f7e0a176c434202762d30966d8c4643d1ef
* | Merge "fix deep buffer logic in NuPlayer." into lmp-mr1-devEric Laurent2014-10-282-7/+8
|\ \
| * | fix deep buffer logic in NuPlayer.Eric Laurent2014-10-282-7/+8
| |/ | | | | | | | | | | | | | | | | | | | | Deep buffer output should be requested when there is no video track, not when there is one. Also make sure that the deep buffer flag is restored after a failure to offload audio decoding. Bug: 18114624. Change-Id: If3c04c784bc20d77926993ee475fbf961aeba7ae
* | Merge "libmedia: ensure mCaptureThread exit within Visualizer destructor" ↵Glenn Kasten2014-10-281-7/+12
|\ \ | |/ |/| | | into lmp-mr1-dev
| * libmedia: ensure mCaptureThread exit within Visualizer destructorHaynes Mathew George2014-10-281-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If mCaptureThread doesn't exit when Visualizer instance gets destroyed, recycled member variables with random value such as danger pointer will be accessed again and causes crash. Thread which is created within Visualizer instance lifecycle should be terminated before or within destructor. CRs-Fixed: 688546 authored-by: wjiang@codeaurora.org cherry-pick from CAF commit: 4823e3d6b8c60faa4d8fee5d58728eb70e56abf2 Bug: 18159501 Change-Id: Ie0b12ae8a3b9735b6ecbac0353781b8358cad644
* | Merge "libstagefright: set actual stride info for SW encoder input port" ↵Lajos Molnar2014-10-284-1/+17
|\ \ | | | | | | | | | into lmp-mr1-dev
| * | libstagefright: set actual stride info for SW encoder input portLajos Molnar2014-10-254-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes encoding flexible YUV content using SW encoders. Also skip setting input color format if it is flexible YUV, as it has already been translated to a color format supported by the codec. Bug: 18124320 Change-Id: I423782936986f4d6cf65ea9ef89ae77a92e30140
* | | do not hold mNotifyLock when calling MediaPlayer::notifyChong Zhang2014-10-271-1/+3
|/ / | | | | | | | | Bug:18120688 Change-Id: Ia66dcfc3fd2d67d1ceba9808d21e0120cc8691d6
* | am 0f8f4e68: [FM] Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-2/+2
|\ \ | | | | | | | | | | | | * commit '0f8f4e681b867dd611d2d916453337cb0770d4da': [FM] Fix FM App record fail Buganizer ID: 17975676
| * | [FM] Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Review: https://partner-android-review.git.corp.google.com/#/c/185234 Signed-off-by: Hochi Huang <hochi.huang@mediatek.com> Change-Id: I872ce744d23049e251a46aebc4019be5b25e3612
* | | am 511ae054: am f256901b: Merge "64 bit fixes for NdkMediaExtractor" into ↵Marco Nelissen2014-10-231-11/+16
|\ \ \ | |/ / | | | | | | | | | | | | | | | lmp-dev * commit '511ae0549f889c78a820693fdd7e27ea634c2cd2': 64 bit fixes for NdkMediaExtractor
| * | 64 bit fixes for NdkMediaExtractorMarco Nelissen2014-10-231-11/+16
| | | | | | | | | | | | | | | Bug: 18094443 Change-Id: Iae049012966707f5c187c61ed68407f22c662b25
* | | Merge "stagefright: return failure on malformed TS streams" into lmp-mr1-devChong Zhang2014-10-231-9/+23
|\ \ \
| * | | stagefright: return failure on malformed TS streamsDavid Yeh2014-10-211-9/+23
| | | | | | | | | | | | | | | | | | | | Bug: 18075193 Change-Id: I7bd97dea263e972a8de3429ed000cbd4913164bf
* | | | am c3ddddbd: Merge "release camera without holding CameraSource mutex" into ↵Chong Zhang2014-10-221-41/+58
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev automerge: 168799c * commit 'c3ddddbd4ec1fe2c570a25925db6b396fb83badf': release camera without holding CameraSource mutex move audio sink open/close to NuPlayerRenderer Fix freed memory references audio policy: move intializations to onFirstRef() Fix VideoFrame class layout for 64/32 bit NuPlayer: wait for renderer flush before decoder shutdown Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp send available codec buffer count with codec notification mediarecorder: set level if setting default profile stagefright: move math templates into AUtils.h NuPlayer: Fix flush mode decoder error handling Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp" GenericSource: support disconnect before NuCachedSource2 is created mediaplayer: make frame-accurate avsync configurable
| * | | Merge "release camera without holding CameraSource mutex" into lmp-devChong Zhang2014-10-221-41/+58
| |\ \ \ | | |/ /
| | * | release camera without holding CameraSource mutexChong Zhang2014-10-211-41/+58
| | | | | | | | | | | | | | | | | | | | Bug: 17997578 Change-Id: Iba93848ad10ba84d2d836573da7ce242c761582f
* | | | am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if ↵Lajos Molnar2014-10-222-0/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | MediaCodec.release hangs" into lmp-dev * commit 'f04e8b5e51cfc868e5e58e1ad234095c8b7505ad': stagefright: try to free codec instance if MediaCodec.release hangs
| * | | Merge "stagefright: try to free codec instance if MediaCodec.release hangs" ↵Lajos Molnar2014-10-222-0/+29
| |\ \ \ | | | | | | | | | | | | | | | into lmp-dev
| | * | | stagefright: try to free codec instance if MediaCodec.release hangsLajos Molnar2014-10-212-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18033275 Change-Id: If86cd26566d7b75941976f37829bbec619800778
* | | | | am cd3fc4e3: am 6ce19d24: Merge "Stagefright: MediaCodec: shutdown allocated ↵Lajos Molnar2014-10-221-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | codec on error" into lmp-dev * commit 'cd3fc4e341abc224db6876c5a028cb94606dc4e8': Stagefright: MediaCodec: shutdown allocated codec on error
| * | | | Merge "Stagefright: MediaCodec: shutdown allocated codec on error" into lmp-devLajos Molnar2014-10-221-2/+6
| |\ \ \ \
| | * | | | Stagefright: MediaCodec: shutdown allocated codec on errorPraveen Chavan2014-10-211-2/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If MediaCodec sees a fatal error and transitions to UNINITIALIZED state, The codec may still be alive (with an exception of 'mediaserver-died' error). Handle Shutdown of the codec during release(). Bug: 17784012 Bug: 18033275 Change-Id: I891e036499d9b440a57f77fb735a5ba4da9a6e43
* | | | | am 6e52a61a: am f5926713: mediaplayer: don\'t report position past last ↵Lajos Molnar2014-10-222-8/+46
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | queued position * commit '6e52a61ace0055167ab1b995ba997217f7e1822f': mediaplayer: don't report position past last queued position
| * | | | mediaplayer: don't report position past last queued positionLajos Molnar2014-10-212-8/+46
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | also reanchor offloaded audio track correctly Bug: 17653702 Change-Id: If05394d3b119be8d80b7764847496246d34a2133
generated by cgit v1.1 at 2025-02-11 03:01:40 +0000