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

5294 Commits

Author SHA1 Message Date
Andreas Huber
311b8e26e3 am 781ae92f: Merge "Support AMR, G.711 and vorbis audio in ACodec and friends." 
* commit '781ae92f11ff136b99acb56cc361ad662d9cb6b9':
  Support AMR, G.711 and vorbis audio in ACodec and friends.
 2011-09-28 13:15:20 -07:00
Andreas Huber
781ae92f11 Merge "Support AMR, G.711 and vorbis audio in ACodec and friends." 2011-09-28 13:13:33 -07:00
Xia Wang
528fd0fcb0 am 0a6cd02b: am b2d17234: Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom 
* commit '0a6cd02b4824f9f974257362eddef0c5c5d46ab3':
  Reorganize media framework functional tests. Group tests into sub-packages
 2011-09-28 12:42:04 -07:00
Xia Wang
0a6cd02b48 am b2d17234: Merge "Reorganize media framework functional tests. Group tests into sub-packages" into ics-factoryrom 
* commit 'b2d17234b77cda555905e0da997f543708374246':
  Reorganize media framework functional tests. Group tests into sub-packages
 2011-09-28 12:40:07 -07:00
Andreas Huber
3e408f39ef Support AMR, G.711 and vorbis audio in ACodec and friends. 
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
 2011-09-28 12:37:36 -07:00
Marco Nelissen
2c22603d28 am 8df38890: Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634" 
* commit '8df38890d4634aec70c5d37bc90a3a2f836f8aa1':
  Log a warning when a MediaPlayer is finalized without having being released. b/5382634
 2011-09-28 09:42:53 -07:00
Marco Nelissen
8df38890d4 Merge "Log a warning when a MediaPlayer is finalized without having being released. b/5382634" 2011-09-28 09:41:12 -07:00
Marco Nelissen
8dc208476f Log a warning when a MediaPlayer is finalized without having being released. 
b/5382634

Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
 2011-09-28 09:21:11 -07:00
Andreas Huber
9669fab20d am d4fb497c: Merge "Cut down on AwesomePlayer and OMXCodec\'s verbosity." 
* commit 'd4fb497cf4606abf61ec690ed971523ff9d05eac':
  Cut down on AwesomePlayer and OMXCodec's verbosity.
 2011-09-27 19:20:19 -07:00
Xia Wang
db6028508c Reorganize media framework functional tests. 
Group tests into sub-packages

Change-Id: I878e14487142de495fc646037d5d0b51e39341bd
 2011-09-27 16:00:20 -07:00
Andreas Huber
262d7e8e21 Cut down on AwesomePlayer and OMXCodec's verbosity. 
Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug: 5382014
 2011-09-27 15:07:36 -07:00
Andreas Huber
d15568d23e am d33b3881: Merge "Signal an appropriate error even if there are no active streams yet." 
* commit 'd33b3881f7647e721181c46f9166ee139cec7e38':
  Signal an appropriate error even if there are no active streams yet.
 2011-09-27 13:38:05 -07:00
Andreas Huber
d33b3881f7 Merge "Signal an appropriate error even if there are no active streams yet." 2011-09-27 13:36:22 -07:00
Andreas Huber
7922619e9c Signal an appropriate error even if there are no active streams yet. 
Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49
related-to-bug: 5372901
 2011-09-27 12:13:37 -07:00
Eric Laurent
49b02e1ed1 am 53719fc4: Merge "Fix issue 5373048: AudioCache decode errors" 
* commit '53719fc4c5c441e8696f26bbfb9166b0bd19ef29':
  Fix issue 5373048: AudioCache decode errors
 2011-09-27 10:40:33 -07:00
Eric Laurent
53719fc4c5 Merge "Fix issue 5373048: AudioCache decode errors" 2011-09-27 10:32:17 -07:00
Eric Laurent
9968a36f29 Fix issue 5373048: AudioCache decode errors 
When decoding a file for the SoundPool, do not
reject the entire file in case of error but
return what was decoded so far instead.

Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
 2011-09-27 10:23:38 -07:00
Andreas Huber
e9ee8a90e9 am 48719dc6: Merge "Propagate error signalled by the source all the way to the output EOS notification." 
* commit '48719dc6221fdfbc3cc49a21166b136577fe37b9':
  Propagate error signalled by the source all the way to the output EOS notification.
 2011-09-26 11:04:49 -07:00
Andreas Huber
928baf1f54 Propagate error signalled by the source all the way to the output EOS notification. 
Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7
related-to-bug: 5372901
 2011-09-26 10:53:29 -07:00
Andreas Huber
16c519480f am 3bade950: Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries" 
* commit '3bade9504a648ce7606b876dc7d71b4684e279c9':
  Support even more .avi files with .mp3 content not aligned to chunk boundaries
 2011-09-26 08:10:51 -07:00
Andreas Huber
3bade9504a Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries" 2011-09-26 08:09:11 -07:00
Andreas Huber
bea34b942d Support even more .avi files with .mp3 content not aligned to chunk boundaries 
Change-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d
related-to-bug: 5349382
 2011-09-23 14:59:31 -07:00
Eric Laurent
c318cd339b am 65837ced: Merge "Fix issue 5355047: Automated effect tests fail." 
* commit '65837cede462b551742f900f2e2f5a1d5dd576a2':
  Fix issue 5355047: Automated effect tests fail.
 2011-09-23 14:44:38 -07:00
Eric Laurent
65837cede4 Merge "Fix issue 5355047: Automated effect tests fail." 2011-09-23 14:43:12 -07:00
Eric Laurent
5e7acae2c3 Fix issue 5355047: Automated effect tests fail. 
Fixed several regressions in automated audio effect tests due
to changes in effect framework and visualizer FFT output range.

- Do not suspend Volume effect on session 0 when effects are
enabled on specific sessions.
- Adapt energy detection thresholds to new visualizer FFT range.
- Leave more time for BassBoost and Virtualizer effects to ramp up
before measuring the effect.
- Removed second insert reverb left by mistake on the player session
in preset reverb test.

Change-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f
 2011-09-23 10:15:05 -07:00
Pannag Sanketi
f5e4892e5f am 91d34137: am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 
* commit '91d34137903c278e5e077fa1edef9bbbcdd140f7':
  Returning EOS in SurfaceMediaSource:read
 2011-09-23 09:10:41 -07:00
Pannag Sanketi
91d3413790 am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom 
* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
  Returning EOS in SurfaceMediaSource:read
 2011-09-23 09:08:11 -07:00
Pannag Sanketi
a1849fceaf Returning EOS in SurfaceMediaSource:read 
In SurfaceMediaSource::read, if disconnect has already been called, then
ERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it
sometimes leads to a crash in mediarecorder stop() call.

Related to FactoryROM bug: 5332812

Change-Id: I22132538ab2501d084e0283876817b1ec3f64a1d
 2011-09-22 17:03:48 -07:00
Dianne Hackborn
fb35db7cce am dda868cd: Merge "Keyguard sound needs to hold wake lock." 
* commit 'dda868cd3383aecb45b42e39abfa2670101dde00':
  Keyguard sound needs to hold wake lock.
 2011-09-21 15:17:09 -07:00
Dianne Hackborn
dda868cd33 Merge "Keyguard sound needs to hold wake lock." 2011-09-21 15:15:18 -07:00
Andreas Huber
e404017b23 am bfd1c9d9: Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported" 
* commit 'bfd1c9d93f47040bc52a1fbdc8ae81502a6f4b23':
  Support some .avi files containing H.264 video, log warnings if audio/video unsupported
 2011-09-21 13:57:54 -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
435cadbca9 am faa75f61: Merge "Bug 5234242 audio continues after discontinuity" 
* commit 'faa75f6146165016685291084ca79ddd377411b4':
  Bug 5234242 audio continues after discontinuity
 2011-09-21 10:54:07 -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
0d8fff6b4f am eb060254: am 9c43016b: Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom 
* commit 'eb060254a0b7aa42ab05ed6539156c3084ec1908':
  Bug 5045498 Keep track of RemoteControlClient play state change time
 2011-09-21 09:38:53 -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
c0a2f02e9d am 28b9a063: Merge "MediaScanner: To query row ids of music files when handling playlists." 
* commit '28b9a063ad359d186cf69b235c5592eb308d2ac4':
  MediaScanner: To query row ids of music files when handling playlists.
 2011-09-21 08:51:06 -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
Chih-Chung Chang
59ec02e87f am ed4cfe70: Merge "Fix 5224359: Add width and height to media store." 
* commit 'ed4cfe70ca165b6469d2c9fb1b5296afdff1faae':
  Fix 5224359: Add width and height to media store.
 2011-09-20 14:15:03 -07:00
James Dong
0dcba02ecc am 3907c79a: am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom 
* commit '3907c79aebf8621a5a4880c9e66db3c49a44f359':
  Add QVGA resolution to CamcorderProfile
 2011-09-20 14:13:50 -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
e18e18e29c am e2bb9960: Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams" 
* commit 'e2bb99600e3a6eed97d2739f62c84998180a705d':
  Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams
 2011-09-19 13:30:05 -07:00