5189 Commits

Author SHA1 Message Date
James Dong
007d08ac28 am fbab0869: Merge "MTS Recorder Test: Use VideoFrameRate from Device Camcorder Profile"
* commit 'fbab086933cfbfda2b41b2dbf69ac644f36a686f':
  MTS Recorder Test: Use VideoFrameRate from Device Camcorder Profile
2011-09-09 17:34:56 -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
a1e9137c7e am 4cf9a3b8: Merge "Fix another hardcoded frame rate in the media framework test"
* commit '4cf9a3b857e78d7a9a71b104d8531aa18a150978':
  Fix another hardcoded frame rate in the media framework test
2011-09-09 15:52:31 -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
203b5d29be am 973f553b: Make MediaScanner skip certain directories
* commit '973f553be4aabf9656d6c1596b47767896677b0a':
  Make MediaScanner skip certain directories
2011-09-09 15:41:18 -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
4ec5f80910 am 6f84da50: Merge "Don\'t check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation"
* commit '6f84da50ad9a9fa044543fa5dde197f609b01a8f':
  Don't check mFilledBuffers whether it is empty or not when the port reconfiguration is not meant for buffer reallocation
2011-09-09 14:59:09 -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
29c8921763 am 02ea7d48: Merge "Fix bug 5045498 Unhide Remote Control Client API"
* commit '02ea7d48773210fa0f29299269aca26b3201b1d0':
  Fix bug 5045498 Unhide Remote Control Client API
2011-09-09 09:08:05 -07:00
Eric Laurent
c406a3bd34 am ebf6478f: Merge "Fix issue 4673378: switching from VoIP to GSM call"
* commit 'ebf6478f557c20fc1c23f9537fcdc3f3c66decb4':
  Fix issue 4673378: switching from VoIP to GSM call
2011-09-09 09:07:54 -07:00
Chih-Chung Chang
ebe5d63765 am fa720d30: Merge "Fix 5278371: OOM in MediaItemThumbnailTest"
* commit 'fa720d301569df2b766c04225ad0187f40a1a9e7':
  Fix 5278371: OOM in MediaItemThumbnailTest
2011-09-09 09:06:32 -07:00
Eric Laurent
8cde171e98 am 11e2e5de: Merge "AudioTrack: extend callback thread sleep time"
* commit '11e2e5dece7a92f50b73240dc0300343a7b495bf':
  AudioTrack: extend callback thread sleep time
2011-09-09 09:03:16 -07:00
Pannag Sanketi
5a8c298018 am 5303254c: Merge "Always set geometry in queuebuffer"
* commit '5303254cc944449d08c8489caf288516445f7af0':
  Always set geometry in queuebuffer
2011-09-09 09:02:16 -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
17f16d8f08 am 13561602: Merge "Audio player must not be used as a timesource before it\'s started."
* commit '135616025f06dfdfff3d6bed51885ef8de5f49b5':
  Audio player must not be used as a timesource before it's started.
2011-09-08 11:41:05 -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
2801d5de5f am 70ad1c37: Merge "Fix 5156702: rotate thumbnails"
* commit '70ad1c378bce097f9f2dbb79cb8d5d225d4c14d7':
  Fix 5156702: rotate thumbnails
2011-09-08 05:54:16 -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
4c88262e98 am 65e7815d: Merge "Bug 5270905 fix MediaPlayer with IStreamSource"
* commit '65e7815dd49a836e410bfa2817d9d48576547a9a':
  Bug 5270905 fix MediaPlayer with IStreamSource
2011-09-07 14:58:39 -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
ebbedc903e am 166c1b2e: Merge "Fixing bug in SurfaceMediaSource_test"
* commit '166c1b2e7a1a48a39ecd2400b94f9f21c9868810':
  Fixing bug in SurfaceMediaSource_test
2011-09-07 14:20:28 -07:00
Pannag Sanketi
166c1b2e7a Merge "Fixing bug in SurfaceMediaSource_test" 2011-09-07 14:18:41 -07:00
Andreas Huber
70ba221595 am 6a39c020: Merge "Apparently keyframe status in audio tracks of .webm/.mkv files is unreliable"
* commit '6a39c0201ca72d6ccbc63e5fec75949a08fcb043':
  Apparently keyframe status in audio tracks of .webm/.mkv files is unreliable
2011-09-07 11:21:30 -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
080eeed5dd am 01dba603: Merge "Stop metadata retriever from dereferencing a NULL pointer if"
* commit '01dba603d7c74756126297b843aca0befed8810c':
  Stop metadata retriever from dereferencing a NULL pointer if
2011-09-07 09:06:46 -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
284ed6de6c am 4880a736: Merge "Fix startBluetoothSco race"
* commit '4880a736dc518b60a199ac1d2a003dc6148991ea':
  Fix startBluetoothSco race
2011-09-07 07:56:36 -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
075b0c8236 am ccccb505: Merge "Use device-dependent frame rate in the media recorder performance test"
* commit 'ccccb505abb1fb16d349e80d03edfde3c6775202':
  Use device-dependent frame rate in the media recorder performance test
2011-09-07 04:09:45 -07:00
James Dong
ccccb505ab Merge "Use device-dependent frame rate in the media recorder performance test" 2011-09-07 04:07:39 -07:00
Dave Burke
5ff00d1a8c am a57c639f: Merge "Revert "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams.""
* commit 'a57c639fa7639d80ad29b5b876934f46851dcc69':
  Revert "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."
2011-09-07 04:01:23 -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
55b52d8fc0 am b6738fc6: Merge "Issue 5247986: Battery drain due to audio wakelock"
* commit 'b6738fc6a5ab08c23ecc7c0d84316f5fa5e05064':
  Issue 5247986: Battery drain due to audio wakelock
2011-09-06 14:56:14 -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
ee61f8d589 am f12abaf4: Merge "Handle setDataSource failures properly. #5261671"
* commit 'f12abaf40588615fa418fb711a4d754098b589f3':
  Handle setDataSource failures properly. #5261671
2011-09-06 13:08:07 -07:00