summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix warning for redundant typedef"Glenn Kasten2012-01-201-1/+1
|\
| * Fix warning for redundant typedefGlenn Kasten2012-01-201-1/+1
| | | | | | | | | | | | frameworks/base/media/libmedia/autodetect.cpp:22: warning: 'typedef' was ignored in this declaration Change-Id: I8c7404b9f5aa515c0fe92a5a46f24248d6fe96bf
* | Use audio_format_t consistently, continuedGlenn Kasten2012-01-2012-96/+96
| | | | | | | | | | | | | | | | | | | | | | | | Was int or uint32_t. When AudioFlinger::format can't determine the correct format, return INVALID rather than DEFAULT. Init mFormat to INVALID rather than DEFAULT in the constructor. Subclass constructors will set mFormat to the correct value. Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
* | Merge "Add ANativeWindow timestamp support to camera service."Eino-Ville Talvala2012-01-201-0/+7
|\ \
| * | Add ANativeWindow timestamp support to camera service.Eino-Ville Talvala2012-01-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | This allows the camera HAL to set ANativeWindow timestamps, which are used by SurfaceTexture. Bug-Id: 5081132 Change-Id: I123ea4c9d1824fb72146fad81ad03d1491e0a7f8
* | | Merge "Starhub RTSP apparently does not establish time on all tracks"Andreas Huber2012-01-201-1/+29
|\ \ \
| * | | Starhub RTSP apparently does not establish time on all tracksAndreas Huber2012-01-201-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.e. the "SR" RTCP packet is sent for only one of the two tracks. fake timestamps if that's the case, previously we'd only fake timestamps if we didn't receive _any_ "SR" packets. Change-Id: Id63d4940d453ba6c04c62e02ab9a0ad843936bc1 related-to-bug: 5669027
* | | | Merge "Fix typos in string constants"Glenn Kasten2012-01-201-1/+1
|\ \ \ \
| * | | | Fix typos in string constantsGlenn Kasten2012-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were copy/paste errors in code that was copied from AudioTrack. Change-Id: I64a04d6026667884ddb1fefba67a71d69c691d62
* | | | | Merge "Remove dead file include/media/thread_init.h"Glenn Kasten2012-01-201-24/+0
|\ \ \ \ \
| * | | | | Remove dead file include/media/thread_init.hGlenn Kasten2012-01-191-24/+0
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I98688bb7109b5f82953988935c7c33fe3c7f4ec0
* | | | | Merge "Remove redundant get()"Glenn Kasten2012-01-204-6/+6
|\ \ \ \ \
| * | | | | Remove redundant get()Glenn Kasten2012-01-204-6/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get() is almost always unnecessary, except in a LOG. Also no need to check for != 0 before calling get(). Change-Id: Ib06e7a503f86cf102f09acc1ffb2ad085025516d
* | | | | Merge "Move memcpy_to_i16_from_u8 to audio_utils"Glenn Kasten2012-01-201-13/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Move memcpy_to_i16_from_u8 to audio_utilsGlenn Kasten2012-01-171-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier for this kind of code to be optimized for each target architecture. Change-Id: I9efd27d6c0175b00b9a784353244805cec63c0b8
* | | | | Merge "Remove dead setRingerMode(mode, mask)"Glenn Kasten2012-01-206-42/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove dead setRingerMode(mode, mask)Glenn Kasten2012-01-186-42/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
* | | | | Merge "Make sure the ThrottledSource reports the proper mime type"Andreas Huber2012-01-191-0/+5
|\ \ \ \ \
| * | | | | Make sure the ThrottledSource reports the proper mime typeAndreas Huber2012-01-191-0/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | of the underlying source. Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
* | | | | resolved conflicts for merge of 05683c85 to masterEric Laurent2012-01-192-6/+21
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
| * | | | am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ↵Eric Laurent2012-01-182-6/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'db2e71635968f455ad4f41b2e24fb8b909c24ca0': AudioFlinger: mix track only when really ready (2)
| | * | | | AudioFlinger: mix track only when really ready (2)Eric Laurent2012-01-182-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem due to the way audio buffers are mixed when low power mode is active was addressed by commits 19ddf0eb and 8a04fe03 but only partially. As a matter of fact, when more than one audio track is playing, the problem is still present. This is most noticeable when playing music with screen off and a notification or navigation instruction is played: in this case, the music or notification is likely to skip. The fix consists in declaring the mixer ready if all active tracks are ready. Previous behavior was to declare ready if at least one track was ready. To avoid that one application failing to fill the track buffer blocks other tracks indefinitely, this condition is respected only if the mixer was ready in the previous round. Issue 5799167. Change-Id: Iabd4ca08d3d45f563d9824c8a03c2c68a43ae179
* | | | | | Merge "Fix incorrect includes of AudioTrack.h"Glenn Kasten2012-01-195-5/+4
|\ \ \ \ \ \
| * | | | | | Fix incorrect includes of AudioTrack.hGlenn Kasten2012-01-185-5/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary includes of AudioTrack.h. Use forward declaration of class names in preference to #include when possible. Change-Id: I12982811fa75c2c7695d8bbfa595a7aaec047dc0
* | | | | | Merge "Simplify range check for audio_mode_t (continued)"Glenn Kasten2012-01-191-0/+1
|\ \ \ \ \ \
| * | | | | | Simplify range check for audio_mode_t (continued)Glenn Kasten2012-01-181-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed one place in earlier CL of same name Change-Id: I0dd25364d0b8d5d731c02d352f139a0c8d4df1a8
* | | | | | Merge "Add units to time periods"Glenn Kasten2012-01-191-2/+2
|\ \ \ \ \ \
| * | | | | | Add units to time periodsGlenn Kasten2012-01-181-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ib980e2676cecf5d9b0c2e388da6dc8e370df8abb
* | | | | | Merge "Use const const strings for arrays and pointers to strings"Glenn Kasten2012-01-192-4/+4
|\ \ \ \ \ \
| * | | | | | Use const const strings for arrays and pointers to stringsGlenn Kasten2012-01-182-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I0a073e17ebf6ad59e7edbedac104c6fa4bcaf9c9
* | | | | | Merge "For booleans, use ! instead of == false"Glenn Kasten2012-01-192-5/+5
|\ \ \ \ \ \
| * | | | | | For booleans, use ! instead of == falseGlenn Kasten2012-01-182-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ibc115936d2d0b0b7744ebe9b52839ea5b42c4edd
* | | | | | Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former ↵Andreas Huber2012-01-184-0/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | signatures"
| * | | | | | Temporarily restore AudioSystem/AudioTrack APIs with their former signaturesAndreas Huber2012-01-184-0/+47
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | until we get updated prebuilts from vendor. Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
* | | | | | Merge "AVIExtractor: adding a H264 fourCC which is also specified in the ↵Andreas Huber2012-01-181-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
| * | | | | | AVIExtractor: adding a H264 fourCC which is also specified in the reference.Dongwon Kang2012-01-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (H264 code can be found avi file which is encoded with FFmpeg.) Change-Id: Id9eccd4580443f42b2afa491c94ac2c2faa37f87
* | | | | | | Merge "Make sure seek triggers a reconnect if needed."Bryan Mawhinney2012-01-181-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Make sure seek triggers a reconnect if needed.Bryan Mawhinney2012-01-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if we had disconnected at the high watermark, the read immediately following a seek would fail, and would not be retried, resulting in an error. Change-Id: I45a53563fe17d6b54893815abc7750a7dfb0a124
* | | | | | | Merge "Track volume cleanup"Glenn Kasten2012-01-183-15/+35
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Track volume cleanupGlenn Kasten2012-01-173-15/+35
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always read and write track volumes atomically. In most places this was already being done, but there were a couple places where the left and right channels were read independently. Changed constant MAX_GAIN_INT to be a uint32_t instead of a float. It is always used as a uint32_t in comparisons and assignments. Use MAX_GAIN_INT in more places. Now that volume is always accessed atomically, removed the union and alias for uint16_t volume[2], and kept only volumeLR. Removed volatile as it's meaningless. In AudioFlinger, clamp the track volumes read from shared memory before applying master and stream volume. Change-Id: If65e2b27e5bc3db5bf75540479843041b58433f0
* | | | | | Merge "audio framework: manage stream volume per device"Eric Laurent2012-01-176-18/+63
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | audio framework: manage stream volume per deviceEric Laurent2012-01-176-18/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve volume management by keeping track of volume for each type of device independently. Volume for each stream (MUSIC, RINGTONE, VOICE_CALL...) is now maintained per device. The main changes are: - AudioService now keeps tracks of stream volumes per device: volume indexes are kept in a HashMap < device , index>. active device is queried from policy manager when a volume change request is received initalization, mute and unmute happen on all device simultaneously - Settings: suffixes is added to volume keys to store each device volume independently. - AudioSystem/AudioPolicyService/AudioPolicyInterface: added a device argument to setStreamVolumeIndex() and getStreamVolumeIndex() to address each device independently. - AudioPolicyManagerBase: keep track of stream volumes for each device and apply volume according to current device selection. Change-Id: I61ef1c45caadca04d16363bca4140e0f81901b3f
* | | | | | Merge "Remove dead setVolume() and mVolume[2]"Glenn Kasten2012-01-172-15/+0
|\ \ \ \ \ \
| * | | | | | Remove dead setVolume() and mVolume[2]Glenn Kasten2012-01-172-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I94b835434093e920432614eb5007101e87758f32
* | | | | | | Move fixed_fft to system/media/audio_utilsGlenn Kasten2012-01-173-168/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: If8a03911434862a872539c313f54825ffb2cc672
* | | | | | Merge "Use audio_mode_t consistently"Glenn Kasten2012-01-1710-24/+24
|\ \ \ \ \ \
| * | | | | | Use audio_mode_t consistentlyGlenn Kasten2012-01-1210-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was int or uint32_t. Also make getMode() const. Change-Id: Ibe45aadbf413b9158e4dd17f2b3bcc6355288d37
* | | | | | | Rename Visualizer::mLockGlenn Kasten2012-01-172-5/+5
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids confusion with parent class AudioEffect's mLock which is protected. Change-Id: I2ae0b0869fe3c606f682252973795b34477951d0
* | | | | | Check stream type in AudioFlinger::createTrackGlenn Kasten2012-01-173-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bad parameter to AudioFlinger::createTrack could cause mediaserver to crash. Other AudioFlinger stream type cleanup: - Simplify range check for audio_stream_type_t - Add comment about mStreamTypes array initialization. Change-Id: Ia33aa1cce0fdd694b08d9288816ffc097a9543d0
* | | | | | Merge "Fix locking for mMasterVolume and mMute"Glenn Kasten2012-01-172-4/+15
|\ \ \ \ \ \
generated by cgit v1.1 at 2025-08-05 12:19:43 +0000