5180 Commits

Author SHA1 Message Date
Dianne Hackborn
dda868cd33 Merge "Keyguard sound needs to hold wake lock." 2011-09-21 15:15:18 -07:00
Andreas Huber
bfd1c9d93f Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported" 2011-09-21 13:56:09 -07:00
Dianne Hackborn
e47e8520fa Keyguard sound needs to hold wake lock.
We need to hold a wakelock while playing the keyguard lock sound,
so that it actually completes before the CPU goes to sleep.

Change-Id: I144c345383afeb911ea461b2eb17b31183b6d092
2011-09-21 13:34:33 -07:00
Andreas Huber
3001e47212 Support some .avi files containing H.264 video, log warnings if audio/video unsupported
Change-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677
related-to-bug: 5349382
2011-09-21 13:19:54 -07:00
Glenn Kasten
faa75f6146 Merge "Bug 5234242 audio continues after discontinuity" 2011-09-21 10:51:43 -07:00
Glenn Kasten
cd5c896381 Bug 5234242 audio continues after discontinuity
Reduce to 8 buffers of 10 packets from 16 buffers of 20 packets.

Change-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83
2011-09-21 10:40:01 -07:00
Jean-Michel Trivi
eb060254a0 am 9c43016b: Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
* commit '9c43016b52afa855156aac2dc81a2bbe1e4ab436':
  Bug 5045498 Keep track of RemoteControlClient play state change time
2011-09-21 09:36:56 -07:00
Marco Nelissen
28b9a063ad Merge "MediaScanner: To query row ids of music files when handling playlists." 2011-09-21 08:48:46 -07:00
Jean-Michel Trivi
68622396b6 Bug 5045498 Keep track of RemoteControlClient play state change time
Store the time at which a RemoteControlClient changes it playback
 state, and send that time to the IRemoteControlDisplay.
This change will enable displays to implement strategies such as
 timeouts (e.g. to not display transport controls for clients which have
 been paused or stopped for a certain amount of time).

Change-Id: I902882500565743d455d56f6000efaf612cbe0a9
2011-09-20 11:59:51 -07:00
Chih-Chung Chang
ed4cfe70ca Merge "Fix 5224359: Add width and height to media store." 2011-09-20 09:23:34 -07:00
Chih-Chung Chang
e1bf8efaff Fix 5224359: Add width and height to media store.
Change-Id: I27376285a551e648eb0ea010dfdf6b8ed873cdd8
2011-09-20 20:41:44 +08:00
James Dong
3907c79aeb am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
  Add QVGA resolution to CamcorderProfile
2011-09-19 20:09:00 -07:00
James Dong
92d0a64b90 Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom 2011-09-19 20:06:52 -07:00
James Dong
07b9ae3312 Add QVGA resolution to CamcorderProfile
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
2011-09-19 19:32:26 -07:00
Andreas Huber
e2bb99600e Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams" 2011-09-19 13:28:47 -07:00
Andreas Huber
abc63e7f46 Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams
containing B-frames.

Change-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642
related-to-bug: 5336497
2011-09-19 12:21:33 -07:00
Jean-Michel Trivi
b3e6eab161 am 2f153169: Merge "Bug 5300223 RemoteControlClient uses PendingIntent for media button events" into ics-factoryrom
* commit '2f153169594249738d63aa6e2897d257f6b7d71e':
  Bug 5300223 RemoteControlClient uses PendingIntent for media button events
2011-09-19 09:51:29 -07:00
Andreas Huber
c7342fbf99 Merge "In order to recover from video lagging behind audio, drop avc frames" 2011-09-19 08:54:59 -07:00
Andreas Huber
950fc9d115 In order to recover from video lagging behind audio, drop avc frames
that are not referenced by other frames before feeding them into the decoder.

Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
2011-09-16 15:19:59 -07:00
Jean-Michel Trivi
607fb6dada am f79ec360: Merge "Fix bug 5327199 Recycle bitmaps in RemoteControlClient" into ics-factoryrom
* commit 'f79ec360984011c49c52b7a19b96cbbc932df4be':
  Fix bug 5327199 Recycle bitmaps in RemoteControlClient
2011-09-16 15:02:43 -07:00
Jean-Michel Trivi
f0cff04562 Bug 5300223 RemoteControlClient uses PendingIntent for media button events
Update the implementation of the RemoteControlClient / Display
 feature rely on PendingIntent as provided in the construction
 of the RemoteControlClient instance.
The ComponentName that describes the target of the media button
 events is set as the target of the Intent from which
 a PendingIntent is constructed.
This ComponentName is still saved in the stack for persisting
 the last media button event receiver.

This CL also updates the lockscreen IRemoteControlDisplay
 implementation to use the PendingIntent supplied by the
 application when sending transport control events. A (good)
 side effect of doing this is that intent will be directly
 targeted at the application.

Restoration of the media button event receiver
 after reboot is not fully functional yet.

Change-Id: I2be82f2839e9dee1de02512437b3fb41cc386cde
2011-09-16 12:40:43 -07:00
Jean-Michel Trivi
34d0d300ca Fix bug 5327199 Recycle bitmaps in RemoteControlClient
When applying the new bitmap from the editor to the client,
 recycle the old bitmap, and set the reference to the editor
 bitmap to null.

Change-Id: I7d79e4b8410e5035fa51b20be4b1ada391c84c28
2011-09-16 11:33:50 -07:00
Andreas Huber
115cac8131 Various improvements to nuplayer playback
- Drastically cut down the number of times we supply the AudioSink with data
by estimating the time until the sink would run out of data and then scheduling
a refill in advance of that.

- Use a dedicated looper for video decoders since they are currently taking
too long to return from OMX_FillThisBuffer (bug 5325201)

- Revise thread priorities for the OMX dispatcher and software codecs, instead
of running them at ANDROID_PRIORITY_AUDIO, they now only run at
ANDROID_PRIORITY_FOREGROUND

- Since threads created by pthread_create inherit all of the parent threads
attributes including thread priority, briefly reset thread priority to
ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then
restore it.

Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
2011-09-16 10:44:02 -07:00
Gloria Wang
152f7b3985 Merge "If media player has died already, do not dec the old surface texture reference. Otherwise segfault will occur. For bug 5327664." 2011-09-15 16:56:41 -07:00
Gloria Wang
81b37d8bde If media player has died already, do not dec the old surface texture reference.
Otherwise segfault will occur.
For bug 5327664.
Do not merge.

Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
2011-09-15 15:38:36 -07:00
Gloria Wang
e828beb386 If media player has died already, do not dec the old surface texture reference.
Otherwise segfault will occur.
For bug 5327664.

Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
2011-09-15 15:36:02 -07:00
Gloria Wang
c286b2cc26 Cherry-pick from master. Do not merge.
Do not need to reset surface as NULL in MediaPlayer's _release.
Related to bug 5252296.

Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
2011-09-15 11:58:25 -07:00
Gloria Wang
b107c628ba Merge "Do not need to reset surface as NULL in MediaPlayer's _release. Related to bug 5252296." 2011-09-15 10:16:00 -07:00
James Dong
1318864fa7 Merge "Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications" 2011-09-14 17:42:22 -07:00
Gloria Wang
d59310d086 Do not need to reset surface as NULL in MediaPlayer's _release.
Related to bug 5252296.

Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
2011-09-14 14:24:27 -07:00
Rajneesh Chowdury
2424c93d84 Merge "Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed" 2011-09-14 14:01:36 -07:00
Rajneesh Chowdury
3f43e7d37f Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed
Change-Id: Ibd52a3bda8e1cb17f1c110cc219f2c71a46e5122
2011-09-14 12:37:02 -07:00
Eric Laurent
16066ec591 Merge "Issue 5044873: Pb with BT SCO AudioManager API" 2011-09-14 09:18:23 -07:00
Jean-Michel Trivi
e83f771f0a Merge "Bug 5300223 RemoteControlClient uses PendingIntent" 2011-09-14 09:05:36 -07:00
Eric Laurent
d7454be47f Issue 5044873: Pb with BT SCO AudioManager API
Do not identify the SCO connection client by the binder interface
passed when starting the connection as this binder changes if the
AudioManager proxy changes. Use the client PID instead.

This solves an issue with gTalk starting a SCO connection from one
AudioManager proxy and then changing audio mode from another thus
terminating the previously started SCO connection.

Change-Id: Ia3067fecc551fc15df3bf75ce0c43d181859e4f0
2011-09-14 08:45:58 -07:00
Jean-Michel Trivi
6e920e6dac Bug 5300223 RemoteControlClient uses PendingIntent
API change so RemoteControlClient is given a PendingIntent in
 its constructor, which will be used for receiving media button
 events from remote controls.
Leave the old constructors (but hidden) to not break
 current functionality until the AudioManager and AudioService
 implementations have been updated.

Change-Id: Ifa12c8036c948931adc386a827dce2936788e1cd
2011-09-13 19:27:20 -07:00
Eric Laurent
3f0c821740 Merge "Issue 5298399: Lost speech after a crash in gTalk." 2011-09-13 17:50:31 -07:00
Eric Laurent
7e8626fd75 Issue 5298399: Lost speech after a crash in gTalk.
Fixed problem in AudioTrack::restoreTrack_l() causing a permanent
failure if the IAudioTrack interface to AudioFlinger could not be
restored at the first attempt.

Change-Id: I039d4fe2dca8d3baf71f1a6c51119f27a67b6611
2011-09-13 17:33:29 -07:00
Dianne Hackborn
48c5fb1493 API review: Metadata class not used.
The Metadata class doesn't actually seem to be used with anything
in the SDK, and the API probably needs some work, so hide it.

Change-Id: Ifecf49130b90cbb4c588ad8104f1e7957978f789
2011-09-13 16:24:45 -07:00
Andreas Huber
bf208ec91e Merge "Support .avi tracks that have a sample size of 1, i.e. samples != chunks" 2011-09-13 11:37:22 -07:00
Andreas Huber
63749954aa Support .avi tracks that have a sample size of 1, i.e. samples != chunks
Assume for now that all chunks are the same size, i.e. have the same number of
samples.

Change-Id: Ib8a7dfeb16cc3e5be199ff9d98b68dd0b9c23eb8
related-to-bug: 5279872
2011-09-13 11:12:57 -07:00
James Dong
0209da1cb1 Change an assert failure due to unsupported level by HW AVC decoder and report the error to applications
Change-Id: I522a994981d86329ccc86c3b536b561dc6e40eeb
related-to-bug: 5300618
2011-09-13 11:00:17 -07:00
Andreas Huber
fa6dfdcfd7 Don't post position updates too frequently
i.e. don't hog my message queue.

related-to-bug: 5284760
Change-Id: I8e2d36a11dbee1567b18ed13dc5257a65c6eeda7
2011-09-13 09:48:22 -07:00
Andreas Huber
7fc8f515a0 Merge "Turn an another assertion into a runtime error in ACodec's implementation" 2011-09-12 14:21:42 -07:00
Andreas Huber
d41108c91f Turn an another assertion into a runtime error in ACodec's implementation
Change-Id: I6779b29f200b90d088273ab3204724ef3d8d59bd
related-to-bug: 5284760
2011-09-12 14:14:08 -07:00
Andreas Huber
f8c84b3434 Increase the avi extractor's confidence slighly over mp3's
So that we don't accidentally identify a .avi file containing an mp3 track as
an mp3 file.

Change-Id: I73495b80cbb5bc1007bf810f2db453c9f175171b
related-to-bug: 5288189
2011-09-12 13:49:00 -07:00
Devaraj Rangasamy
d8f7c2c2dc MTS Recorder Test: Use VideoFrameRate from Device Camcorder Profile
MTS tests have hardcoded video framerates.
MTS can query the video framerate supported by device via
Camcorder profiles and use.

Change-Id: I61666df6af58eaba46f7366521cc114184cb4ac5
Signed-off-by: Devaraj Rangasamy <dev@ti.com>
2011-09-09 17:22:24 -07:00
James Dong
4cf9a3b857 Merge "Fix another hardcoded frame rate in the media framework test" 2011-09-09 15:50:39 -07:00
Guang Zhu
973f553be4 Make MediaScanner skip certain directories
The list of directories to skip are configurable via setprop.
The main motivation is that some test data folder takes long time
to scan, and media scanner may compete for CPU time against perf
tests therefore skewing the results.

Bug: 5263115
Change-Id: I568213e2a4babf6033021c1d336ef0347c0e3315
2011-09-09 15:36:42 -07:00
James Dong
6f84da50ad Merge "Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation" 2011-09-09 14:56:30 -07:00