frameworks-av

Fork

Merge change 23835 into eclair

* 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.

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.

am f6190284: Merge change 23715 into eclair

Merge commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b' into eclair-plus-aosp

* commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b':
Setting the component role appears to be mandatory now for all mime types.

am 8e65337d: Merge change 23714 into eclair

Merge commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8' into eclair-plus-aosp

* commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8':
Some work to make audio encoding work.

Setting the component role appears to be mandatory now for all mime types.

Also using CODEC_LOGV instead of vanilla LOGV to include the component name the message related to.

Some work to make audio encoding work.

am 040571aa: Merge change 23632 into eclair

Merge commit '040571aa2f71031376ff37ffa827d3612eb89340' into eclair-plus-aosp

* commit '040571aa2f71031376ff37ffa827d3612eb89340':
Increase buffer allocated to receive HTTP response, YouTube is rather verbose...

Merge change 23632 into eclair

* changes:
Increase buffer allocated to receive HTTP response, YouTube is rather verbose...

am 854bcb95: Merge change 23539 into eclair

Merge commit '854bcb95ce5d8d75b843e8da1b691fa93395977c' into eclair-plus-aosp

* commit '854bcb95ce5d8d75b843e8da1b691fa93395977c':
Squashed commit of the following:

Increase buffer allocated to receive HTTP response, YouTube is rather verbose...

Yes, I know, fixed buffers are bad.

Squashed commit of the following:

commit c45bfbb97ccd05982008df47181f9c73abaf0497
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:58:12 2009 -0700

This quirk should not be enabled by default in order to make the bug reproducible by the vendor.

commit 21d72e80e795fcae53d9c3bcc8ba6312b081e420
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:55:45 2009 -0700

Undoing the hack to temporarily give up the lock to facilitate reading from the buffer source.

This simply causes too many issues, there need to be independent threads providing input buffers and dequeuing output buffers.

commit 84d507def8999c146ce124cc8edfe106c9ca70c2
Author: Andreas Huber <andih@google.com>
Date: Tue Sep 1 15:16:23 2009 -0700

The AAC components appear to output stereo data even if the input data is mono...

merge from open-source master

am bf1071c0: Merge change 23356 into eclair

Merge commit 'bf1071c07979b03a9f5e8281aba82ed05513185e' into eclair-plus-aosp

* commit 'bf1071c07979b03a9f5e8281aba82ed05513185e':
Temporarily unlock our mutex while fetching a buffer from the upstream source.

Temporarily unlock our mutex while fetching a buffer from the upstream source.

am 421f5f71: Merge change 23169 into eclair

Merge commit '421f5f71363a40e2d5bc7633b7faeb6b9bfc9fbe' into eclair-plus-aosp

* commit '421f5f71363a40e2d5bc7633b7faeb6b9bfc9fbe':
More assert => CHECK

Merge change 23169 into eclair

* changes:
More assert => CHECK

am 4b027f12: Merge change 23165 into eclair

Merge commit '4b027f128fea32bfcabee55bf4d994400453c00c' into eclair-plus-aosp

* commit '4b027f128fea32bfcabee55bf4d994400453c00c':
Fixes a race condition between entering ERROR state and initial buffer submit.

More assert => CHECK

Fixes a race condition between entering ERROR state and initial buffer submit.

am 01248f0f: Merge change 23103 into eclair

Merge commit '01248f0f18b681b69745ad716deff78a7c9e9adc' into eclair-plus-aosp

* commit '01248f0f18b681b69745ad716deff78a7c9e9adc':
Fixing the build.

Fixing the build.

am bf8ecd7c: Merge change 22991 into eclair

Merge commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be' into eclair-plus-aosp

* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
Apparently setting the preferred role of the OMX component is now required on this platform.

Merge change 22991 into eclair

* changes:
Apparently setting the preferred role of the OMX component is now required on this platform.

Apparently setting the preferred role of the OMX component is now required on this platform.

am c1dccce7: Merge change 22986 into eclair

Merge commit 'c1dccce74104c5ababb1118fda3ea43974adbad4' into eclair-plus-aosp

* commit 'c1dccce74104c5ababb1118fda3ea43974adbad4':
Squashed commit of the following:

Merge change 22986 into eclair

* changes:
Squashed commit of the following:

am 5352e237: Merge change 22968 into eclair

Merge commit '5352e237cad365f39c87aaeda3822c891c7ca474' into eclair-plus-aosp

* commit '5352e237cad365f39c87aaeda3822c891c7ca474':
Fix a typo.

Squashed commit of the following:

commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:48:54 2009 -0700

Getting rid of more code now obsolete with the departure of OMXDecoder.

commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:33:06 2009 -0700

Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.

Fix a typo.

am e18d4d01: Merge change 22938 into eclair

Merge commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851' into eclair-plus-aosp

* commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851':
Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.