5028 Commits

Author SHA1 Message Date
Gloria Wang
5837dfaf65 Merge "Set mSeekNotificationSent as false for RTSP seeking. Fix for bug 5208736." 2011-08-25 10:28:50 -07:00
Gloria Wang
051f8908a3 Set mSeekNotificationSent as false for RTSP seeking.
Fix for bug 5208736.

Change-Id: Ib1d74608ec289509082d8dcad080769f48098853
2011-08-25 10:09:34 -07:00
James Dong
b335a5a4e0 Merge "When Camera is launched by media recording framework, stagefright controls the stop and release." 2011-08-25 08:12:11 -07:00
James Dong
831227816b When Camera is launched by media recording framework, stagefright controls the stop and release.
Change-Id: Ic79a60dad0f617a845211d3fbe146c1648a71da3
related-to-bug: 5205804
2011-08-24 19:50:36 -07:00
Jean-Michel Trivi
e9816475a6 Merge "Fix deadlock in AudioService" 2011-08-24 19:22:52 -07:00
Jean-Michel Trivi
3094d955b8 Fix deadlock in AudioService
Locks related to audio focus and remote control should always be
 taken in the following order:
 1/ audio focus lock
 2/ remote control stack
 3/ current remote control client generation

Change-Id: If8be11bfef92849957e692b2bd52adbd67a2ef0b
2011-08-24 19:08:48 -07:00
Chih-Chung Chang
7096c4a0e2 Merge "Port setting change should happen before receiving any filled frame." 2011-08-24 18:57:35 -07:00
Jean-Michel Trivi
25c18fe06b Merge "More information for RemoteControlDisplay about new client" 2011-08-24 17:21:29 -07:00
Jean-Michel Trivi
4b6df6a3dc More information for RemoteControlDisplay about new client
When the client gets cleared, let the display know the new
 client generation ID is for a clear.
When a new client becomes current, let the display know
 what the associated media button event receiver is.

Change-Id: I18e37a309b5b30ed361a68918379b60418409f1e
2011-08-24 17:13:49 -07:00
Pannag Sanketi
409f95ff89 Merge "Testing the GL/ CPU encoding w/ Gralloc buffers" 2011-08-24 15:18:07 -07:00
Pannag Sanketi
557b7092cc Testing the GL/ CPU encoding w/ Gralloc buffers
This is the test for Gralloc buffers based encoding.
contains a combination of two main changes:

1. GL based encoding tests added to SurfaceMediaSource_test

2. SurfaceMediaSource ::read() colorformat

The SurfaceMediaSource::getformat() sets it to OMX_COLOR_FormatAndroidOpaque.
The omx encoder needs to interpret that colorformat and reads the format
from the Gralloc buffers directly

Change-Id: Iee2fe8901384109a4952e1d6c528c59eb01eb5b1
2011-08-24 13:57:46 -07:00
Jean-Michel Trivi
2b0f795dd6 Merge "Bug 5045498 Single binder call when metadata and artwork are updated" 2011-08-24 09:56:08 -07:00
Jean-Michel Trivi
85a0a05766 Merge "Bug 5045498 Implementation of RemoteControlClient.MetadataEditor" 2011-08-24 09:55:54 -07:00
Jean-Michel Trivi
44413e5b51 Bug 5045498 Single binder call when metadata and artwork are updated
When metadata gets applied, optimize the artwork and metadata
 update by doing it in a single call.

Add missing RemoteControlDisplay-related methods in AudioManager.

Change-Id: I97aa802cc480327bee5592ea8dfdbd414c0f037a
2011-08-23 19:08:47 -07:00
Jean-Michel Trivi
4da5eeffc9 Bug 5045498 Implementation of RemoteControlClient.MetadataEditor
A MetadataEditor contains all the metadata and artwork to be applied
 to a RemoteControlClient.
A MetadataEditor can only be applied once.

Change-Id: I3ce9d97f520cd9ab009fb1a92a2b399717511bd8
2011-08-23 18:09:49 -07:00
James Dong
a8120ea311 Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams." 2011-08-23 18:06:16 -07:00
Jean-Michel Trivi
68e37ae87a Merge "Bug 5045498 New implementation of remote control API" 2011-08-23 11:46:44 -07:00
Jean-Michel Trivi
4426e42ac6 Bug 5045498 New implementation of remote control API
Remote control displays expose an IRemoteControlDisplay interface
 which they register through AudioManager.
Remote control clients create a RemoteControlClient object, which
 implicitely exposes an IRemoteControlClient interface registered
 in AudioService through AudioManager.
AudioService tells all clients and displays when a new client
 is the one that should be displayed.
A client's data gets sent to the display when it is valid, or
 it sets new data (while being valid).

The implementation for setting metadata and album art is temporary,
 and will migrate to the MetadataEditor API in future CLs.

Change-Id: Ibab6ea1d94c68f32482c760c6ae269541f885548
2011-08-23 11:23:22 -07:00
Andreas Huber
d109a7d428 Merge "We were accidentally sending out an output buffer before the final port settings change" 2011-08-23 10:32:35 -07:00
Andreas Huber
887b7295da We were accidentally sending out an output buffer before the final port settings change
Change-Id: I4de0d3c377bb12e59524ed370ab3ed0b9a9b70a6
related-to-bug: 5122512
2011-08-23 10:22:49 -07:00
Eric Laurent
cf56f1e7ad Merge "Revert "Change condition to enter silent mode."" 2011-08-23 08:44:13 -07:00
Eric Laurent
73a56fe477 Revert "Change condition to enter silent mode."
This reverts commit c11c3ae4dd5d4054e5b44a7bdfe6b203bdb69976.
2011-08-23 08:27:41 -07:00
Chih-Chung Chang
f1824a9762 Pass correct indices for thumbnails of MediaImageItem.
Change-Id: I8e52014ab76c63994385bc54106c19b425be8550
2011-08-23 16:00:28 +08:00
Chih-Chung Chang
e649668331 Port setting change should happen before receiving any filled frame.
Change-Id: I12a54b80e7ef958b6d451b7add110d38f05ec439
2011-08-23 11:18:05 +08:00
Andreas Huber
6e37cf90f9 The MatroskaExtractor will now publish a different mime-type "video/webm" if
the doctype of the matroska file indicates that it is a webm file.

Change-Id: I467f597690a841043ecd11d2a2cae93351820f1b
related-to-bug: 5042137
2011-08-22 13:21:26 -07:00
Chih-Chung Chang
8598e57598 Merge "Remove useAndroidNativeBuffer(2) warning message." 2011-08-21 19:19:01 -07:00
Rajneesh Chowdury
c0a2222552 Merge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)" 2011-08-19 15:01:11 -07:00
Jamie Gennis
c0ce60774c Merge "Stagefright: fix a compiler warning" 2011-08-19 14:36:10 -07:00
Rajneesh Chowdury
3ced044154 Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)
Also fixes 5118207 add other video codec support for video editor export.

Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
2011-08-19 14:34:47 -07:00
Andreas Huber
121e50c066 Raise the maximum input buffer size for the vpx video decoder to 256KB
Change-Id: I0411763829bf186d1b3b679fa72c9051524506b4
related-to-bug: 5169641
2011-08-19 10:30:58 -07:00
Chih-Chung Chang
7f639d3315 Merge "Fix 5144356: Native crash while importing music" 2011-08-18 18:39:01 -07:00
Gloria Wang
0bf049c635 Merge "When switching surface, do not set mSeekNotificationSent as true, because there could be a previous uncompleted seeking which needs to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent as true here, then mediaplayer.cpp will be waiting for message MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp. Fix for bug 5181272." 2011-08-18 15:14:36 -07:00
Gloria Wang
3c578f2d6a When switching surface, do not set mSeekNotificationSent as true,
because there could be a previous uncompleted seeking which needs
to send back MEDIA_SEEK_COMPLETE message. If we set mSeekNotificationSent
as true here, then mediaplayer.cpp will be waiting for message
MEDIA_SEEK_COMPLETE. The getCurrentPosition() will always return
the seek time before MEDIA_SEEK_COMPLETE being received by mediaplayer.cpp.
Fix for bug 5181272.

Change-Id: I290aff29b6d9ec8db67c66abbe1f352a43f57073
2011-08-18 14:52:36 -07:00
Andreas Huber
3d01812f5e Merge "Some decoders require more gentle treatment" 2011-08-18 11:46:18 -07:00
James Dong
5bc53035bd Some decoders require more gentle treatment
We sacrifice A/V sync to some extent to enable the decoder to recover from
temporary bottlenecks.

Change-Id: I16195091ad752bfad4c70869cdd7e9f28ca3a118
related-to-bug: 5180142
2011-08-18 11:43:34 -07:00
Andreas Huber
4960f3a67c Disable vorbis-auto-looping if the audio sink used is not realtime, i.e. recording.
Change-Id: I982e740e8488ff8717ca5f081db9def55aabc9ec
related-to-bug: 5179033
2011-08-18 10:53:23 -07:00
Rajneesh Chowdury
a91495d56d Merge "Fix for 5155561 During export, progress bar jumps from 0 to 50%" 2011-08-18 09:09:35 -07:00
Chih-Chung Chang
b6769fc242 Remove useAndroidNativeBuffer(2) warning message.
Change-Id: I3e9765e7271d80fda302e521501720bf8c13e5c7
2011-08-18 16:56:36 +08:00
Chih-Chung Chang
176dde85a0 Fix 5144356: Native crash while importing music
1. Use the correct Get*Field functions according to the field type.
2. When we have exceptions, return.

Change-Id: I1878d806e26798a0977ff71a781551088e45f6fb
2011-08-18 15:28:43 +08:00
Dongwon Kang
983ab88e11 To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams.
Note: current resync logic keeps searching mp3 frames until it meets a
valid one. This resync logic works well with seek() operation, but in
SniffMP3(), this may cause false-positive classification for the
following MPEG-PS file format.
  A possible MPEG-PS video file:
      [PS header]...[mp3 frame][mp3 frame] ...
  MP3 files:
      [ID3 tag][mp3 frame][mp3 frame] ...

BUG: 5104562
Change-Id: Idd5020723f7bdb2fefc2a63fc8651580fd644399
2011-08-18 15:24:27 +09:00
Jean-Michel Trivi
8c60d89b37 Merge "Bug 5045498 RemoteControlClient interface" 2011-08-17 16:54:37 -07:00
Rajneesh Chowdury
6721d33fef Fix for 5155561 During export, progress bar jumps from 0 to 50%
Change-Id: I5f5814a1212cd242535ae7cadec8a76f099e78ce
2011-08-17 16:12:39 -07:00
Eric Laurent
8f6684144a Merge "Fix issue 5126270: Holding volume down vibrates" 2011-08-17 14:59:58 -07:00
Andreas Huber
5a9ffaa4cb Merge "Make sure we have all the sample table metadata before declaring a track valid." 2011-08-17 13:21:40 -07:00
Andreas Huber
987cb2ed4a Make sure we have all the sample table metadata before declaring a track valid.
Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31
related-to-bug: 5178976
2011-08-17 13:03:51 -07:00
Eric Laurent
cc11b1b8bb Fix issue 5126270: Holding volume down vibrates
Clear AudioManager.FLAG_VIBRATE in adjustStreamVolume() if
already in silent mode.

Change-Id: I8035a8cc713e1880799d9aaf053d8e4d12acad75
2011-08-17 12:42:07 -07:00
James Dong
24ac9e1ec2 Merge "Don't time out prematurely for video encoding waiting for output buffers" 2011-08-17 11:14:49 -07:00
Eric Laurent
bc91ea6bff Merge "Change condition to enter silent mode." 2011-08-17 10:19:06 -07:00
Jean-Michel Trivi
178889eff7 Bug 5045498 RemoteControlClient interface
Define a RemoteControlClient interface that applications must
 implement and register to be displayed on the lockscreen.

Change-Id: I67276ae653f203e76727432231f1d76535c31942
2011-08-17 09:53:12 -07:00
Chih-Chung Chang
d51b218b47 Merge "Display thumbnails one by one and cache them." 2011-08-17 04:41:33 -07:00