summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am 9dba1f92: Merge change Ib482ce88 into eclair-mr2Andreas Huber2009-10-291-0/+2
|\ | | | | | | | | | | | | Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp * commit '9dba1f928021450f101013e03deacc9a0506772e': Revive support for video encoding in OMXCodec.
| * Merge change Ib482ce88 into eclair-mr2Android (Google) Code Review2009-10-291-0/+2
| |\ | | | | | | | | | | | | * changes: Revive support for video encoding in OMXCodec.
| | * Revive support for video encoding in OMXCodec.Andreas Huber2009-10-291-0/+2
| | |
* | | am 893cb4da: am 73e17015: Merge change I8d2de438 into eclairMathias Agopian2009-10-291-2/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '893cb4da1034870a8814394a1c3bdac10ca6cadf' into eclair-mr2-plus-aosp * commit '893cb4da1034870a8814394a1c3bdac10ca6cadf': fix [2143798] Need to figure out how to do video
| * | am 73e17015: Merge change I8d2de438 into eclairMathias Agopian2009-10-291-2/+12
| |\ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-mr2 * commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694': fix [2143798] Need to figure out how to do video
| | * fix [2143798] Need to figure out how to do videoMathias Agopian2009-10-271-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use EGLImageKHR instead of copybit directly. We now have the basis to use streaming YUV textures (well, in fact we already are). When/if we use the GPU instead of the MDP we'll need to make sure it supports the appropriate YUV format. Also make sure we compile if EGL_ANDROID_image_native_buffer is not supported
* | | am 76a54294: Merge change I155e2ad0 into eclair-mr2Andreas Huber2009-10-281-13/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp * commit '76a5429407e821c22508eca92e7475b6433cd668': Re-enable CameraSource.
| * | Merge change I155e2ad0 into eclair-mr2Android (Google) Code Review2009-10-281-13/+13
| |\ \ | | | | | | | | | | | | | | | | * changes: Re-enable CameraSource.
| | * | Re-enable CameraSource.Andreas Huber2009-10-281-13/+13
| | | |
* | | | am 7ed70c95: am bf96aaad: Merge change Icf10db28 into eclairEric Laurent2009-10-242-2/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6' into eclair-mr2-plus-aosp * commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6': Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
| * | | am bf96aaad: Merge change Icf10db28 into eclairEric Laurent2009-10-242-2/+5
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-mr2 * commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba': Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
| | * Fix issue 2192181: AudioFlinger must provide separated methods to set ↵Eric Laurent2009-10-212-2/+5
| | | | | | | | | | | | | | | | | | | | | VOICE_CALL stream volume and down link audio volume. Added setVoiceVolume() method to AudioSystem, AudioFlinger, IAudioFlinger, AudioPolicyService. Removed call to AudioHardwareInterface::setVoiceVolume() from AudioFlinger::setStreamVolume().
| | * do not merge: The qcom video decoders always output yuv data after adjusting ↵Andreas Huber2009-10-201-0/+1
| | | | | | | | | | | | | | | | | | dimensions to be a multiple of 16. Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
* | | am d9f3d60d: Merge change I3b1b7873 into eclair-mr2Andreas Huber2009-10-237-15/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff' into eclair-mr2-plus-aosp * commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff': New API to instantiate a MediaExtractor given a URI and optional MIME type.
| * | New API to instantiate a MediaExtractor given a URI and optional MIME type.Andreas Huber2009-10-237-15/+27
| | | | | | | | | | | | | | | | | | Also DataSources now must provide a method initCheck() and DataSource::reat_at has been renamed to readAt to conform to standard API naming guidelines.
* | | am 9069aa31: Merge change I57515f33 into eclair-mr2Andreas Huber2009-10-233-178/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56' into eclair-mr2-plus-aosp * commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56': Moving the individual extractor headers files to the private include directory.
| * | Moving the individual extractor headers files to the private include directory.Andreas Huber2009-10-233-178/+0
| | |
* | | am e8472900: Merge change Ie13526ad into eclair-mr2Andreas Huber2009-10-231-1/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'e84729002102622b40bd6efddffb76909615c12a' into eclair-mr2-plus-aosp * commit 'e84729002102622b40bd6efddffb76909615c12a': Prefer software decoders over hardware for thumbnail extraction.
| * | Prefer software decoders over hardware for thumbnail extraction.Andreas Huber2009-10-231-1/+13
| | | | | | | | | | | | | | | | | | While our hardware decoders clearly outperform the software decoders in terms of raw throughput, their startup latency makes them less suitable for thumbnail extraction.
* | | am e981c334: Extract video thumbnails from the largest sync sample among the ↵Andreas Huber2009-10-225-4/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | first 20. Merge commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732' into eclair-mr2-plus-aosp * commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732': Extract video thumbnails from the largest sync sample among the first 20.
| * | Extract video thumbnails from the largest sync sample among the first 20.Andreas Huber2009-10-225-4/+11
| | | | | | | | | | | | Also fixes OMXCodec seek behaviour on the very first call to OMXCodec::read()
* | | am bfd5b386: Merge change If68c168d into eclair-mr2Andreas Huber2009-10-211-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp * commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe': Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
| * | Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers ↵Andreas Huber2009-10-211-1/+0
| | | | | | | | | | | | in the metadata retriever.
* | | am fe50b63f: am 7bb7e992: Merge change Ia8ac904d into eclairMathias Agopian2009-10-161-6/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe' into eclair-mr2-plus-aosp * commit 'fe50b63f9b5b7e05754e3fba3ccce69b710dbafe': fix [2182249] [MR1] valgrind error in surface flinger
| * | am 7bb7e992: Merge change Ia8ac904d into eclairMathias Agopian2009-10-161-6/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-mr2 * commit '7bb7e99216956d917af1786a3e02a92cac46fc84': fix [2182249] [MR1] valgrind error in surface flinger
| | * fix [2182249] [MR1] valgrind error in surface flingerMathias Agopian2009-10-151-6/+9
| | |
* | | am d96f6e85: Merge change I8176f35e into eclair-mr2Andreas Huber2009-10-162-20/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp * commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d': Reimplement the OMX backend for stagefright.
| * | Reimplement the OMX backend for stagefright.Andreas Huber2009-10-162-20/+20
| | | | | | | | | | | | | | | | | | Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup. Changed APIs to conform to the rest of the system.
* | | am c642199d: Merge change Ibd7b43bb into eclair-mr2Andreas Huber2009-10-139-584/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'c642199d1d60176980e2781bb78f42dce93e1c84' into eclair-mr2-plus-aosp * commit 'c642199d1d60176980e2781bb78f42dce93e1c84': Separated private from public header files.
| * | Separated private from public header files.Andreas Huber2009-10-139-584/+3
| | |
* | | am fe324a61: Merge change I8d87cd98 into eclair-mr2Andreas Huber2009-10-131-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'fe324a61c39d5db59f09fdae81c808d7851841e6' into eclair-mr2-plus-aosp * commit 'fe324a61c39d5db59f09fdae81c808d7851841e6': Fix various compiler warnings accumulated over time.
| * | Fix various compiler warnings accumulated over time.Andreas Huber2009-10-131-5/+5
| | |
* | | am cfd55579: OMXCodec now notifies the reader of changes in the output ↵Andreas Huber2009-10-133-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | format by returning a special result/error code. Merge commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e' into eclair-mr2-plus-aosp * commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e': OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
| * | OMXCodec now notifies the reader of changes in the output format by ↵Andreas Huber2009-10-133-0/+7
| | | | | | | | | | | | returning a special result/error code.
* | | am ef703f60: Merge change I98276091 into eclair-mr2Andreas Huber2009-10-121-8/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'ef703f60d5c00527048fdaf1c24984762f6fd434' into eclair-mr2-plus-aosp * commit 'ef703f60d5c00527048fdaf1c24984762f6fd434': Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
| * | Change to a int64_t usecs representation for timestamps and duration ↵Andreas Huber2009-10-121-8/+11
| | | | | | | | | | | | throughout stagefright.
* | | am 9b8f9477: Fixing the build.Andreas Huber2009-10-091-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2' into eclair-mr2-plus-aosp * commit '9b8f947790aa1dabf9eb0621d0ac8f9d189116a2': Fixing the build.
| * | Fixing the build.Andreas Huber2009-10-091-0/+2
| | |
* | | am 936fff36: Merge change Ib64cab41 into eclair-mr2Andreas Huber2009-10-092-9/+67
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '936fff36882764ec031ae4fb8338273cc2abccd5' into eclair-mr2-plus-aosp * commit '936fff36882764ec031ae4fb8338273cc2abccd5': Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
| * | Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.Andreas Huber2009-10-082-9/+67
| | |
* | | am 2d295a96: Merge change Iedebfe8d into eclair-mr2Andreas Huber2009-10-081-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5' into eclair-mr2-plus-aosp * commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5': Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
| * | Some decoders will return an error on OMX_EmptyThisBuffer to indicate that ↵Andreas Huber2009-10-081-2/+2
| | | | | | | | | | | | they don't support the media format, deal with this.
* | | am cd74c0d5: The vendor is about to check in a fix for this issue, the ↵Andreas Huber2009-10-081-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | workaround is no longer needed Merge commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp * commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9': The vendor is about to check in a fix for this issue, the workaround is no longer needed
| * | The vendor is about to check in a fix for this issue, the workaround is no ↵Andreas Huber2009-10-081-1/+0
| | | | | | | | | | | | longer needed
| * | am a2de8e31: Merge change Ie05f07df into eclairMathias Agopian2009-10-073-49/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-mr2 * commit 'a2de8e31c2693d009db1f9386406758874dd1d40': fix [2170319] gmail bulk operation checkbox latency on passion
* | | Merge branch 'eclair-plus-aosp' of ↵Mike Cleron2009-10-073-49/+2
|\ \ \ | | | | | | | | | | | | ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp
| * \ \ am a2de8e31: Merge change Ie05f07df into eclairMathias Agopian2009-10-073-49/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'a2de8e31c2693d009db1f9386406758874dd1d40' into eclair-plus-aosp * commit 'a2de8e31c2693d009db1f9386406758874dd1d40': fix [2170319] gmail bulk operation checkbox latency on passion
| | * | fix [2170319] gmail bulk operation checkbox latency on passionMathias Agopian2009-10-073-49/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also fixes [2152536] ANR in browser When SF is enqueuing buffers faster than SF dequeues them. The update flag in SF is not counted and under some situations SF will only dequeue the first buffer. The state at this point is not technically corrupted, it's valid, but just delayed by one buffer. In the case of the Browser ANR, because the last enqueued buffer was delayed the resizing of the current buffer couldn't happen. The system would always fall back onto its feet if anything -else- in tried to draw, because the "late" buffer would be picked up then.
| * | | am 26fe45dc: Merge change I4961c959 into eclairMathias Agopian2009-10-071-7/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7' into eclair-plus-aosp * commit '26fe45dcb3df12eda94d93f1473cd6a2f5f345c7': fix [2152536] ANR in browser
| * | | am 62443f5f: Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio ↵Eric Laurent2009-10-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | latency too high). Merge commit '62443f5f4517ba17d911975e695f1ab75bfdbf77' into eclair-plus-aosp * commit '62443f5f4517ba17d911975e695f1ab75bfdbf77': Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too high).