5155 Commits

Author SHA1 Message Date
James Dong
2a45102186 Merge "The test application falsely reports that the test result even if the test failed." 2011-08-29 15:28:23 -07:00
James Dong
4afbe2ec75 The test application falsely reports that the test result even if the test failed.
Change-Id: Ia632f04da73642dc4c1e3147b16664b5672108bc
2011-08-29 14:40:52 -07:00
Jamie Gennis
af4fccf0c0 MediaDump: use the MediaPlayer#setSurface method
This change updates the MediaDump test to use the new
MediaPlayer#setSurface method in place of MediaPlayer#setTexture, which
will be removed.

Change-Id: I33f59705c728f0884452d45cf83cb5b80f66a95a
2011-08-29 14:33:11 -07:00
Jamie Gennis
b283dc64bc MediaPlayer: unhide the setSurface method
Change-Id: I2fb695ab918d1099ad7cc51bfd436712a0b640d9
2011-08-29 14:33:10 -07:00
Andreas Huber
499f36581c Merge "Return an error to the client instead of asserting if decoder instantiation fails" 2011-08-29 13:47:24 -07:00
Andreas Huber
07754c513f Return an error to the client instead of asserting if decoder instantiation fails
after a surface change.

Change-Id: Ic7758cbeb107032db68a1c3b8e2984710a12dd8b
related-to-bug: 5212725
2011-08-29 13:01:23 -07:00
Jean-Michel Trivi
2db44c5838 Merge "Update IRemoteControlDisplay when it registers." 2011-08-29 10:09:04 -07:00
Jean-Michel Trivi
db8a361629 Update IRemoteControlDisplay when it registers.
When an IRemoteControlDisplay registers, it must receive information
 from the current client.

Change-Id: Id845e7a87ac74c2db2c59e0281b28a45f8d20528
2011-08-29 09:57:18 -07:00
Jean-Michel Trivi
aca6d629e2 Merge "Cannot compare Binder references for RC display to unregister" 2011-08-29 08:56:23 -07:00
Andreas Huber
b3c084af16 Merge "Signal errors to the client instead of asserting in ACodec." 2011-08-29 08:10:56 -07:00
Pannag Sanketi
3451df1a5c Merge "Default W, H allowed in SurfaceMediaSource dequeue" 2011-08-28 14:40:26 -07:00
Pannag Sanketi
2b9c5d8a89 Merge "Fixing small syntax error in MPEG4 logging" 2011-08-26 20:01:46 -07:00
Pannag Sanketi
5cfcfb22d6 Fixing small syntax error in MPEG4 logging
Found that the build was breaking when the logging was enabled in
MPEG4Writer. Fixed.

Change-Id: I62c5e6d16b2ecf5644c8d46b9bbcca68a797b223
2011-08-26 19:18:57 -07:00
Jean-Michel Trivi
7309c83b95 Cannot compare Binder references for RC display to unregister
Cannot trust references to IRemoteControlDisplay to remain the
 same when removing a RemoteControlDisplay, compare the
 result of .asBinder() instead.

Change-Id: Ib2e82aa24bd4b12804bccff94a6a0090ff83bea8
2011-08-26 18:54:44 -07:00
Jean-Michel Trivi
28c5b96d84 Merge "Address multiple RemoteControlDisplay competing for registration" 2011-08-26 18:17:40 -07:00
Jean-Michel Trivi
18e7bce523 Address multiple RemoteControlDisplay competing for registration
The RemoteControlClient / Display feature only supports one
 display. If multiple displays are registered, this CL implements
 the following policy:
 - cannot unregister a display that is not the current one,
 - registering a display when another is already registered
    causes the old one to be unregistered.
This fixes a death handler leak where the previous display was
 simply overwritten, without unlinking to its death.

Change-Id: I63f8a38093796e0960761936d7fc58d47b7589b3
2011-08-26 18:14:29 -07:00
Andreas Huber
6032a6018d Signal errors to the client instead of asserting in ACodec.
Also make sure NuPlayer can properly shutdown in certain edge cases.

Change-Id: Iceb16d600d87ba66c802e60e95bf62f66487a453
2011-08-26 16:02:19 -07:00
Jean-Michel Trivi
fedd53b82b Merge "Don't try to rescale when no bitmap in RemoteControlClient" 2011-08-26 14:25:05 -07:00
Andreas Huber
539340fe2c Merge "Support for posting messages and synchronously waiting for a response." 2011-08-26 13:47:26 -07:00
Jean-Michel Trivi
6e679d5a53 Don't try to rescale when no bitmap in RemoteControlClient
If a RemoteControlClient has a null artwork, do no attempt to
 rescale the bitmap, it's ok to send a null bitmap to the
 IRemoteControlDisplay.

Change-Id: I8332ccfcf18107ea0b41d4e7fa232d7f68798efc
2011-08-26 11:57:42 -07:00
Andreas Huber
9ba16f6c54 Properly reset the number of frames we think we've written to the audio sink
in order to compute the final delay before posting end-of-stream correctly.

Change-Id: I4ff6d7142fdf1ea2d19d12ec78c1e84322d22e5f
related-to-bug: 5216930
2011-08-26 11:26:25 -07:00
Jean-Michel Trivi
2daf331e68 Merge "Bug 4364249 Play position is 0 after flushing AudioTrack" 2011-08-25 17:41:46 -07:00
Jean-Michel Trivi
22cb204cbb Bug 4364249 Play position is 0 after flushing AudioTrack
AudioTrack::stop() is not synchronous, so a stop() followed
 by flush(), which is synchronous, will not always report
 a playhead position of 0 after being called.
This CL adds a flag to mark a track as flushed, and report the
 correct playhead position in this state.
Bug 5217011 has been created to address the real issue in the
 future, where flush could be made synchronous, to properly
 address bug 4364249.

Change-Id: Icf989d41a6bcd5985bb87764c287f3edb7e26d12
2011-08-25 17:33:49 -07:00
Andreas Huber
e688257456 Support for posting messages and synchronously waiting for a response.
Change-Id: Id6c7a08c34fd5cb6c4632f78ece9e7898b29e52c
2011-08-25 16:28:18 -07:00
Andreas Huber
463854bead Merge "When encountering a discontinuity, flush(clear) all content enqueued up to that" 2011-08-25 13:40:16 -07:00
Andreas Huber
ced159b1d8 When encountering a discontinuity, flush(clear) all content enqueued up to that
point except previously enqueued discontinuities.

Change-Id: Id04a559dc062fa4a5c80c599ad74bf81a543de01
related-to-bug: 5201378
2011-08-25 13:37:34 -07:00
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
Pannag Sanketi
886530788c Default W, H allowed in SurfaceMediaSource dequeue
The client does not have to send (w, h) = (0,0) in dequeuebuffer. It can
set the same w, h as the default width and height.

Change-Id: I8202f90261ccaebbd35ea28c153a7472f01912f1
2011-08-24 17:51:05 -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