summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Convert the video editor performanceYu Shan Emily Lau2011-06-011-12/+11
| | | | | | test suite output from float to int. Change-Id: I62fada18a4c34d06b8d0ed91885e5bd98f12523f
* Merge "Use channel mask instead of channel count for track creation"Jean-Michel Trivi2011-06-014-41/+42
|\
| * Use channel mask instead of channel count for track creationJean-Michel Trivi2011-06-014-41/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record and playback objects (resp AudioRecord and AudioTrack) are created using a channel mask, but this information is lost in the mixer because only the channel count is known to AudioFlinger. A channel count can always be derived from a channel mask. The change consists in: - disambiguiting variable names for channel masks and counts - passing the mask information from the client to AudioFlinger and the mixer. - when using the DIRECT ouput, only verifying the format of the track is compatible with the output's for PCM. Change-Id: I50d87bfb7d7afcabdf5f12d4ab75ef3a54132c0e
* | Merge "Send estimated bandwidth value as informational event when cache ↵James Dong2011-05-3110-99/+156
|\ \ | | | | | | | | | fetcher pauses"
| * | Send estimated bandwidth value as informational event when cache fetcher pausesJames Dong2011-05-3110-99/+156
| |/ | | | | | | | | | | | | | | | | | | o Application can make informed decision about the available network bandwidth when cache fetcher pauses. o Application can also adjust how frequently the bandwidth is estimated within a range from one second to one minute. Change-Id: I90068001343e79da1886de03c565537787e1580b
* | Merge "Add some comment to MediaRecorder.stop() about the stop() failure ↵James Dong2011-05-311-0/+6
|\ \ | |/ |/| | | (-1007)"
| * Add some comment to MediaRecorder.stop() about the stop() failure (-1007)James Dong2011-05-261-0/+6
| | | | | | | | | | | | | | o The intended failure happens if stop() call comes immediately after start() call before any media data from the output of the encoder is received. Change-Id: I62fad123ac67e2f566ba555e84c0c3faf2adfd99
* | Removed interface to load audio effects librariesEric Laurent2011-05-273-74/+0
| | | | | | | | | | | | | | Removed unused functions allowing dynamic loading of audio effects libraries from effects factory API. Change-Id: I06cc5a51dc10aca87c7a8687bbb874babd711eca
* | Merge "New effect library API"Eric Laurent2011-05-2711-379/+812
|\ \ | |/ |/|
| * New effect library APIEric Laurent2011-05-2711-379/+812
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved and renamed media/EffectApi.h to hardware/audio_effect.h Modified the effect library API to expose a library info structure containing an interface functions table. Also removed enums for audio channels, audio format and devices from effect API and use values from system/audio.h instead. Modified effects factory to support new library interface format and load libraries and efffects listed in audio_effects.conf file. The file audio_effects.conf is first loaded from /vendor/etc and then from /system/etc/audio_effects.conf if not found. Modified existing effect libraries to implement the new library interface. Change-Id: Ie52351e071b6d352fa2fbc06c3846686f8c45df9
* | Merge "b/4452171 Dumping video playbacks to files."Huahui Wu2011-05-268-0/+1143
|\ \ | |/ |/|
| * b/4452171 Dumping video playbacks to files.Huahui Wu2011-05-238-0/+1143
| | | | | | | | | | | | | | MediaDump: a tool app to dump video playback into raw files and a viewer to display the dumped files. Change-Id: I7bf116e38bb1f9e85d5a1680ae92b5b72bc10ea8
* | Merge "Extract embedded cover art (aka poster frame) in mp4 files"James Dong2011-05-263-2/+38
|\ \
| * | Extract embedded cover art (aka poster frame) in mp4 filesJames Dong2011-05-263-2/+38
| | | | | | | | | | | | Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
* | | am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the ↵James Dong2011-05-261-7/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | decrypted data for container based DRM file."" into honeycomb-mr2 * commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a': Revert "Use pread() to get the decrypted data for container based DRM file."
| * | am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted ↵James Dong2011-05-251-7/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | data for container based DRM file."" into honeycomb-mr2 * commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8': Revert "Use pread() to get the decrypted data for container based DRM file."
| | * \ am c1ded373: Merge "Revert "Use pread() to get the decrypted data for ↵James Dong2011-05-251-7/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container based DRM file."" into honeycomb-mr2 * commit 'c1ded373951f8bd489401e93f2dd512ff9705a49': Revert "Use pread() to get the decrypted data for container based DRM file."
| | | * | Revert "Use pread() to get the decrypted data for container based DRM file."James Dong2011-05-251-7/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09.
* | | | | Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts ↵Andreas Huber2011-05-2617-280/+892
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | streams."
| * | | | | Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-2517-280/+892
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
* | | | | | Merge "For out of band timed text support (timed text in a separate file)."Gloria Wang2011-05-2510-45/+542
|\ \ \ \ \ \
| * | | | | | For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-2510-45/+542
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
* | | | | | Merge "Issue 4364098: bluetooth SCO not working"Eric Laurent2011-05-251-5/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Issue 4364098: bluetooth SCO not workingEric Laurent2011-05-251-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioService does not need to unconditionally stop virtual calls when the audio mode is changed from normal. Only stop virtual calls that have been started from AudioService. Change-Id: I75992d3655661e5910536a62dc8a8e0256d835e8
* | | | | | Merge "Convert line breaks to Unix style"James Dong2011-05-25175-29631/+29631
|\ \ \ \ \ \
| * | | | | | Convert line breaks to Unix styleMans Rullgard2011-05-21175-29631/+29631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | | | | | | Merge "Merge chromium to 10.0.634.0: Compile fix"Kristian Monsen2011-05-251-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge chromium to 10.0.634.0: Compile fixKristian Monsen2011-05-251-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base/thread.h moved to base/threading/thread.h: http://codereview.chromium.org/6028009 Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd
* | | | | | Bluetooth SCO audio API improvements.Eric Laurent2011-05-252-89/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioManager API to control bluetooth SCO did not provide an easy way for applications to handle SCO connection errors. When a request to activate SCO with AudioManager.startBluetoothSco() failed, no state change was indicated via AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED intent. The application had to implement a timeout to handle connection failures. The API change consists in defining a new intent AudioManager.ACTION_SCO_AUDIO_STATE_UPDATED and deprecate AudioManager.ACTION_SCO_AUDIO_STATE_CHANGED. The new intent will broacast a new state CONNECTING when the SCO connection is initiated. The application can monitor changes from CONNECTING to either CONNECTED or DISCONNECTED states to detect connection success or failure. An extra indicating the previous state is also added to the new intent. Also improved BluetoothHeadset service management in AudioService. A disconnection from the service is not considered as a device or SCO link disconnection. Instead, if the service interface is not present when a request to activate SCO is received, an attempt is made to reconnect to the service. Change-Id: I005fda1caaf74bb7de64fece44e9c7e628e828db
* | | | | | Merge "Make sure all references to the decoder plugin are accounted for"Andreas Huber2011-05-244-2/+10
|\ \ \ \ \ \
| * | | | | | Make sure all references to the decoder plugin are accounted forAndreas Huber2011-05-244-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before calling dlunload(). Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de related-to-bug: 4466387
* | | | | | | Merge "Make sure the software mpeg4 decoder supports multiple input frames ↵Andreas Huber2011-05-242-8/+21
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | per input buffer"
| * | | | | | Make sure the software mpeg4 decoder supports multiple input frames per ↵Andreas Huber2011-05-242-8/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input buffer to enable faster throughput in ACodec. Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
* | | | | | | am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes ↵Jeffrey Tinker2011-05-242-19/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit 'c41a17de2b2e80f246adeef4962073916dcfff0b': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| * | | | | am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| | * | | | am ef89cc14: Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2 * commit 'ef89cc14957ab631346564801841190346632ac9': Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
| | | * | | Merge "Multi-repository checkin, goes with ↵Jeffrey Tinker2011-05-232-19/+19
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/111038" into honeycomb-mr2
| | | | * | | Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038Jeffrey Tinker2011-05-232-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for b/4198446 HC - Support for Widevine Adaptive VOD Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
* | | | | | | resolved conflicts for merge of d5762583 to masterJames Dong2011-05-242-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
| * | | | | am ebae1923: am a5293d1c: Add some logging to track down where ANR happens ↵James Dong2011-05-232-1/+7
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during MediaPlayer._release(). * commit 'ebae1923869ee71ab119f766ac01c5a320619290': Add some logging to track down where ANR happens during MediaPlayer._release().
| | * | | | am a5293d1c: Add some logging to track down where ANR happens during ↵James Dong2011-05-232-1/+7
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer._release(). * commit 'a5293d1ca4459293f4993ea39c09ea703a022844': Add some logging to track down where ANR happens during MediaPlayer._release().
| | | * | | Add some logging to track down where ANR happens during MediaPlayer._release().James Dong2011-05-232-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o add a log message in AwesomePlayer::reset before acquiring the lock Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb related-to-bug: 4409547
* | | | | | Merge "Bug 4184736 unhide MediaPlayer.setTexture"Glenn Kasten2011-05-201-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Bug 4184736 unhide MediaPlayer.setTextureGlenn Kasten2011-05-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
* | | | | | am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data ↵Gloria Wang2011-05-201-0/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | for container based DRM file. For bug 4392094. * commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| * | | | | am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for ↵Gloria Wang2011-05-201-0/+7
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | container based DRM file. For bug 4392094. * commit 'dbfd055d51b51b7a6f412155c2391666efbb638a': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| | * | | | am a6f1104b: Use pread() to get the decrypted data for container based DRM ↵Gloria Wang2011-05-201-0/+7
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | file. For bug 4392094. * commit 'a6f1104b9d829c636b60b9387e379f9667b5df09': Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
| | | * | | Use pread() to get the decrypted data for container based DRM file.Gloria Wang2011-05-201-0/+7
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | For bug 4392094. Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
* | | | | Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight"Kristian Monsen2011-05-202-21/+23
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge Chromium at 10.0.621.0: Fixes for libstagefreightKristian Monsen2011-05-132-21/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URLRequest is now a member of the net namespace. HttpCache constructor has a new argument, which is a CertVerifier() Change-Id: I21d524938868b2e37993838f4fbb8447b02c3606