summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix issue 2285561: New AudioFlinger and audio driver API needed for ↵Eric Laurent2010-01-273-0/+13
|\ | | | | | | A/V sync"
| * Fix issue 2285561: New AudioFlinger and audio driver API needed for A/V syncEric Laurent2010-01-263-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Added getRenderPosition() API to IAudioFlinger to retreive number of audio frames written by AudioFlinger to audio HAL and by DSP to DAC. Added getRenderPosition() API to AudioHardwareInterface to retreive number of audio frames written by DSP to DAC. Exposed AudioTrack::getPosition() to AudioSink() to make it available to media player. Removed excessive log in AudioHardwareGeneric.
* | Merge "Better support for HTTP streaming media content, fixes to the way ↵Andreas Huber2010-01-273-0/+16
|\ \ | |/ |/| | | HTTPDataSource streams the data, prefetcher implementation."
| * Better support for HTTP streaming media content, fixes to the way ↵Andreas Huber2010-01-263-0/+16
| | | | | | | | | | | | HTTPDataSource streams the data, prefetcher implementation. related-to-bug: 2295438
* | Support for audio recording into AMR NB/WB files as well as audio tracks in ↵Andreas Huber2010-01-263-12/+58
|/ | | | | | MPEG4 files. related-to-bug: 2295449
* Merge "Fix issue 2378022: AudioService should direct volume control to ↵Eric Laurent2010-01-252-4/+4
|\ | | | | | | STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active."
| * Fix issue 2378022: AudioService should direct volume control to ↵Eric Laurent2010-01-252-4/+4
| | | | | | | | | | | | | | | | | | STREAM_VOICE_CALL stream when STREAM_VOICE_CALL stream is active. Modified AudioService.getActiveStreamType() so that STREAM_VOICE_CALL is selected when a track using this stream type is playing. Chanded isMusicActive() for a more generic isStreamActive(stream) method in AudioSystem, IAudioFlinger and AudioFlinger.
* | Initial checkin of AudioSource and AMRWriter, a pair of classes supporting ↵Andreas Huber2010-01-252-4/+78
|/ | | | | | pure-audio recording in stagefright. related-to-bug: 2295449
* The qcom OMX video decoders do not allocate output buffer memory at the time ↵Andreas Huber2010-01-252-0/+2
| | | | OMX_AllocateBuffer is called, wait until we received the first FILL_BUFFER_DONE notification until we rely on the buffer data ptr.
* Fix no-copy-overhead OMXCodec implementation to actually work.Andreas Huber2010-01-202-1/+7
|
* Merge "Support for 'iTunes-style' metadata in .mp4 and .3gp files."Andreas Huber2010-01-201-0/+1
|\
| * Support for 'iTunes-style' metadata in .mp4 and .3gp files.Andreas Huber2010-01-201-0/+1
| | | | | | | | related-to-bug: 2368967
* | Merge "Create base class for audio policy manager."Eric Laurent2010-01-201-0/+2
|\ \ | |/ |/|
| * Create base class for audio policy manager.Eric Laurent2010-01-131-0/+2
| | | | | | | | | | | | | | | | | | | | First implementations of audio policy manager in Eclair branch have shown that most code is common to all platforms. Creating AudioPolicyManagerBase base class will improve code maintainability and readability. Audio policy manager code for platforms using generic audio previously in AudioPolicyManagerGeneric is replaced by AudioPolicyManagerBase. Audio policy manager test code previously in AudioPolicyManagerGeneric is moved to AudioPolicyManagerBase. Also added a wake lock for delayed commands in AudioPolicyService.
* | Merge "Avoid unnecessary buffer copying if at all possible, detect if ↵Andreas Huber2010-01-192-0/+6
|\ \ | | | | | | | | | running in the mediaserver process."
| * | Avoid unnecessary buffer copying if at all possible, detect if running in ↵Andreas Huber2010-01-192-0/+6
| | | | | | | | | | | | the mediaserver process.
* | | Media server death nodificationJames Dong2010-01-153-25/+69
|/ /
* | Support for determining the mime type of media via metadata extraction.Andreas Huber2010-01-131-0/+1
| |
* | More metadata support.Andreas Huber2010-01-131-0/+3
|/
* Squashed commit of the following:Andreas Huber2010-01-123-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc Author: Andreas Huber <andih@google.com> Date: Mon Jan 11 14:55:56 2010 -0800 Support for duration metadata, midi and ogg-vorbis files (in mediascanner) commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39 Author: Andreas Huber <andih@google.com> Date: Mon Jan 11 14:20:45 2010 -0800 Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor. commit f9818dfac39c96e5fefe8c8295e60580692d5990 Author: Andreas Huber <andih@google.com> Date: Fri Jan 8 14:26:09 2010 -0800 A first pass at supporting metadata through ID3 tags. commit 476e9e253633336ab790f943e2d6c0cd8991d76a Author: Andreas Huber <andih@google.com> Date: Thu Jan 7 15:48:44 2010 -0800 Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright. related-to-bug: 2295456
* Reorganize some of the stagefright implementation related to metadata.Andreas Huber2010-01-081-0/+46
|
* am f31f365a: am eb5ffc23: Merge change Id8e98194 into eclairEric Laurent2009-12-221-1/+2
|\ | | | | | | | | | | | | Merge commit 'f31f365a7708c931e955670bc6213fdc8f91a87a' * commit 'f31f365a7708c931e955670bc6213fdc8f91a87a': Fix issues 2333450 and 2333559:
| * am eb5ffc23: Merge change Id8e98194 into eclairEric Laurent2009-12-221-1/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c' into eclair-plus-aosp * commit 'eb5ffc239b6482b9c1e046f6f5872187043d852c': Fix issues 2333450 and 2333559:
| | * Fix issues 2333450 and 2333559:Eric Laurent2009-12-221-1/+2
| | | | | | | | | | | | | | | | | | Add new config values to AudioSystem::FOR_DOCK force usage to differenciate car and desk docks. Use a receiver for the sticky Intent.ACTION_DOCK_EVENT in AudioService to detect the type of dock and select force usage accordingly.
| * | am 86ed86d2: Merge change I0f73439a into eclairJean-Michel Trivi2009-12-091-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-plus-aosp * commit '86ed86d2260932bdf2217b1d8431ac9e04d47534': Partially fix bug 2111240 Detect docking / undocking event by reporting
| * | am e7800946: Merge change I49f02be9 into eclairEric Laurent2009-11-211-3/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-plus-aosp * commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff': Issue 2265163: Audio still reported routed through earpiece on sholes
| * \ \ am f854e077: Merge change I8134d6ed into eclairAndreas Huber2009-11-191-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-plus-aosp * commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4': DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
| * \ \ \ am 1aa9f3ca: Merge change I923d7d72 into eclairEric Laurent2009-11-121-5/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-plus-aosp * commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54': Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
| * \ \ \ \ am c66d53f9: Merge change I880541a8 into eclairAndreas Huber2009-11-123-116/+35
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c66d53f97b1fe635f576642d5720dcd441e34cce' into eclair-plus-aosp * commit 'c66d53f97b1fe635f576642d5720dcd441e34cce': Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
| * \ \ \ \ \ am 05eca1d4: Merge change Ie80e2381 into eclairAndreas Huber2009-11-054-24/+24
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp * commit '05eca1d46a45723a57899dabad698537b7faef82': DO NOT MERGE: Squashed commit of the following:
| * \ \ \ \ \ \ am 67b69292: Merge change I93f500a5 into eclairEric Laurent2009-11-053-1/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp * commit '67b692920c18f99b096dce285adc6f7439fa866c': Fix issue 2203561: Sholes: audio playing out of earpiece.
| * \ \ \ \ \ \ \ am 7ed0ceeb: Merge change I6869df3a into eclairJean-Michel Trivi2009-11-041-1/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-plus-aosp * commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488': Add new audio sources to support the A1026 recording configurations.
| * \ \ \ \ \ \ \ \ am 8637759a: Merge change I36d0184e into eclairMathias Agopian2009-11-031-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-plus-aosp * commit '8637759a1d34a4adda292579d5f8790587659235': fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
| * \ \ \ \ \ \ \ \ \ am ee98c240: Merge change I73680cd9 into eclairEric Laurent2009-11-022-2/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ee98c24020c1634b02cde6d333968f04a0de941f' into eclair-plus-aosp * commit 'ee98c24020c1634b02cde6d333968f04a0de941f': Fix 2194140: [Passion] Support Audience chip.
| * \ \ \ \ \ \ \ \ \ \ am bf96aaad: Merge change Icf10db28 into eclairEric Laurent2009-10-242-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-plus-aosp * commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba': Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
| * \ \ \ \ \ \ \ \ \ \ \ am ca404dfb: Merge change Ie3ffb526 into eclairAndreas Huber2009-10-201-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-plus-aosp * commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9': do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 7bb7e992: Merge change Ia8ac904d into eclairMathias Agopian2009-10-161-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-plus-aosp * commit '7bb7e99216956d917af1786a3e02a92cac46fc84': fix [2182249] [MR1] valgrind error in surface flinger
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 082e5171: Merge change I895fb7d7 into eclair-mr2Andreas Huber2009-12-171-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d' into eclair-mr2-plus-aosp * commit '082e51712ab9c9ce94eaee88797bbdbc80b2004d': Squashed commit of the following:
| * | | | | | | | | | | | | | | Squashed commit of the following:Andreas Huber2009-12-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 144b1c40e9cf08a584c50e1bef7ba3f287e81a4f Author: Andreas Huber <andih@google.com> Date: Wed Dec 16 09:28:23 2009 -0800 This H264 file shows a certain problem even better. commit 3245f1f3b7471975aeeb824a756c987abd610f55 Author: Andreas Huber <andih@google.com> Date: Wed Dec 16 09:20:08 2009 -0800 Using only the QA testfiles now. commit 074817eb3816c5dd70858a3594e3b92d799d873b Author: Andreas Huber <andih@google.com> Date: Tue Dec 15 16:17:39 2009 -0800 Yay, roles are back again now that the API is in place. commit 6d847e4932cc38301ae27cb7283b7f1553a95457 Author: Andreas Huber <andih@google.com> Date: Tue Dec 15 13:01:20 2009 -0800 Added commandline option for specifying the random seed for reproducable tests. commit 62ab37b26336eaa67e49791c41c996acb6acee3f Author: Andreas Huber <andih@google.com> Date: Mon Dec 14 10:53:27 2009 -0800 When issuing a seek it is important that only the first MediaSource::read call has the seek option. commit e77c46644b2fb6862bafa3569f7d304252074f1e Author: Andreas Huber <andih@google.com> Date: Mon Dec 7 16:39:07 2009 -0800 Make sure the tests are actually built, sp<OMXCodec> becomes sp<MediaSource> commit 6df56915bd55a9445b3c6f953d3cc251d81579b8 Author: Andreas Huber <andih@google.com> Date: Thu Dec 3 14:25:36 2009 -0800 Temporarily disable support for querying the roles of OMX components. commit 31bb26930df9e3658dea684cedb4b0f1a06a4a88 Author: Andreas Huber <andih@google.com> Date: Tue Dec 1 13:36:52 2009 -0800 Disregard EOS events, slightly change the way the EOS flag on output buffers is handled. commit 4c382fbc9aebee8197d5988d04378062809e7c48 Author: Andreas Huber <andih@google.com> Date: Tue Dec 1 09:37:24 2009 -0800 New random seek test for the codec tests. Fixed "sticky" end-of-output-buffers flag behaviour in OMXCodec. commit c762eac3e44309592b61a168d66e091cf609fa03 Author: Andreas Huber <andih@google.com> Date: Tue Nov 3 14:13:43 2009 -0800 Fix a typo. commit 50540a59b65c7d476b0193c7494cd75895e6ca6d Author: Andreas Huber <andih@google.com> Date: Tue Nov 3 09:48:35 2009 -0800 Some more fine tuning of the unit tests, make MPEG4Extractor less verbose. commit 1157a7e52a0636706caa235abe16d2ff8a0b8140 Author: Andreas Huber <andih@google.com> Date: Wed Oct 28 12:01:01 2009 -0700 Changes to the IOMX::listNodes API, this now returns the component's roles as well, unit tests now test all components in all supported roles by default. commit 30fbf2d8c6cb927689f7ba75eb550a81e9df488a Author: Andreas Huber <andih@google.com> Date: Mon Oct 26 09:45:26 2009 -0700 Initial check-in of unit tests for OMX components.
* | | | | | | | | | | | | | | | am d980e656: Merge change Ic7e91eee into eclair-mr2Andreas Huber2009-12-151-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd980e656baa842592944c6fed371c9b37b2feea9' into eclair-mr2-plus-aosp * commit 'd980e656baa842592944c6fed371c9b37b2feea9': Add a new API to support determining the roles of an OMX component specified by name. Remove unneeded OMXSoftwareCodecsPlugin.
| * | | | | | | | | | | | | | | Add a new API to support determining the roles of an OMX component specified ↵Andreas Huber2009-12-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by name. Remove unneeded OMXSoftwareCodecsPlugin.
* | | | | | | | | | | | | | | | am 08945576: Merge change I9ac0777e into eclair-mr2Andreas Huber2009-12-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '089455760c05289c1315268a6cb896577ceebc64' into eclair-mr2-plus-aosp * commit '089455760c05289c1315268a6cb896577ceebc64': Initial checkin of software AMR NB encoder based on PV source code.
| * | | | | | | | | | | | | | | Initial checkin of software AMR NB encoder based on PV source code.Andreas Huber2009-12-111-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | am 6608bd0d: am 86ed86d2: Merge change I0f73439a into eclairJean-Michel Trivi2009-12-101-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b' into eclair-mr2-plus-aosp * commit '6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b': Partially fix bug 2111240 Detect docking / undocking event by reporting
| * | | | | | | | | | | | | | | am 86ed86d2: Merge change I0f73439a into eclairJean-Michel Trivi2009-12-101-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '86ed86d2260932bdf2217b1d8431ac9e04d47534' into eclair-mr2 * commit '86ed86d2260932bdf2217b1d8431ac9e04d47534': Partially fix bug 2111240 Detect docking / undocking event by reporting
| | * | | | | | | | | | | | | | Partially fix bug 2111240 Detect docking / undocking event by reportingJean-Michel Trivi2009-12-071-0/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the AudioPolicyManager a new forced usage AudioSystem::FOR_DOCK which can take the FORCE_NONE, FORCE_BT_DOCK or FORCE_WIRED_ACCESSORY values. This CL is complemented by an update of the APM to take into account the FOR_DOCK usage.
* | | | | | | | | | | | | | | am 5921fb51: Merge change I91eb0354 into eclair-mr2Andreas Huber2009-12-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5921fb51e0219ddd7cad439a73495f320c57d50e' into eclair-mr2-plus-aosp * commit '5921fb51e0219ddd7cad439a73495f320c57d50e': Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
| * | | | | | | | | | | | | | Change OMXCodec::Create to return an sp<MediaSource> instead of an ↵Andreas Huber2009-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
* | | | | | | | | | | | | | | am 52f410e2: Merge change Ifef6435a into eclair-mr2Andreas Huber2009-12-041-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '52f410e2ebba103220cffce05b895f0c38a56665' into eclair-mr2-plus-aosp * commit '52f410e2ebba103220cffce05b895f0c38a56665': Enable proper cleanup of OMX nodes managed through stagefright.
| * | | | | | | | | | | | | | Enable proper cleanup of OMX nodes managed through stagefright.Andreas Huber2009-12-041-0/+3
| | | | | | | | | | | | | | |