summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am e0dc80f8: Merge "Support for customizable socket-read timeouts through ↵Andreas Huber2010-05-121-0/+1
|\ | | | | | | | | | | | | | | | | the HTTP response." into froyo Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp * commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc': Support for customizable socket-read timeouts through the HTTP response.
| * Support for customizable socket-read timeouts through the HTTP response.Andreas Huber2010-05-111-0/+1
| | | | | | | | | | | | | | | | | | Specify a response header of "X-SocketTimeout: 15" to override the default timeout of 5 secs with a timeout of 15 seconds. Specify a negative value to disable the timeout altogether. Change-Id: I545adf3d8b3f7efe5f8d081a641c6404440a77db related-to-bug: 2675721
* | am 78624e41: Add remove method in CameraParameters class.Wu-cheng Li2010-05-121-9/+2
|\ \ | |/ | | | | | | | | | | Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp * commit '78624e41da166712aaa5ae47e4d3467337ac810a': Add remove method in CameraParameters class.
| * Add remove method in CameraParameters class.Wu-cheng Li2010-05-111-9/+2
| | | | | | | | | | bug:2672651 Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
* | am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support ↵Andreas Huber2010-05-103-1/+8
|\ \ | |/ | | | | | | | | | | | | | | approximate seeking." into froyo Merge commit 'd13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp * commit 'd13efb20089e44e6958cb9704864c03821f19e1c': A new OggExtractor/VorbisDecoder combo to support approximate seeking.
| * A new OggExtractor/VorbisDecoder combo to support approximate seeking.Andreas Huber2010-05-073-1/+8
| | | | | | | | | | Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95 related-to-bug: 2654400
* | am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyoDan Egnor2010-05-061-1/+0
|\ \ | |/ | | | | | | | | | | Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp * commit '8a8658a5de261c2da72d431940877bd054bc9837': Make static versions of libutils and libbinder.
| * Merge "Make static versions of libutils and libbinder." into froyoDan Egnor2010-05-061-1/+0
| |\
| | * Make static versions of libutils and libbinder.Dan Egnor2010-05-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some small static-initialization-order issues (and a static- initializers-missing issue) that result from doing so. The static libraries don't actually get used for anything real at the moment -- they're used for perf tests of bug 2660235. Bug: 2660235 Change-Id: Iee2f38f79cc93b395e8d0a5a144ed92461f5ada0
* | | am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into ↵Andreas Huber2010-05-063-4/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | froyo Merge commit '100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp * commit '100ef9bee48c9beb83d885d233de6a42c64f55af': Disable vorbis seek when streaming from localhost.
| * | Disable vorbis seek when streaming from localhost.Andreas Huber2010-05-063-4/+13
| |/ | | | | | | | | Change-Id: Icda523ae1c89e26482f1c1767fe3a8b9222bb30f related-to-bug: 2654400
* | merge from open-source masterThe Android Open Source Project2010-05-051-1/+5
|\ \ | | | | | | | | | Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
| * | Add new keycodes for the convenience of Japanese IMEsmogimo2010-05-051-1/+5
| | | | | | | | | | | | Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
* | | am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyoAndreas Huber2010-05-041-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp * commit 'e083d0a2f50906423ab548047d436c74648fc488': Support for Ogg Vorbis decoding in stagefright.
| * | Support for Ogg Vorbis decoding in stagefright.Andreas Huber2010-05-041-0/+1
| | | | | | | | | | | | | | | | | | | | | Set the magic property media.stagefright.enable-vorbis to true to use the new implementation instead of the standalon vorbis player for file-based playback. HTTP streaming of vorbis content will always go through stagefright. Change-Id: Ie3843a99fadb22372f89540d0f8d65196e0c2af8 related-to-bug: 2654400
* | | merge from open-source masterThe Android Open Source Project2010-04-211-7/+10
|\ \ \ | | |/ | |/| | | | Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
| * | Allow META* macros outside of the frameworkMichael Richardson2010-04-201-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The META* macros are useful outside of the framework for other systems implementing Binder interfaces, but they depend upon the android namespace. This includes the appropriate namespace operations, which should be sane even in that android namespace. Change-Id: If600156c65191f51f487d0ee301d9f9f532b263d
* | | am 0a4ab1b9: Merge "fix [2599939] "cannot play video" after open/close a ↵Mathias Agopian2010-04-193-5/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | video player a dozen of times" into froyo Merge commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa' into froyo-plus-aosp * commit '0a4ab1b9b4c7b891c1ecb67eed99e9c9b30c93aa': fix [2599939] "cannot play video" after open/close a video player a dozen of times
| * | fix [2599939] "cannot play video" after open/close a video player a dozen of ↵Mathias Agopian2010-04-193-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | times get rid off the MAP_ONCE flag is MemoryHeapBase (as well as it's functionality), this feature should not be used anymore. the software renderer was incorrectly using the default ctor which set MAP_ONCE, causing the leak. the software renderer itself is incorrectly used while coming back from sleep. Change-Id: I123621f8d140550b864f352bbcd8a5729db12b57
* | | am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP ↵Andreas Huber2010-04-121-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo Merge commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp * commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194': Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
| * | Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we ↵Andreas Huber2010-04-121-0/+1
| | | | | | | | | | | | | | | | | | | | | don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks. Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af related-to-bug: 2587341
* | | am c58b4232: Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.Wu-cheng Li2010-04-101-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92' into froyo-plus-aosp * commit 'c58b42327df5fbc826e2fcc2674ab6db0edfcd92': Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.
| * | Add SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.Wu-cheng Li2010-04-101-0/+7
| | | | | | | | | | | | | | | bug:2544367 Change-Id: If122a7745e080f9e4bffb15dc4930d71f0421867
* | | am eb12e45f: Merge "Refactor connection/redirection code, support redirects ↵Andreas Huber2010-04-081-3/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | on reconnection." into froyo Merge commit 'eb12e45f7a92fd424988451256c82605d086245d' into froyo-plus-aosp * commit 'eb12e45f7a92fd424988451256c82605d086245d': Refactor connection/redirection code, support redirects on reconnection.
| * | Refactor connection/redirection code, support redirects on reconnection.Andreas Huber2010-04-081-3/+2
| | | | | | | | | | | | | | | Change-Id: Id2517568000e028b01553c06a4893813a6883168 related-to-bug: 2580785
* | | merge from open-source masterThe Android Open Source Project2010-04-081-1/+5
|\ \ \ | |/ / |/| / | |/ Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
| * Add keycodes PageUp and PageDownChih-Wei Huang2010-04-021-1/+5
| | | | | | | | | | | | This is useful for applications like web browser. Change-Id: Ie9262d5b75de87ecd0971407a7c3ce9aa6e4998e
* | Increase the size of the pages used in CachingDataSource (total amount of ↵Andreas Huber2010-04-081-1/+1
| | | | | | | | | | | | | | memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection. Change-Id: Ic9a6ef204362bc9afdc61e081c76bc62e5ef92ad related-to-bug: 2580785
* | Coalesce multiple encoded AAC frames into a single input buffer on this ↵Andreas Huber2010-04-021-10/+13
| | | | | | | | | | | | | | particular OMX codec to increase throughput significantly. Change-Id: I90c7db6656a53339c5d454336548c4f00d0d9064 related-to-bug: 2548426
* | Public API changes for CameraProfile and CamcorderProfile classesJames Dong2010-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 1. CamcorderProfile: “@see” links are broken; Remove m prefix from fields; remove “final” 2. CamcorderProfile.Quality: use an int rather than an enum 3. Add API on MediaRecorder to pass in a CamcorderProfile 4. CameraProfile.getImageEncodingQualityLevels @hide or make it consistent with CamcorderProfile 5. Remove a convenient method and instead let the (mms) app do that task bug - 2553862 Change-Id: I759215c7892f772aeddf3651d17038489c6fbc50
* | fix [2545826] calling into gralloc with external lock heldMathias Agopian2010-03-251-1/+0
| | | | | | | | Change-Id: I2d0e017382404c684c768a0dd0423d574213f10a
* | libutils Condition are now PRIVATE by defaultMathias Agopian2010-03-191-1/+18
| | | | | | | | | | | | | | | | | | | | | | Condition must be initialized with SHARED for the old behavior, where they can be used accross processes. Updated the two places android that require SHARED conditions. PRIVATE conditions (and mutexes) use more efficient syscalls. Change-Id: I9a281a4b88206e92ac559c66554e886b9c62db3a
* | Update TTS plugin interface to receive engine configuration dataJean-Michel Trivi2010-03-181-15/+8
| | | | | | | | | | | | coming from the plugin helper code (handling config and preferences). Change-Id: Ibc1d229463f11f8977552d74d1fd2aa6a6cab88e
* | While streaming media data, upon a socket-read error, try reconnecting to ↵Andreas Huber2010-03-171-1/+7
| | | | | | | | | | | | | | the server and attempt to re-read for at most 3 times. Change-Id: I7534905e07a6456d18b26d5d60fa8915f25ae99e related-to-bug: 2492187
* | Properly handle errors during the codec configuration phase, attempt to ↵Andreas Huber2010-03-161-1/+3
| | | | | | | | | | | | | | revert to next available (likely software-) codec if configuration fails. Change-Id: Id1c699711e30139c9cc29df972254b5ba026e6fb related-to-bug: 2517098
* | Fix the media metadata retriever (tests). The native constants must match ↵Andreas Huber2010-03-122-2/+8
| | | | | | | | | | | | those published at the java layer. Change-Id: Ic1efed709e4d93c61913b231a8cd3ef1074f8ca0
* | Merge "HTTPStream and HTTPDataSource now support cancellation of the ↵Andreas Huber2010-03-121-5/+18
|\ \ | | | | | | | | | connection process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership."
| * | HTTPStream and HTTPDataSource now support cancellation of the connection ↵Andreas Huber2010-03-121-5/+18
| | | | | | | | | | | | | | | | | | | | | process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership. Change-Id: I6d73defe6d276693853a469db267bb2668d07af5 related-to-bugs: 2475845,2414536
* | | implement connect/disconnect in our native_window_t implementationsMathias Agopian2010-03-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | the framebuffer implementation doesn't do anything special with this but the surfaceflinger implementation makes sure the surface is not used by two APIs simultaneously. Change-Id: Id4ca8ef7093d68846abc2ac814327cc40a64b66b
* | | Add a new connect/disconnect API to android_native_window_tMathias Agopian2010-03-111-1/+37
|/ / | | | | | | | | | | it's used to keep track of which API owns the surface. Change-Id: I1021c5905c020efc3c428e561b38189377168b22
* | Reduce buffer sizes related to HTTP media data transfer in order to reduce ↵Andreas Huber2010-03-101-1/+1
| | | | | | | | | | | | | | the probability of a connection timeout/reset due to long periods of time between socket activity. Change-Id: I799ce1d58d56a31088a89603d8a18d24780f5b57 related-to-bug: 2492187
* | Merge "Instead of instantiating StagefrightMetadataRetriever directly, ↵Andreas Huber2010-03-101-2/+2
|\ \ | | | | | | | | | instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files."
| * | Instead of instantiating StagefrightMetadataRetriever directly, instantiate ↵Andreas Huber2010-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files. Change-Id: Ibda4b5268514934f14a3d49a564902bc670f4384 related-to-bug: 2074137
* | | Add ability for some manifest attributes to reference resources.Dianne Hackborn2010-03-091-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | This loosens our restriction on many manifest attributes requiring literal string values, to allow various ones to use values from resources. This is only allowed if the resource value does not change from configuration changes, and the restriction is still in place for attributes that are core to security (requesting permissions) or market operation (used libraries and features etc). Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
* | Merge "Add camera parameter string constant for "true"."Wu-cheng Li2010-03-081-0/+3
|\ \
| * | Add camera parameter string constant for "true".Wu-cheng Li2010-03-081-0/+3
| | | | | | | | | | | | | | | bug:2458926 Change-Id: I11eaae8ff031765e23f2627ded5873eabc09cead
* | | The audio track was accidentally not participating in the prefetch since it ↵Andreas Huber2010-03-081-1/+1
|/ / | | | | | | | | | | | | wasn't started at the time prepare() was called. Also, properly report the cached duration even near the end when the source has no more data to fetch. Change-Id: I66a92fec24c9bfb25f1c186f1c877127bae2b4f9 related-to-bug: 2444425
* | Refactor car mode.Dianne Hackborn2010-03-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract all UI behavior from dock observer and ACTION_DOCK_EVENT. Also introduce a desk type to go along with the car type all through the resource system, since we now need to have corresponding high-level broadcasts for desk dock mode. As part of that I also reworked some of the logic for switching modes to all funnel through a single update() call that looks all of the current state to decide what to do next, and fixed various locking issues. In addition I found there were bugs in the configuration change handling causing us to only switch into the car mode config and then never get out of it. Unfortunately now that we are actually changing the configuration for each mode change, the transitions between them are really crummy as we restart all kinds of activities. :(
* | Add location provider name to gps-processing-method in EXIF header.Ray Chen2010-03-051-0/+3
| |
* | Issue 2071329: audio track is shorter than video track for video capture on ↵Eric Laurent2010-03-023-0/+12
| | | | | | | | | | | | | | | | sholes Add API to retrieve number of frames dropped by audio input kernel driver. Submitted on behalf of Masaki Sato <masaki.sato@motorola.com>