summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix preventing from heap overwrite in capture command"Glenn Kasten2014-02-281-34/+35
|\
| * Fix preventing from heap overwrite in capture commandRyszard Grzesica2014-02-201-34/+35
| | | | | | | | | | | | | | | | | | | | There was heap usage error in case of stop of audio framework while capturePoint was negative. Pointer to reply data was moved but final silence write was done using original buffer size. Now silence set is done at the beginning under the condition that framework has stopped. Change-Id: I7dab1e922f1813e5fbfd4a64c8b0d15d9465520c
* | Merge "AArch64: Correction for LP64"Narayan Kamath2014-02-271-5/+5
|\ \
| * | AArch64: Correction for LP64Marcus Oakland2014-02-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Intra16x16PlanePrediction function, a u32 (unsigned 32-bit integer) was being used for the "i" variable, and being used with a value of 7 in the loop "for (i = 0, b = 0; i < 8; i++)" to access the "above[6-i]" location where "above" is defined as "u8 *". Because "i" was unsigned there was no sign extension on use with the __LP64__ 64-bit pointer, so rather than 0xFFFFFFFF being treated as -1, it was treated as 4,292,967,295 and that resulted in a SIGSEGV at an invalid address. By changing the type of "i" to an i32 (signed 32-bit integer) the expected sign extension occurs and the value is treated as -1. This change fixes android.media.cts.DecoderTest#testCodeBasicH264 on 64-bit platforms Change-Id: I85df58b0dc1d39f89ab421d04ab5481356520f0c Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"Ying Wang2014-02-261-1/+2
|\ \ \ | |/ / |/| |
| * | Use multilib-friendly LOCAL_MODULE_RELATIVE_PATHYing Wang2014-02-261-1/+2
|/ / | | | | | | Change-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6
* | Merge "Avoid a building error"Glenn Kasten2014-02-251-1/+3
|\ \
| * | Avoid a building errorChih-Wei Huang2013-01-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | &pDwmModule->config may equal to pConfig that triggers a building error using gcc 4.7: In file included from bionic/libc/include/signal.h:33:0, from bionic/libc/include/sys/select.h:34, from bionic/libc/include/unistd.h:34, from system/core/include/cutils/log.h:34, from frameworks/av/media/libeffects/downmix/EffectDownmix.c:19: In function 'memcpy', inlined from 'Downmix_Configure' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:651:11, inlined from 'Downmix_Init' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:605:9, inlined from 'DownmixLib_Create' at frameworks/av/media/libeffects/downmix/EffectDownmix.c:233:9: bionic/libc/include/string.h:114:31: error: call to '__memcpy_overlap_error' declared with attribute error: memcpy called with overlapping regions Change-Id: Ia6c4aab72e38d00d8d526f3b56fc03b6530b4e44
* | | Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"Marco Nelissen2014-02-202-4/+13
|\ \ \ | |_|/ |/| |
| * | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-102-4/+13
| | | | | | | | | | | | | | | | | | | | | This fixes playback of HLS streams where the M3U playlists use relative paths and the main playlist is opened via a redirect. Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
* | | Merge "libeffects: don't set module path"Colin Cross2014-02-141-1/+0
|\ \ \
| * | | libeffects: don't set module pathColin Cross2014-02-131-1/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | Setting the module path breaks multilib builds where there may be two different module paths for 32-bit and 64-bit, and there is no need to set it to the default. Change-Id: I95d62b5573a0bb0ab6c97649041dfc4309cbc8b9
* | | Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-133-12/+31
|\ \ \
| * | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-133-12/+31
|/ / / | | | | | | | | | | | | | | | | | | Eventually we may want to use uint64_t, but will need to confirm atomicity. Bug: 12381724 Change-Id: Ia2c591d262d22b47b6f7dab4b9d9faa14b86d865
* | | Merge "avcenc: Only do startcode escaping if the next byte requires it"Lajos Molnar2014-02-111-6/+9
|\ \ \
| * | | avcenc: Only do startcode escaping if the next byte requires itMartin Storsjo2014-02-111-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Section 7.4.1 in the H.264 standard says that the only valid bytes to follow a sequence that starts with 0x000003 are 0x00, 0x01, 0x02 or 0x03. This makes EncodeDecodeTest pass properly when decoding using OMX.google.h264.decoder, which is strict about the forbidden escape sequences. Change-Id: Ice113d9b934015003ea9cb10d0b21cee4d18d774
* | | | Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-1159-187/+219
|\ \ \ \
| * | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1159-187/+219
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | | | Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: Ie06db81d422bb4eee7dfc10abb8d03001627af4c
* | | | Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"Glenn Kasten2014-02-104-26/+5
|\ \ \ \
| * | | | AudioFlinger: Remove code for supporting resampling in fast tracksMartin Storsjo2014-02-054-26/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't used at the moment. Change-Id: I4e0fb2af5f7d959dbafd5ddb7defa1c6b8e8636a
* | | | | Merge "AudioTrack: Never try to use the fast path if resampling is required"Glenn Kasten2014-02-103-5/+6
|\ \ \ \ \ | |/ / / /
| * | | | AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-313-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless AudioFlinger was built with FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE enabled, AudioFlinger would deny using the fast path (and internally fall back to the normal codepath) when it realized that resampling was required. Since the buffer size calculations within AudioFlinger don't take resampling into account properly (see the calculation below "AUDIO_OUTPUT_FLAG_FAST denied" in audioflinger/Threads.cpp, just below the hunk that this patch changes), make sure AudioTrack doesn't try to use the fast path if resampling is required. This removes the possibility to enable FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE in AudioFlinger since it AudioTrack now won't even try to use the fast path for content that requires resampling, regardless of the AudioFlinger configuration. Change-Id: Icf0f8ad50bf0fdb84657f518c0120aa0535f23f9
* | | | | Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
|\ \ \ \ \
| * | | | | avcenc: Update video port parameters in the base classMartin Storsjo2013-11-211-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that the right parameters are returned on both input and output ports if queried after setting. This also makes sure that the output MediaFormat from the MediaCodec class contains the right video size. Change-Id: I0667b3b4c6bb90331ad0ae7d51388e1bca3d1bbd
* | | | | | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2013-11-253-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the code actually match an existing comment in DrmInitialization, which claimed that mURI was the redirected URL and not the original one. Change-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3
* | | | | | Merge "SoftVPXEncoder: Set the frame size on the output port as well"Lajos Molnar2014-02-101-0/+3
|\ \ \ \ \ \
| * | | | | | SoftVPXEncoder: Set the frame size on the output port as wellMartin Storsjo2013-11-251-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure the MediaCodec output MediaFormat contains the right width and height. Change-Id: Ic97af3b5850ebaf563533c3d1cae992be3e4d074
* | | | | | Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-101-1/+1
|\ \ \ \ \ \
| * | | | | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I09f8deb40b8b34efd4bfcfab6866b7780f8bae96
* | | | | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL"Marco Nelissen2014-02-101-12/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-02-051-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
* | | | | | Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-064-5/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
* | | | | Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
|\ \ \ \ \
| * | | | | audioflinger: conform inline ASM to UALsynergy dev2014-02-041-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang requires some inline ASM to conform to the UAL standards (Unified Assembler Language). This fixes a small issue in this inline asm to allow building. Change-Id: Ifd9b1814343ab5ade636b9401a21d575559dac16
* | | | | Merge "correct one logic error in decide whether should render or not"Lajos Molnar2014-02-032-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ie41663f6fd5a7d983279f14a2228cb57231771bf Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
* | | | Merge "fix deadlock issues that arise when there are simultaneous effect ↵Eric Laurent2014-01-316-55/+88
|\ \ \ \ | | | | | | | | | | | | | | | control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds"
| * | | | 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
generated by cgit v1.1 at 2024-05-19 19:02:34 +0000