4726 Commits

Author SHA1 Message Date
Vikas Arora
d0881d95e2 Add WebP Mime-Type support in Android Media File
Change-Id: Ifaa64c8fc55d1f1ad14db3057821696b565e0c26
2011-06-03 00:13:36 +05:30
James Dong
6c2cb3061d Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based" 2011-06-02 10:22:50 -07:00
James Dong
443287068b Do not call getEstimatedBandwidth if the streaming is not HTTP-based
Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
2011-06-02 10:13:52 -07:00
Andreas Huber
8e97372913 am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
* commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
2011-06-02 07:37:52 -07:00
Glenn Kasten
d3092e3157 Merge "Remove unnecessary level of priority indirection" 2011-06-02 07:24:14 -07:00
Glenn Kasten
993fccec5b Remove unnecessary level of priority indirection
Change-Id: I942d43973c20a7ace8b0d3f78b4da97e45e996c6
2011-06-01 16:46:29 -07:00
Yu Shan Emily Lau
fa22e62589 Convert the video editor performance
test suite output from float to int.

Change-Id: I62fada18a4c34d06b8d0ed91885e5bd98f12523f
2011-06-01 16:33:35 -07:00
Andreas Huber
8050a02b01 DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
Change-Id: Iaee1821257a25a5257d93c9f5ba3976748cad619
related-to-bug: 3362836, 4439092
2011-06-01 15:54:07 -07:00
Glenn Kasten
e46a86fcb6 Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
2011-06-01 15:20:35 -07:00
Glenn Kasten
2225e4b704 Use AudioTrack::event_type not int in callback
Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
2011-06-01 13:50:23 -07:00
Jean-Michel Trivi
d0bbdb02b2 Merge "Use channel mask instead of channel count for track creation" 2011-06-01 11:04:15 -07:00
Jean-Michel Trivi
5439223b56 Use channel mask instead of channel count for track creation
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
2011-06-01 10:55:29 -07:00
James Dong
7c2cb0c583 Merge "Send estimated bandwidth value as informational event when cache fetcher pauses" 2011-05-31 17:25:47 -07:00
James Dong
a9d0febdd0 Send estimated bandwidth value as informational event when cache fetcher pauses
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
2011-05-31 15:23:25 -07:00
James Dong
c51e224b0a Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)" 2011-05-31 14:33:20 -07:00
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
James Dong
22bf7a7ea7 Add some comment to MediaRecorder.stop() about the stop() failure (-1007)
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
2011-05-26 17:45: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