summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | 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
generated by cgit v1.1 at 2025-03-20 12:35:02 +0000