summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix deadlock issues that arise when there are simultaneousjpadmana2014-01-316-55/+88
| | | | | | | | | | | | | | | | | | | effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds Whenever there are parallel calls to proxy and non sub-effects wrappers, some of the calls are not completed. This is due to deadlock arsing out of Proxy waiting for the subeffect call to return and subeffect waiting for proxy to release lock. The call flow is changed to a cleaner and simple one - Proxy gets the aeli(effect library info) of subeffects during the EffectGetSubEffects() call. Therby, proxy will manage the sub effects by itself rather than going through effects factory. Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com> Bug: 12424044 Change-Id: I16852222f1d0e94e433a19177729323a4bb1c090
* Merge "audioflinger: fix static track end detection"Eric Laurent2014-01-311-9/+2
|\
| * audioflinger: fix static track end detectionEric Laurent2014-01-301-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a static track is not a fast track, prepareTracks_l() must rely on framesReady() to detect end of buffer and remove the track from the active track list. Failing to do so results in the track staying active but not processed by the mixer because in underrun. This leaves the mix buffer content uninitialized and causes the effect process function to accumulate its output onto undefined data. Bug: 12013676. Change-Id: Iad72c921fa18d34811abf7d1073890c093a27725
* | Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"Brian Carlstrom2014-01-301-1/+1
|\ \ | |/ |/|
| * frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
|/ | | | | Bug: 12798969 Change-Id: I2db14a7ee28db2449ec6e2384ade21944284528d
* Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"Glenn Kasten2014-01-291-4/+7
|\
| * AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-01-291-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If any track goes through AudioMixer::process__genericNoResampling, and its getnextbuffer returns NULL, Then that track is removed by AudioMixer from enabledTracks. Thus if all tracks getnextbuffer return NULL, Then this function doesn't reset outTemp and last buffer in AudioFlinger's mMixBuffer will be repeated and noise is observed. Remove tracks from enabledTracks after reseting outTemp to zero, so that process__genericNoResampling will reset outTemp and noise won't appear. Bug: 12450065 Change-Id: I1ccac7ee4a3bf7fd930254356c072099e11e7c19 Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com> Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
* | Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"Colin Cross2014-01-288-10/+10
|\ \
| * | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-278-10/+10
|/ / | | | | | | | | | | | | LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* | Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
|\ \
| * | Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep track on how many wakelocks we have taken. We always just take one real wakelock but increase / decrease the counter every time we try to acquire / release a wakelock. The counter is always increased even if the power manager is not ready, leading to an incorrect counter that could cause a crash when we try to release it. Make sure we only increase the counter when a wakelock, real or counted, is taken. Change-Id: Iad940e052694932f1dad8a1a71fa63601d289d6a
* | | Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
|\ \ \ | |/ / |/| |
| * | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
|/ / | | | | | | | | | | | | Do partial read in MemoryLeakTrackUtil dumpMemoryAddresses to avoid using more memory than what is allocated. Change-Id: I94feb4e00647407f938571167b981c7371f39e3d
* | Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
|\ \
| * | Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26
| | | | | | | | | | | | | | | | | | | | | Cut the metadata to 1 Byte and return in function getObjectPropertyList in order to show it properly on a PC. Change-Id: Iefacf9fa86c20ece2572e6d95d35877a94066fe7
* | | Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-176-9/+91
|\ \ \
| * | | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-166-9/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for parsing ID3v2 meta data from the ID32 chunk in 3gp files. The priority will be 3gpp -> ID3v2 -> iTunes per field. Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
* | | | Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When activating verbose log prints in NuPlayerRenderer the build fails because a variable have changed but the log print hasn't been updated. Change-Id: I3089b087d296c37dfe6379d7e75d5892912fef96
* | | | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
|\ \ \ \
| * | | | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When seeking multiple times it is possible that some seeks are discarded in AwesomePlayer, which causes unwanted jumps to faulty positions. The reason is that a seek flag is reset twice in AwesomePlayer. At first when the video seek is completed and then again when the audio seek is completed. If a new seek is made after the previous video seek completed but before the previous audio seek completed, the new seek position is discarded by the previous audio seek completion. This fix makes sure that the seek flag is reset only when video has completed the seek. Change-Id: I8f8741d4cb8682345f1d1855bbad57c05f4e3c8d
* | | | Merge "libcameraservice: Fix build in ISO C++11 mode"Eino-Ville Talvala2014-01-151-5/+5
|\ \ \ \
| * | | | libcameraservice: Fix build in ISO C++11 modeBernhard Rosenkraenzer2013-07-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change log macro define so it can't be confused for a C++11 string literal Change-Id: Idcc8085735177aa3313fdea66dc0736cca749f9b Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | Merge "Fix c++11 narrowing"Nick Kralevich2014-01-114-8/+8
|\ \ \ \ \
| * | | | | Fix c++11 narrowingsynergydev2013-10-254-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The best fix for these narrowing violations is to use static casting As an example, this change would the following for libnaio: error: non-constant-expression cannot be narrowed from type 'uint32_t' (aka 'unsigned int') to 'long' in initializer list const struct timespec req = {0, ns}; ^~ Change-Id: I04ed1de4497dc19772194afef3ebf8fe0c8b82bc
* | | | | | Merge "Frameworks: AudioFlinger: Fix effects memory leak"Glenn Kasten2014-01-101-0/+8
|\ \ \ \ \ \
| * | | | | | Frameworks: AudioFlinger: Fix effects memory leakYu Yezhong2013-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by: csheng@marvell.com Change-Id: I4e3032fb34643902f98e8fd7c8e894b6452324c9 Signed-off-by: Yu Yezhong <yuyezhong@gmail.com>
* | | | | | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If segment duration is specified with decimal value only the integer value will be used, causing the stream duration to be wrong. Reported to Android public issue tracker: https://code.google.com/p/android/issues/detail?id=56223 Change-Id: I34fb7a81af6ad3d9a214228cfe3724636ebf5ab5
* | | | | | Merge "Change M4OSA_ERR_CREATE to return unsigned integer."Narayan Kamath2014-01-081-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Change M4OSA_ERR_CREATE to return unsigned integer.Ashok Bhat2014-01-021-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While M4OSA_ERR is defined as M4OSA_UInt32, MOSA_ERR_CREATE is defined to return M4OSA_Int32. This leads to signed/unsigned comparison warnings. M4OSA_ERR_CREATE has been changed to return M4OSA_UInt32 to fix this issue. Change-Id: I71a5c50a95c7f296469604b486a1d3969d302a3f Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | | | | Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-213-0/+15
|\ \ \ \ \
| * | | | | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-213-0/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, do not offload LD and ELD AAC decoding because there is no way to know if it is supported by the audio DSP implementation. The longer term fix will be to have mapMimeToAudioFormat() use the audio object type in track metadata to refine the AAC format and the audio HAL list supported AAC profiles. Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
* | | | | Merge "stagefright: fix offloading HE-AAC sampling rate."Eric Laurent2013-12-211-17/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix HE AAC SBR sampling rate reading for explicit signaling. Bug: 11697128. Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
* | | | Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-12-182-14/+14
|\ \ \ \
| * | | | libeffects: do not use GNU old-style field designatorssynergy dev2013-12-172-14/+14
|/ / / / | | | | | | | | | | | | | | | | | | | | Avoiding the use of GCC extensions improves code portability Change-Id: I9edbedc5c8ad4aa46ca54bc2e28280441431a530
* | | | Merge "libstagefright: Delay release of wakelock in TimedEventQueue"Eric Laurent2013-12-172-6/+9
|\ \ \ \
| * | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-172-6/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay release of wakelock in the TimedEventQueue to after an event has been processed. This ensures AP shutdown does not happen while an event is ready but hasn't been processed yet. Bug: 11976087. Change-Id: I71a5f3ac4a57e1d05dd5d9ab5c6f91ed7bb64c87
* | | | Merge "audioflinger: check for condition before waiting"Eric Laurent2013-12-171-1/+6
|\ \ \ \
| * | | | audioflinger: check for condition before waitingHaynes Mathew George2013-12-171-1/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | AsyncCallbackThread must check for any condition that has already been satisfied before waiting. Bug: 11824817 Change-Id: Ic8c2090d521ecd6a30b76ee75635258d35eb1eff
* | | | Merge "AudioTrack: fix position callback after restore"Eric Laurent2013-12-171-1/+0
|\ \ \ \
| * | | | AudioTrack: fix position callback after restoreEric Laurent2013-12-171-1/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring an AudioTrack, the next position callback point should not be modified and set ahead of current buffer head. Otherwise, as frames are dropped, the new position is never reached and an application relying on position callbacks to reload the buffer would be stalled. Bug: 11868603. Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
* | | | Merge "update offloaded audio track sampling rate"Eric Laurent2013-12-179-4/+53
|\ \ \ \
| * | | | update offloaded audio track sampling rateEric Laurent2013-12-179-4/+53
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPlayer must read the sampling rate from offloaded audio sinks whenever a new time position is computed as the decoder can update the sampling rate on the fly. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
* | | | Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-172-11/+14
|\ \ \ \
| * | | | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2013-12-042-11/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I158f147295eebcea96e4047d7618069bc48bdd7d
* | | | | Merge changes Ia684fde5,I58fcb526Andy McFadden2013-12-115-14/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix the help text screenrecord fixes
| * | | | | Fix the help textAndy McFadden2013-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pesky bloggers. (cherry-pick from Ia8677b054423db292a34e28337431b57804df259) Change-Id: Ia684fde52697ea78fca79de958ef8b31a50e68ba
| * | | | | screenrecord fixesAndy McFadden2013-12-115-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to issues identified during code review. (cherry-pick from I2203694acb5c0544878f64f4347d29ad1a0725c4) Change-Id: I58fcb5264fc17b26fac4b03f95d35262e9e199e2
generated by cgit v1.1 at 2024-09-22 08:23:10 +0000