drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,011 Commits 1 Branch 0 Tags
Commit Graph

5165 Commits

Author SHA1 Message Date
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
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
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
51d150be8a am 351f44af: Merge "Don\'t overwrite pending port setting change if there are more than one port setting change event." 
* commit '351f44af54f001ee67908f9e1f601f8ffa7905d2':
  Don't overwrite pending port setting change if there are more than one port setting change event.
 2011-09-06 09:56:13 -07: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
ef6776fd03 am 2e6f49cc: Merge "MediaPlayer: remove the setTexture method" 
* commit '2e6f49cc810ea8c4a23d88fdeb24267a18085556':
  MediaPlayer: remove the setTexture method
 2011-09-05 14:51:38 -07:00
Jamie Gennis
2e6f49cc81 Merge "MediaPlayer: remove the setTexture method" 2011-09-05 14:50:33 -07:00
Chih-Chung Chang
5aa547a5cb am 09bb20b5: Merge "Fix 5240036: Generate a reasonable bitrate for intermediate clips." 
* commit '09bb20b5f6072f3202c4bfd7db9b557e05547c3b':
  Fix 5240036: Generate a reasonable bitrate for intermediate clips.
 2011-09-04 19:37:57 -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
a0ab3ee321 am 929827b8: Merge "Fix issue 5252593: any app can restart the runtime" 
* commit '929827b819415101d526ff68fb0b2c8adb885132':
  Fix issue 5252593: any app can restart the runtime
 2011-09-02 16:42:26 -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
281b7d063d am 69a5f6c3: Properly serialize access to FileSource::getSize by acquiring the mutex 
* commit '69a5f6c3e04aa0f3f87eed7578a32782c97bd48f':
  Properly serialize access to FileSource::getSize by acquiring the mutex
 2011-09-02 09:45:37 -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
1065251c7d am 1d477c53: Merge "Require INTERNET permission for network-based content. Bug #1870981" 
* commit '1d477c53bf2f389813d04d5163d210fccf00ceb9':
  Require INTERNET permission for network-based content. Bug #1870981
 2011-09-02 03:32:31 -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
Andreas Huber
e7605e1bb9 am ae510085: Merge "Guard the audio notifications with a separate lock to avoid deadlocks during reset." 
* commit 'ae51008564a7a32199a144544a4ab57b976ffa9d':
  Guard the audio notifications with a separate lock to avoid deadlocks during reset.
 2011-09-01 13:28:57 -07:00
Andreas Huber
63acad5b5c am 7f5ea61b: Merge "Signal an error when encountering a malformed .ts stream." 
* commit '7f5ea61b0f0ac479f836c0c47b8b212d73486a0d':
  Signal an error when encountering a malformed .ts stream.
 2011-09-01 13:27:52 -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