summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into eclairMathias Agopian2009-10-079-141/+380
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb' into eclair-plus-aosp * commit '9d6a685ba939f413a8d3e1e97627593aa1cdf6cb': fix [2168528] enable glTexImage2D code path in SF for software-only buffers fix [2168531] have software-only gralloc buffer side-step the HAL fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
| * \ \ \ \ am 962f2536: Merge change I547cff66 into eclairWu-cheng Li2009-10-073-2/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '962f253665e0c5cc8a29de9e59ce3992dad02440' into eclair-plus-aosp * commit '962f253665e0c5cc8a29de9e59ce3992dad02440': Add zoom functions and sendCommand.
| * \ \ \ \ \ am c39d2e3c: Music visualizer support hack. This currently assumes 44k ↵Marco Nelissen2009-10-072-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb. Merge commit 'c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-plus-aosp * commit 'c39d2e3c012fb96999991e30659a474f9f30f789': Music visualizer support hack.
| * \ \ \ \ \ \ am f8e4bc9f: Merge change I0c4cec7e into eclairMathias Agopian2009-10-071-7/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-plus-aosp * commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70': Attempt to fix [2152536] ANR in browser
* | \ \ \ \ \ \ \ am f894d111: Merge change I6c32aa75 into eclair-mr2Andreas Huber2009-10-071-0/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f894d111c8c1ad9038c2d434e1cd78616a6bda0a' into eclair-mr2-plus-aosp * commit 'f894d111c8c1ad9038c2d434e1cd78616a6bda0a': Workaround for avc decoder misreporting output buffer size requirements if the content is not a multiple-16 width/height.
| * | | | | | | | Workaround for avc decoder misreporting output buffer size requirements if ↵Andreas Huber2009-10-071-0/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | the content is not a multiple-16 width/height.
* | | | | | | | am 5fd0ea8f: am 26fe45dc: Merge change I4961c959 into eclairMathias Agopian2009-10-061-7/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5fd0ea8fb4827cdf183fe3c5c7f11bfd9c94d895' into eclair-mr2-plus-aosp * commit '5fd0ea8fb4827cdf183fe3c5c7f11bfd9c94d895': fix [2152536] ANR in browser
| * | | | | | | Merge change I4961c959 into eclairAndroid (Google) Code Review2009-10-061-7/+13
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * changes: fix [2152536] ANR in browser
| | * | | | | | fix [2152536] ANR in browserMathias Agopian2009-10-061-7/+13
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A window is created and the browser is about to render into it the very first time, at that point it does an IPC to SF to request a new buffer. Meanwhile, the window manager removes that window from the list and the shared memory block it uses is marked as invalid. However, at that point, another window is created and is given the same index (that just go freed), but a different identity and resets the "invalid" bit in the shared block. When we go back to the buffer allocation code, we're stuck because the surface we're allocating for is gone and we don't detect it's invalid because the invalid bit has been reset. It is not sufficient to check for the invalid bit, I should also check that identities match.
* | | | | | | am 4e362817: am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, ↵Eric Laurent2009-10-061-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hissing (audio latency too high). Merge commit '4e362817ab49da3325531e1213e70ec6bbe32084' into eclair-mr2-plus-aosp * commit '4e362817ab49da3325531e1213e70ec6bbe32084': Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).
| * | | | | | Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too ↵Eric Laurent2009-10-061-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | high). This change is a complement to the main fix in kernel driver for the same issue (partner change #1250). It removes clicks sometimes heard after the end of the tones while audio flinger is sending 0s to the audio output stream. The problem was that the sleep time between two writes was more than the duration of one audio output stream buffer which could cause some underrun. Also fixed a recent regression in ToneGenerator that made that the end of previous tone was repeated at the beginning of current one under certain timing circumstances when the maximum tone duration was specified.
* | | | | | am 0ef55540: am 9d6a685b: Merge changes I430cf57b,I51f02f67,I464f13f3 into ↵Mathias Agopian2009-10-069-141/+380
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eclair Merge commit '0ef55540ab75660c58b284415ebae7ea66684706' into eclair-mr2-plus-aosp * commit '0ef55540ab75660c58b284415ebae7ea66684706': fix [2168528] enable glTexImage2D code path in SF for software-only buffers fix [2168531] have software-only gralloc buffer side-step the HAL fix [2167050] glTexImage2D code path buggy in SurfaceFlinger
| * | | | | fix [2168531] have software-only gralloc buffer side-step the HALMathias Agopian2009-10-061-0/+83
| | | | | |
| * | | | | fix [2167050] glTexImage2D code path buggy in SurfaceFlingerMathias Agopian2009-10-068-141/+297
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When EGLImage extension is not available, SurfaceFlinger will fallback to using glTexImage2D and glTexSubImage2D instead, which requires 50% more memory and an extra copy. However this code path has never been exercised and had some bugs which this patch fix. Mainly the scale factor wasn't computed right when falling back on glDrawElements. We also fallback to this mode of operation if a buffer doesn't have the adequate usage bits for EGLImage usage. This changes only code that is currently not executed. Some refactoring was needed to keep the change clean. This doesn't change anything functionaly.
* | | | | am 80fff7a5: am 962f2536: Merge change I547cff66 into eclairWu-cheng Li2009-10-063-2/+19
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '80fff7a5897a6b2045d9382da73d7df167c7891a' into eclair-mr2-plus-aosp * commit '80fff7a5897a6b2045d9382da73d7df167c7891a': Add zoom functions and sendCommand.
| * | | | Add zoom functions and sendCommand.Wu-cheng Li2009-10-063-2/+19
| | |_|/ | |/| | | | | | | | | | b2060030
* | | | am a97402e1: am c39d2e3c: Music visualizer support hack. This currently ↵Marco Nelissen2009-10-062-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb. Merge commit 'a97402e1cbadbdc874afa9ffdbd23f1c62fb8177' into eclair-mr2-plus-aosp * commit 'a97402e1cbadbdc874afa9ffdbd23f1c62fb8177': Music visualizer support hack.
| * | | Music visualizer support hack.Marco Nelissen2009-10-062-0/+5
| | |/ | |/| | | | | | | This currently assumes 44k stereo (won't crash on other formats, but won't give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
* | | Merge branch 'eclair-plus-aosp' of ↵Patrick Scott2009-10-051-1/+1
|\ \ \ | |/ / |/| / | |/ ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
| * am fe1a86df: Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.Wu-cheng Li2009-09-281-5/+7
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b' into eclair-plus-aosp * commit 'fe1a86df8b1c23e3290f96dce69984bf979a462b': Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.
| * \ am 8de57d8f: Add camera parameter key constants and documentation.Wu-cheng Li2009-09-251-1/+193
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8de57d8fa346522404c2064a78e8f24a5aa3bf23' into eclair-plus-aosp * commit '8de57d8fa346522404c2064a78e8f24a5aa3bf23': Add camera parameter key constants and documentation.
| * \ \ am e9bd4788: Merge change 26881 into eclairEric Laurent2009-09-251-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e9bd4788d4370714374d833aed1339d17c5ded09' into eclair-plus-aosp * commit 'e9bd4788d4370714374d833aed1339d17c5ded09': Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
| * \ \ \ am 60b69cd7: Merge change 26691 into eclairMathias Agopian2009-09-231-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '60b69cd70e9fe5b6d2d73547748e93287a0a7493' into eclair-plus-aosp * commit '60b69cd70e9fe5b6d2d73547748e93287a0a7493': fix [2132563] stuck in boot animation (framebuffer_device_open: Failed to create flip chain)
| * \ \ \ \ am 39a5ba90: Merge change 25629 into eclairMathias Agopian2009-09-171-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '39a5ba90a4939cfdd23ecd10f73a77a75679b13e' into eclair-plus-aosp * commit '39a5ba90a4939cfdd23ecd10f73a77a75679b13e': Android side of the fix for [2121211] Sholes has stutter during animations
| * \ \ \ \ \ am bcef9ac3: add basic time stats for surfaces lock timeMathias Agopian2009-09-171-8/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669' into eclair-plus-aosp * commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669': add basic time stats for surfaces lock time
| * \ \ \ \ \ \ merge from open-source masterJean-Baptiste Queru2009-09-161-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Update comment in mediaplayer.h.Ravi K Yenduri2009-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sending a MEDIA_INFO message, the second integer is supposed to be an "info" code instead of an "error" code.
| | * | | | | | | merge from donutJean-Baptiste Queru2009-09-031-0/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | donut snapshotJean-Baptiste Queru2009-08-311-0/+12
| | | | | | | | | |
| | * | | | | | | | Merge change 11106Android Code Review2009-08-251-0/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Calculate specular lighting correctly
| | | * | | | | | | | Calculate specular lighting correctlyMartin Storsjo2009-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the lighting calculations are done in object space, the vector from the object to the viewer also needs to be transformed to object space.
| | * | | | | | | | | Merge change 10274Android Code Review2009-08-211-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Ignore pause and seek for live streaming.
| | | * | | | | | | | Ignore pause and seek for live streaming.Ravi K Yenduri2009-06-041-0/+1
| | | | | | | | | | |
| | | * | | | | | | | Change required for OpenCORE 2.04 UpdateGarret Pick2009-05-201-2/+1
| | | | | | | | | | |
| | | * | | | | | | | Merge commit 'korg/cupcake'The Android Open Source Project2009-04-141-6/+6
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Enable OpenCORE on master - part 1Ravi K Yenduri2009-03-311-1/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Add a virtual destructor to the TtsEngine class.Marco Nelissen2009-08-051-0/+2
| | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | donut snapshotJean-Baptiste Queru2009-07-311-2/+4
| | | | | | | | | | |
| | * | | | | | | | | donut snapshotJean-Baptiste Queru2009-07-295-35/+176
| | | | | | | | | | |
| | * | | | | | | | | donut snapshotJean-Baptiste Queru2009-07-2121-238/+698
| | | | | | | | | | |
| | * | | | | | | | | donut snapshotJean-Baptiste Queru2009-05-208-122/+304
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | AI 145382: API review: change new media keycode names to avoid ambiguity.Dianne Hackborn2009-04-091-6/+6
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the key maps. During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...! So this is now changed to match. BUG=1779435 Automated import of CL 145382
| | * | | | | | | Automated import from //branches/cupcake/...@142889,142889Eric Laurent2009-03-261-0/+1
| | | | | | | | |
| | * | | | | | | Automated import from //branches/cupcake/...@142873,142873Mathias Agopian2009-03-252-2/+7
| | | | | | | | |
| | * | | | | | | auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-193-0/+3
| | | | | | | | |
* | | | | | | | | Attempt to fix [2152536] ANR in browserMathias Agopian2009-10-021-7/+9
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ANR is caused by SurfaceFlinger waiting for buffers of a removed surface to become availlable. When it is removed from the current list, a Surface is marked as NO_INIT, which causes SF to return immediately in the above case. For some reason, the surface here wasn't marked as NO_INIT. This change makes the code more robust by always (irregadless or errors) setting the NO_INIT status in all code paths where a surface is removed from the list. Additionaly added more information in the logs, should this happen again.
* | | | | | | | Change FLASH_MODE_VIDEO_LIGHT to FLASH_MODE_TORCH.Wu-cheng Li2009-09-281-5/+7
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Add camera parameter key constants and documentation.Wu-cheng Li2009-09-251-1/+193
| |_|_|_|_|/ |/| | | | |
* | | | | | Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes ↵Eric Laurent2009-09-241-1/+2
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or over A2DP. When the AudioTrack callback notification size is relatively high (Which is the case on Sholes and over A2DP), it is likely that the end of tone is reached during the first callback. In this case, the AudioTrack is stopped before exiting the callback which causes 2 problems: - 1: If the AudioFlinger thread is scheduled before we exit the ToneGenerator callback, the track can be stopped and reset before the data is actually marked as present in the buffer by the AudioTrack callback => no audio will be processed by AudioFlinger. - 2: In this case, the data write index in the AudioTrack buffer is incremented after the track was reset by the AudioFlinger which leaves unplayed data in the buffer. This data will be played the next time the AudioTrack is started if not flushed in between. The fix consists in adding an intermediate state to ToneGenerator state machine so that we exit the callback function when the stop condition is reached and stop the AudioTrack the next time we execute the callback.
* | | | | fix [2132563] stuck in boot animation (framebuffer_device_open: Failed to ↵Mathias Agopian2009-09-231-0/+4
| |_|_|/ |/| | | | | | | | | | | create flip chain)