Merge commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d' into eclair-plus-aosp
* commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
Merge commit 'f84a21820b39dbfa983352b7d8ac949e560827d3' into eclair-plus-aosp
* commit 'f84a21820b39dbfa983352b7d8ac949e560827d3':
fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
Merge commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b' into eclair-plus-aosp
* commit '12d2cdcdb0eed759b0e7738cbdefaa726a71930b':
make sure conditions will return when the status of a surface is not NO_ERROR
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp
* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp
* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
Add component name to informational logging in OMXCodec.cpp
Merge commit '466dbbfd4595d714127a4bc92dd9235807b88be6' into eclair-plus-aosp
* commit '466dbbfd4595d714127a4bc92dd9235807b88be6':
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
Merge commit '546f3cd579b80299307d82a769aca8e8f68484ec' into eclair-plus-aosp
* commit '546f3cd579b80299307d82a769aca8e8f68484ec':
Support for amr-wb tracks in MPEG4Extractor.
Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp
* commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993':
Added some more verbose output for AMR formats. Properly fill out the output format.
Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp
* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp
* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
Support encoding amr-wb content in stagefright.
AudioFlinger: verify that mCblk is not null before using it in Track and RecordTrack contructors.
IAudioFlinger: check result of remote transaction before reading IAudioTrack and IAudioRecord.
IAudioTrack and IAudioRecord: check result of remote transaction before reading IMemory.
Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
Merge commit 'e0f64aae8c02088be1c67bd97afc495e9098561c' into eclair-plus-aosp
* commit 'e0f64aae8c02088be1c67bd97afc495e9098561c':
The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
Merge commit 'e05e02e17463616c885784a1f0e57eeb22b13f93' into eclair-plus-aosp
* commit 'e05e02e17463616c885784a1f0e57eeb22b13f93':
Add basic metadata retrieval support for midi, ogg, etc.
Rewrote SurfaceFlinger's buffer management from the ground-up.
The design now support an arbitrary number of buffers per surface, however the current implementation is limited to four. Currently only 2 buffers are used in practice.
The main new feature is to be able to dequeue all buffers at once (very important when there are only two).
A client can dequeue all buffers until there are none available, it can lock all buffers except the last one that is used for composition. The client will block then, until a new buffer is enqueued.
The current implementation requires that buffers are locked in the same order they are dequeued and enqueued in the same order they are locked. Only one buffer can be locked at a time.
eg. Allowed sequence: DQ, DQ, LOCK, Q, LOCK, Q
eg. Forbidden sequence: DQ, DQ, LOCK, LOCK, Q, Q
Merge commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8' into eclair-plus-aosp
* commit 'a19cb68b2d010718467564733e6eaef2aaf4d0b8':
Add another testcase for moto to reproduce bug #2099685 to the stagefright commandline app.
Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp
* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
When encountering a .nomedia file, notify the MediaScannerClient,
* changes:
When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
so that it can erase the data column for entries that are in the
folder containing the .nomedia file. This prevents us from
deleting (via a delete trigger) files when somebody adds a
.nomedia file after the fact.
Merge commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b' into eclair-plus-aosp
* commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b':
Setting the component role appears to be mandatory now for all mime types.
Merge commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8' into eclair-plus-aosp
* commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8':
Some work to make audio encoding work.
Andreas Huber
Mathias Agopian
Android (Google) Code Review
Eric Laurent
James Dong
Marco Nelissen