drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,507 Commits 1 Branch 0 Tags
Commit Graph

4552 Commits

Author SHA1 Message Date
Eric Laurent
8f18cf5574 Removed interface to load audio effects libraries 
Removed unused functions allowing dynamic loading of audio effects libraries
from effects factory API.

Change-Id: I06cc5a51dc10aca87c7a8687bbb874babd711eca
 2011-05-27 17:51:52 -07:00
Eric Laurent
c32c0093a4 Merge "New effect library API" 2011-05-27 15:26:25 -07:00
Eric Laurent
0fb66c2b83 New effect library API 
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
 2011-05-27 15:15:00 -07:00
Huahui Wu
18773812cf Merge "b/4452171 Dumping video playbacks to files." 2011-05-26 16:31:28 -07:00
James Dong
03edf6b364 Merge "Extract embedded cover art (aka poster frame) in mp4 files" 2011-05-26 12:00:51 -07:00
James Dong
0be123918e am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the 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."
 2011-05-26 11:41:30 -07:00
James Dong
e8b26dcec7 Extract embedded cover art (aka poster frame) in mp4 files 
Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
 2011-05-26 11:31:16 -07:00
Andreas Huber
73a4b2b3be Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams." 2011-05-26 08:52:55 -07:00
Gloria Wang
98472cced0 Merge "For out of band timed text support (timed text in a separate file)." 2011-05-25 20:11:25 -07:00
Gloria Wang
13bc8cde1c For out of band timed text support (timed text in a separate file). 
Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
 2011-05-25 17:53:29 -07:00
Eric Laurent
6662576d8f Merge "Issue 4364098: bluetooth SCO not working" 2011-05-25 16:22:36 -07:00
Eric Laurent
b06ac839dd Issue 4364098: bluetooth SCO not working 
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
 2011-05-25 16:03:01 -07:00
Andreas Huber
eb2f9c193d Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams. 
Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
 2011-05-25 15:57:07 -07:00
James Dong
c004a0c925 am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 
* commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8':
  Revert "Use pread() to get the decrypted data for container based DRM file."
 2011-05-25 14:57:45 -07:00
James Dong
05e13b9edd am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 
* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
  Revert "Use pread() to get the decrypted data for container based DRM file."
 2011-05-25 14:54:19 -07:00
James Dong
1b9b34adf7 Merge "Convert line breaks to Unix style" 2011-05-25 12:37:07 -07:00
James Dong
64a23430f9 Revert "Use pread() to get the decrypted data for container based DRM file." 
This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09.
 2011-05-25 12:17:33 -07:00
Kristian Monsen
4ece6db47e Merge "Merge chromium to 10.0.634.0: Compile fix" 2011-05-25 12:09:56 -07:00
Eric Laurent
dc03c61fe3 Bluetooth SCO audio API improvements. 
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
 2011-05-25 09:11:46 -07:00
Kristian Monsen
31d2cd2474 Merge chromium to 10.0.634.0: Compile fix 
base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/6028009

Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd
 2011-05-25 11:50:00 +01:00
Andreas Huber
70fbd15af9 Merge "Make sure all references to the decoder plugin are accounted for" 2011-05-24 15:58:09 -07:00
Andreas Huber
1b50fe2952 Merge "Make sure the software mpeg4 decoder supports multiple input frames per input buffer" 2011-05-24 15:56:42 -07:00
Andreas Huber
54802de06c Make sure all references to the decoder plugin are accounted for 
before calling dlunload().

Change-Id: I59aa1d19edf566b8a86a6f73b1c2eeb47c96b0de
related-to-bug: 4466387
 2011-05-24 15:15:42 -07:00
Andreas Huber
60a3cb81c0 Make sure the software mpeg4 decoder supports multiple input frames per input buffer 
to enable faster throughput in ACodec.

Change-Id: I6f6a1c70d9446f9d52c3df257b2d22358b0e71f4
 2011-05-24 14:53:30 -07:00
Jeffrey Tinker
4b4e3a0b21 am c41a17de: am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes 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
 2011-05-24 12:57:22 -07:00
James Dong
2646219aaa resolved conflicts for merge of d5762583 to master 
Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
 2011-05-24 08:04:45 -07:00
Jeffrey Tinker
c41a17de2b am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with 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
 2011-05-23 18:47:17 -07:00
Jeffrey Tinker
6e5cdca12b am ef89cc14: Merge "Multi-repository checkin, goes with 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
 2011-05-23 18:15:47 -07:00
Jeffrey Tinker
ef89cc1495 Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 2011-05-23 18:10:10 -07:00
Huahui Wu
ea0bad0574 b/4452171 Dumping video playbacks to files. 
MediaDump: a tool app to dump video playback into raw files and
 a viewer to display the dumped files.

Change-Id: I7bf116e38bb1f9e85d5a1680ae92b5b72bc10ea8
 2011-05-23 15:34:29 -07:00
Jeffrey Tinker
8264641c98 Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 
Fix for b/4198446 HC - Support for Widevine Adaptive VOD

Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
 2011-05-23 11:09:16 -07:00
James Dong
d5762583bd am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). 
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
  Add some logging to track down where ANR happens during MediaPlayer._release().
 2011-05-23 10:26:40 -07:00
James Dong
ebae192386 am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). 
* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
  Add some logging to track down where ANR happens during MediaPlayer._release().
 2011-05-23 09:59:59 -07:00
James Dong
a5293d1ca4 Add some logging to track down where ANR happens during MediaPlayer._release(). 
o add a log message in AwesomePlayer::reset before acquiring the lock

Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
 2011-05-23 09:36:31 -07:00
Mans Rullgard
219e2627f1 Convert line breaks to Unix style 
Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
 2011-05-21 09:39:22 -07:00
Glenn Kasten
850ae9acda Merge "Bug 4184736 unhide MediaPlayer.setTexture" 2011-05-20 15:42:31 -07:00
Gloria Wang
24ff7fae02 am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data 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.
 2011-05-20 11:05:43 -07:00
Gloria Wang
4d8ceada09 am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 11:02:31 -07:00
Gloria Wang
dbfd055d51 am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 10:57:51 -07:00
Gloria Wang
a6f1104b9d Use pread() to get the decrypted data for container based DRM file. 
For bug 4392094.

Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
 2011-05-20 10:15:21 -07:00
Kristian Monsen
56031fb1de Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight" 2011-05-20 08:40:13 -07:00
Glenn Kasten
817c161ef2 Bug 4184736 unhide MediaPlayer.setTexture 
Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
 2011-05-20 07:30:00 -07:00
James Dong
3c707256cf Merge "Publish setLocation() method as a public Java API" 2011-05-19 11:51:37 -07:00
Gloria Wang
612956c914 Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463059." 2011-05-19 11:15:16 -07:00
Gloria Wang
f9cf277cda Add one more MIME type (audio/aac-adts) for aac file. 
Fix for bug 4463059.

Change-Id: Ie2125349667e65b41871a228d87e4dce6b513398
 2011-05-19 10:45:45 -07:00
James Dong
ba43d4282c resolved conflicts for merge of a8939e0d to master 
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
 2011-05-19 08:49:09 -07:00
James Dong
a8939e0d48 am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 
* commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
  Using widevine:// to stream adaptive bitrate wvm content no longer
 2011-05-18 16:33:20 -07:00
James Dong
380244e9d6 am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 
* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
  Using widevine:// to stream adaptive bitrate wvm content no longer
 2011-05-18 16:09:58 -07:00
James Dong
d148a499c2 Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 2011-05-18 16:06:14 -07:00
James Dong
af3131fe2e Publish setLocation() method as a public Java API 
related-to-bug: 4260295

Change-Id: I91b923af8549127eb08f0d7e535cd53ad229e1f6
 2011-05-18 09:41:57 -07:00