5133 Commits

Author SHA1 Message Date
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
James Dong
4a0c91fc50 Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation
Change-Id: Iee9b18449bce9d7565ab5cc7f9e999484051196c
related-to-bug: 5233843
2011-09-09 13:27:27 -07:00
Marco Nelissen
02ea7d4877 Merge "Fix bug 5045498 Unhide Remote Control Client API" 2011-09-09 08:44:19 -07:00
Eric Laurent
ebf6478f55 Merge "Fix issue 4673378: switching from VoIP to GSM call" 2011-09-09 08:27:04 -07:00
Chih-Chung Chang
a18886ca08 Fix 5278371: OOM in MediaItemThumbnailTest
Because we request 400x240 thumbnails. 100 thumbnails needs 38M,
which is too much. Change it to 70 now.

Also handle the case if the thumbnail callback throws exception.

Change-Id: Iac4ee72f308b7c7a6ae860983197601cf89bee8f
2011-09-09 13:58:59 +08:00
Eric Laurent
9f103de83f Fix issue 4673378: switching from VoIP to GSM call
The problem is that any app can change the audio mode and override
a mode previously set by another app. If two apps (gTalk and Phone) compete
for audio mode ownership, there is no mechanism to maintain coherency
in the actual audio mode selected.

Added a mechanism in AudioService to manage an audio mode request stack.
Any app requesting a mode different from NORMAL enters at the top of the stack
and the requested mode is applied. When an app sets mode back to NORMAL, it exits
the stack and the new mode corresponding to the request at the top of the
stack (if any) is applied.

Change-Id: I68d1755d0922f680df4a19bfc5ab924f5a5d8ccd
2011-09-08 19:23:56 -07:00
Eric Laurent
11e2e5dece Merge "AudioTrack: extend callback thread sleep time" 2011-09-08 16:07:40 -07:00
Pannag Sanketi
5303254cc9 Merge "Always set geometry in queuebuffer" 2011-09-08 15:33:31 -07:00
Eric Laurent
f1d360ac86 AudioTrack: extend callback thread sleep time
Do not force wake up the AudioTrack thread every 10ms if no timed
events (loop, markers..) have to be processed.
This will help reduce power consumption.

Change-Id: Icb425b13800690008dd07c27ffac84739e3dbba3
2011-09-08 15:18:37 -07:00
Pannag Sanketi
e46fcef278 Always set geometry in queuebuffer
The queuebuffer could return early due to timestamp issues. Need to set
the geometry even in that case.

Change-Id: I04d7cd1df3996d640c269285398c0042923ba920
2011-09-08 14:16:55 -07:00
Andreas Huber
8458447162 Audio player must not be used as a timesource before it's started.
Otherwise it'll trigger a division-by-zero exception since the audio sample rate
is as yet unknown.

Change-Id: I0793aa7c1c348ffa2611272bb646eff6ecf6ff53
related-to-bug: 5242451
2011-09-08 11:33:47 -07:00
Chih-Chung Chang
70ad1c378b Merge "Fix 5156702: rotate thumbnails" 2011-09-08 05:52:44 -07:00
James Dong
b05a600352 Fix another hardcoded frame rate in the media framework test
Change-Id: I7d7f9d0812a0228dbf924084a32dbede0338b421
related-to-bug: 5264298
2011-09-07 19:31:24 -07:00
Glenn Kasten
65e7815dd4 Merge "Bug 5270905 fix MediaPlayer with IStreamSource" 2011-09-07 14:56:47 -07:00
Glenn Kasten
27f4bbb676 Bug 5270905 fix MediaPlayer with IStreamSource
Change-Id: Ia8a6381a6c88b4a0a1378aab03f5275f0fa1125a
2011-09-07 14:42:37 -07:00
Pannag Sanketi
166c1b2e7a Merge "Fixing bug in SurfaceMediaSource_test" 2011-09-07 14:18:41 -07:00
Andreas Huber
089d3e3f14 Apparently keyframe status in audio tracks of .webm/.mkv files is unreliable
fortunately in all our supported audio encodings we can treat every frame as
a keyframe.

Change-Id: I32f21d0077bbae7ef9efe725dd351baf531179e2
related-to-bug: 5263837
2011-09-07 11:05:43 -07:00
Andreas Huber
01dba603d7 Merge "Stop metadata retriever from dereferencing a NULL pointer if" 2011-09-07 09:05:04 -07:00
Marco Nelissen
4880a736dc Merge "Fix startBluetoothSco race" 2011-09-07 07:55:00 -07:00
Chih-Chung Chang
47a52158d2 Fix 5156702: rotate thumbnails
Change-Id: I97b51dadf129172d5b154e9dfd66da254e4559d7
2011-09-07 19:20:45 +08:00
James Dong
ccccb505ab Merge "Use device-dependent frame rate in the media recorder performance test" 2011-09-07 04:07:39 -07:00
James Dong
30856a76dc Revert "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
This reverts commit 983ab88e117fcbda9370b8f4ba94271d37149672.

related-to-bug: 5231309
2011-09-06 19:18:43 -07:00
James Dong
a985135daa Use device-dependent frame rate in the media recorder performance test
Change-Id: I778eca69c4acb9842f600c6ae23e7a89fb2e55f4
related-to-bug: 5264298
2011-09-06 19:15:48 -07:00
Marco Nelissen
671db6f3ba Fix startBluetoothSco race
Change-Id: I8b711bd3c6b12f2e3e92144c0dadac72261bf914
2011-09-06 16:51:21 -07:00
Andreas Huber
612e16191a Stop metadata retriever from dereferencing a NULL pointer if
the media extractor failed to initialize (malformed or unsupported content)

Change-Id: Icfad4e9eeb8d6713ad12eee7979ab30b696c06e0
related-to-bug: 5263840
2011-09-06 16:05:02 -07:00
Eric Laurent
b6738fc6a5 Merge "Issue 5247986: Battery drain due to audio wakelock" 2011-09-06 14:53:59 -07:00
Eric Laurent
b0808f9c43 Issue 5247986: Battery drain due to audio wakelock
The problem occurs when activating or deactivating A2DP connection
while SoudPool has a channel active. This can happen quite frequently now
that the UI sound effects are enabled by default.
If PCM data is remaining in the AudioTrack buffer when it is restroyed and
re-created on the new AudioFlinger output thread, this data is flushed.
As a consequence, no underrun or request for new data callback is sent to
SoundPool and the sound channel remains active for ever as the end of the
sample is never detected.

Change-Id: I13e0c11e4ce3f83bff7f58d347ca814b6a86712b
2011-09-06 14:37:20 -07:00
Dave Burke
f12abaf405 Merge "Handle setDataSource failures properly. #5261671" 2011-09-06 13:06:20 -07:00
Dave Burke
a28279be32 Handle setDataSource failures properly. #5261671
Change-Id: Iea0aa474d1939db23da9aabdfae2081e834f30d9
2011-09-06 20:39:47 +01:00
James Dong
351f44af54 Merge "Don't overwrite pending port setting change if there are more than one port setting change event." 2011-09-06 09:54:43 -07:00
Jamie Gennis
2e6f49cc81 Merge "MediaPlayer: remove the setTexture method" 2011-09-05 14:50:33 -07:00
Chih-Chung Chang
09bb20b5f6 Merge "Fix 5240036: Generate a reasonable bitrate for intermediate clips." 2011-09-04 19:36:20 -07:00
Pannag Sanketi
3814ff4b17 Fixing bug in SurfaceMediaSource_test
The test was making EGL calls once disconnected. Instead of calling
"disconnect" directly on the Surface, and EGL calls should be made to that
effect.

Change-Id: I21468ac8cbc2cb3145a49269e32a884736cd452e
2011-09-02 17:56:35 -07:00
Eric Laurent
dca56b9432 Fix issue 5252593: any app can restart the runtime
Replace null device address string by empty sting.

Change-Id: I285c35f3345334e6d2190493b1a8a5aca1a361a4
2011-09-02 15:59:50 -07:00
Jamie Gennis
83fb94d188 MediaPlayer: remove the setTexture method
This change removes the MediaPlayer#setTexture method.  It has been
replaced with MediaPlayer#setSurface.

Change-Id: Iaecbbac7629d7092883f270694c5c67391f4ed6c
2011-09-02 15:48:52 -07:00
Andreas Huber
69a5f6c3e0 Properly serialize access to FileSource::getSize by acquiring the mutex
Both ::getSize and ::read call into lseek64, if this happens simultaneously
from multiple threads the results are undefined if not properly serialized.

Change-Id: I737cafebd836f3d8eb702beac557b4731f69c6f6
related-to-bug: 5196490
2011-09-02 09:34:51 -07:00
Dave Burke
fc301b0bb5 Require INTERNET permission for network-based content.
Bug #1870981

Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
2011-09-02 11:26:59 +01:00
Chih-Chung Chang
8b1f350993 Fix 5240036: Generate a reasonable bitrate for intermediate clips.
Change-Id: I96bf9a7d0e2ce78fd19cce7bccbd4ac318748709
2011-09-02 18:19:54 +08:00
James Dong
bd9d03010d Don't overwrite pending port setting change if there are more than one port setting change event.
Change-Id: I3413f5235b191031252aa3785f5aaef00caef1ce
related-to-bug: 5122512
2011-09-01 19:39:18 -07:00
Jean-Michel Trivi
466ade5ad6 Fix bug 5045498 Unhide Remote Control Client API
The RemoteControlClient API enables media application to have
 information such as album art, current song, playback state
 be displayed on "remote control displays", as well as be
 controlled by "remote controls".
The new API consists in:
 - a new class, RemoteControlClient
 - new methods in AudioManager to register a RemoteControlClient
 - a new class, RemoteControlClient.MetadataEditor to edit and
  apply the information associated with a RemoteControlClient,
  and which will be displayed on a "remote control display"

Change-Id: I5616085e4ad58ce0bbc1a5953b0a5a28d32f8703
2011-09-01 16:13:50 -07:00
Andreas Huber
ae51008564 Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset." 2011-09-01 12:20:24 -07:00
Andreas Huber
67a041fa1f Guard the audio notifications with a separate lock to avoid deadlocks during reset.
Change-Id: I9a97372e1f777d1cbd6774cac2ed34b4b8cd9392
related-to-bug: 5179827
2011-09-01 11:39:11 -07:00
Andreas Huber
d38ecf8ce0 Signal an error when encountering a malformed .ts stream.
Change-Id: I3ab0215419214b652573945403eb45eb09d41aff
related-to-bug: 5114811
2011-09-01 11:04:43 -07:00
Jean-Michel Trivi
a6ec356d2f Merge "Fix 5243349 RemoteControlDisplay incorrectly updated" 2011-08-31 19:02:59 -07:00
Jean-Michel Trivi
b716f0b7b2 Fix 5243349 RemoteControlDisplay incorrectly updated
This fixes a case where the RCD would display transport control
 for a RemoteControlClient that didn't have audio focus.
This was happening because registering an RCD was directly calling
 the updateRemoteControlDisplay method, without first calling
 the checkUpdateRemoteControlDisplay method which verifies the
 conditions before updating the display. One of those conditions
 is that the audio focus stack shouldn't be empty.

To verify this fix, several functions were also rename to clearly
 indicate the lock order and verify we properly synchronize on
 the right objects. In doing so, a missing synchronization on
 audio focus was found.

Change-Id: If1baaac224ea676aeb83ac0aefcc53f87461c32e
2011-08-31 18:24:04 -07:00
Rajneesh Chowdury
270bcaa9d1 Merge "Fix for 5156702 Rotate video output for thumbnails and export" 2011-08-31 17:14:52 -07:00
Andreas Huber
9100473a7e Merge "I have one HLS stream that switches stream PIDs from one bandwidth to the next" 2011-08-31 16:44:49 -07:00