5906 Commits

Author SHA1 Message Date
Marco Nelissen
1c1d1e7ed7 Merge "Gapless playback, step 1." 2012-03-13 13:23:07 -07:00
Marco Nelissen
84b8320545 Gapless playback, step 1.
Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.

Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
2012-03-13 13:13:14 -07:00
James Dong
7cd59760be Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base" 2012-03-13 12:44:54 -07:00
Glenn Kasten
18db49a462 Whitespace and indentation
Fix indentation to be multiple of 4.
Make it easier to search:
  sp< not sp < to
  "switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.

Use git diff -b or -w to verify.

Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
2012-03-13 11:09:47 -07:00
Insun Kang
d59e4e2b05 Fixing coding style : Indentation
Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
2012-03-13 17:17:41 +09:00
James Dong
e1dea48f92 Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base

o related-to-bug: 6044887

Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
2012-03-12 21:28:57 -07:00
James Dong
b9e8d86b74 Merge "Removed the include header path since it is not needed." 2012-03-12 17:51:05 -07:00
Glenn Kasten
4d367c54d1 Merge "MediaPlayer doc for setDataSource by file pathname" 2012-03-12 15:52:54 -07:00
Andreas Huber
b8f8809472 Merge "Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec." 2012-03-12 15:03:26 -07:00
Andreas Huber
c52b980277 Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.
and MediaExtractor.readSampleData now works with a non-direct byte buffer.

Change-Id: Ifbe5c152d9550c34d3b1d493e12a223eb98e8b4e
2012-03-12 14:49:43 -07:00
James Dong
1b5fa0f811 Removed the include header path since it is not needed.
o related-to-bug: 6044894

Change-Id: I15aec441dc0c75804aa33fc3e7ef977f7490922d
2012-03-12 14:46:41 -07:00
James Dong
029d7e15f3 Hide deprecated MediaRecorder.java APIs
o related-to-bug: 6085208

Change-Id: I6d4d2c20756b317661c94ebe35752a040ece8283
2012-03-12 12:33:10 -07:00
Jean-Michel Trivi
e94434712b Merge "Extend WAV extractor for multichannel" 2012-03-12 11:21:35 -07:00
Glenn Kasten
55d1eea694 MediaPlayer doc for setDataSource by file pathname
Change-Id: Icb5acbf75242ca2df62ccda5185f8841217653a0
2012-03-09 17:01:51 -08:00
Jean-Michel Trivi
63ffeeb6b3 Extend WAV extractor for multichannel
Support multichannel (more than 2) audio in WAV.
Support WAV_EXT format.

Change-Id: If0e6cf28cb3096f4f148ff6583f7e01db8f8a901
2012-03-09 16:50:06 -08:00
Glenn Kasten
28b269f341 Use audio_policy_output_flags_t consistently
This affects:
 - IAudioFlinger::openOutput
 - AudioTrack::AudioTrack
 - AudioTrack::set
 - apps that call these

Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
2012-03-09 15:32:22 -08:00
Glenn Kasten
df0d3ab4d0 Merge "Use AudioRecord::record_flags consistently" 2012-03-09 15:23:45 -08:00
Conley Owens
c2a4a106d3 am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit 'ea374096511f92206c264f3f1eb0551a05a34cd5':
  stagefright amrwbenc: Simplify the definition of static_vo
2012-03-09 15:15:35 -08:00
Conley Owens
8f3ca63476 am 3557654c: am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '3557654c95bae7754dcd1951ec10742b895817e2':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero
2012-03-09 15:15:32 -08:00
Conley Owens
c24f5ba4ee am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
  stagefright amrwbenc: Simplify the definition of static_vo
2012-03-09 15:10:08 -08:00
Conley Owens
66da3fdce4 am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '972efafb90b543eea51aa5b23104d469a1bcc1fb':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero
2012-03-09 15:09:58 -08:00
Conley Owens
9a3f3b9db6 am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
  stagefright amrwbenc: Simplify the definition of static_vo
2012-03-09 15:06:53 -08:00
Conley Owens
972efafb90 am 6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '6db6ea02b999e86dfbddd08780eeab0034389f93':
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero
2012-03-09 15:06:48 -08:00
Andreas Huber
27fa14dfb8 Merge "Fix memory leak when carrying ABuffer* in AMessages." 2012-03-09 14:44:13 -08:00
Andreas Huber
6d679e02e4 Fix memory leak when carrying ABuffer* in AMessages.
Change-Id: Icb4770ca238d316e6dd2d89159357a8fdb504ea9
2012-03-09 14:33:01 -08:00
Marco Nelissen
1eb0e4a260 Improve AudioPlayer position reporting
The latency was not taken into account when updating mPositionTimeRealUs
inside of the fillBuffer hook, contrary to what the getRealTimeUsLocked()
method does. This caused the realTimeOffset calculated in the
getMediaTimeUs to always be negative, causing the reported position to
always be equal to mPositionTimeMediaUs, which is updated infrequently.
With this change, the reported position is updated more frequently, allowing
apps to perform smoother UI updates.

Change-Id: I61e05c1a8b53d46b9091afb0d18a6289d13a7a5e
2012-03-09 12:27:06 -08:00
Conley Owens
67cf093d86 Merge "stagefright amrwbenc: Simplify the definition of static_vo" 2012-03-09 08:54:59 -08:00
Conley Owens
6db6ea02b9 Merge changes I00c852e4,Ib31bf028
* changes:
  stagefright aacenc: Avoid overflows when calculating normFactor
  stagefright aacenc: Avoid a division by zero
2012-03-09 08:53:40 -08:00
Glenn Kasten
f60a5d7162 Use AudioRecord::record_flags consistently
Change-Id: I6f369a2b99eb515603bc7d5629a07db2b96783fe
2012-03-08 18:11:55 -08:00
Jeff Sharkey
8ac70c4250 Merge "Split Parcel JNI details away from Binder." 2012-03-08 17:52:54 -08:00
Eric Laurent
d10a5992f9 Merge "audio policy: use audio_devices_t when appropriate" 2012-03-08 17:45:44 -08:00
Jeff Tinker
62ee80873b Merge "Fix videos app bandwidth accounting for 4G streaming" 2012-03-08 16:40:44 -08:00
Jeff Sharkey
d84e1ce0b5 Split Parcel JNI details away from Binder.
This is purely a refactoring, with no change to the underlying
functionality.

Change-Id: I41b59f14e57d1cc144274a01f77658d99a1bfe02
2012-03-08 16:06:30 -08:00
Eric Laurent
c9ab9f5c2c audio policy: use audio_devices_t when appropriate
Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
2012-03-08 15:57:09 -08:00
Eino-Ville Talvala
a4fd93751d Allow multiple releases to be called on MediaActionSound.
Bug: 6136088
Change-Id: I80ff09a90cd65d874ae016d450c4cc8c6a56d387
2012-03-08 14:18:06 -08:00
James Dong
0de2ed3bf3 Merge "Changed 480p and 1080p resolution documentation" 2012-03-07 17:27:55 -08:00
Dirk Dougherty
97d0ae391d Merge "resolved conflicts for merge of 532679a5 to master" 2012-03-07 17:02:28 -08:00
Dirk Dougherty
e61cad321d resolved conflicts for merge of 532679a5 to master
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
2012-03-07 16:58:03 -08:00
Eric Laurent
7ef9743597 Merge "AudioService: fix system stream muted by restore" 2012-03-07 16:22:27 -08:00
Glenn Kasten
78c914f37a Merge "IAudioFlingerClient::ioConfigChanged param2 const" 2012-03-07 16:08:59 -08:00
Eric Laurent
9ac8d0c445 AudioService: fix system stream muted by restore
Releases prior ICS (included) would persist the stream volumes in the
database when muted by silent mode. If the DB was backed up while in
silent mode, stream volume was backed up at 0.
When restored on a new device, the volume was restored at 0 which was
a problem for SYSTEM stream because it would never be corrected as
this stream volume is fixed.

Added a check on valid volume values when reading settings from the DB
and correct the DB if this happens.

Change-Id: Ie3b98eb74e10413c22aab7568b83ac3ace5bfc07
2012-03-07 16:00:57 -08:00
Eino-Ville Talvala
d5f0799082 Merge "NEW_API: Rework CameraSound into MediaActionSound, and unhide it." 2012-03-07 13:54:43 -08:00
Jean-Michel Trivi
e8bacb4ea0 Merge "Effect for multichannel PCM downmix to stereo" 2012-03-07 11:53:21 -08:00
Jean-Michel Trivi
64143abe1f Effect for multichannel PCM downmix to stereo
First pass at implementing an audio effect whose role is to
 downmix multichannel PCM buffers to stereo.
The effect is not handling volume changes.
The effect code here handles quad, 4.0, 5.1 and 7.1 input configurations,
 to optimize the most commom configurations, and does not yet handle
 generic multichanel configurations.

Change-Id: I74d04bd961348f3f0e4ae7714b70e620808a0829
2012-03-07 10:17:19 -08:00
Glenn Kasten
ffed04ac3c IAudioFlingerClient::ioConfigChanged param2 const
The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged
is used as an input.  So changed it from void * to const void *.
It is then cast to const OutputDescriptor *
or const audio_stream_type_t * depending on the event.

Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
2012-03-06 16:43:19 -08:00
Eino-Ville Talvala
e69095869c NEW_API: Rework CameraSound into MediaActionSound, and unhide it.
MediaActionSound is a helper class for applications that use the
camera, or include camera-like behavior such as taking
screenshots. This class helps applications match the sound-playing
behavior of the Camera.takePicture, MediaRecorder.start, and
MediaRecorder.stop methods.

This is useful for applications that don't use the above methods, but
still logically capture images or video, such as the panorama capture
feature and the video effects in the platform camera application.

Bug: 5029099
Change-Id: I829f6e2941f167f91f9cb506215b7232cb054958
2012-03-06 16:33:50 -08:00
Eric Laurent
d1f0023ddf Merge "MediaPlayerService: fix AudioSink latency" 2012-03-06 10:53:39 -08:00
Eric Laurent
54682583ba Merge "AudioTrack: relax check on minimum buffer size" 2012-03-06 10:52:18 -08:00
James Dong
b7fdddab0d Merge "Remove unused code - MediaSourceSplitter" 2012-03-06 10:23:58 -08:00
Glenn Kasten
46c92df26d Merge "Remove references to sched_policy.h" 2012-03-06 08:17:20 -08:00