5298 Commits

Author SHA1 Message Date
James Dong
977442c487 am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
* commit 'ee7ebb3257d9337627b175835dc3d08f9b8ab339':
  Fix a hang issue where the first frame can be dropped for timelapse video recording.
2011-11-08 07:00:34 +00:00
James Dong
ee7ebb3257 Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 2011-11-07 22:57:02 -08:00
Andreas Huber
014f69217d Merge "Use binary search to discover closest sync sample index, replace" 2011-11-07 15:04:56 -08:00
Andreas Huber
43b28298a6 Use binary search to discover closest sync sample index, replace
assertions with runtime errors in case the file's table of sync sample
indices is not sorted properly.

Change-Id: Ie4446a44e613a8d329ac680c37361d4407d22520
related-to-bug: 5549855
2011-11-07 11:38:14 -08:00
Eric Laurent
3a8f6bedc3 resolved conflicts for merge of 914972be to master
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
2011-11-05 09:32:35 -07:00
Eric Laurent
f434fb50a6 resolved conflicts for merge of 79178b8b to master
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
2011-11-05 08:52:20 -07:00
Eric Laurent
914972be65 Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 2011-11-04 08:29:30 -07:00
Eric Laurent
79178b8b3d Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 2011-11-04 08:27:45 -07:00
Marco Nelissen
a4e702c2da am f51f1bd9: Verify we actually have valid utf8 metadata
* commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
  Verify we actually have valid utf8 metadata
2011-11-03 20:18:37 +00:00
Marco Nelissen
f51f1bd9d4 Verify we actually have valid utf8 metadata
Before calling NewStringUTF, check that the metadata value is actually
valid utf-8, and replace the offending characters with "?" if it is not.
b/5534491

Change-Id: I43de4307e739ae0b7d4177937ed33aa1dfb90d98
2011-11-03 13:12:16 -07:00
Andreas Huber
57f2887c33 am e395f645: Poll input data with a small timeout and don\'t consume a full core.
* commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617':
  Poll input data with a small timeout and don't consume a full core.
2011-11-03 18:12:39 +00:00
Andreas Huber
e395f645aa Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
2011-11-03 11:00:21 -07:00
Eric Laurent
70fc06ebfe am 1f85f1dc: Merge "Remove unreliable effect tests." into ics-mr1
* commit '1f85f1dc6ebe3c79ce753f0f9c2f9fa7f29f493d':
  Remove unreliable effect tests.
2011-11-03 15:49:16 +00:00
Eric Laurent
be5fc40fe7 Remove unreliable effect tests.
Remove automated tests checking that audio effects are actually processing
the signal based on visualizer captures.
This method is too unreliable when used to measure energy at given frequencies and
often gives false negatives.

Issue 5542879.

Change-Id: Ib31158fd84ff9edc85712ec03c0c9957370c8f84
2011-11-02 18:02:05 -07:00
Eric Laurent
8b4529e50b Fix problem in lvm effect bundle wrapper.
When an effect is disabled, the process function should either
copy or accumulate the content of the input buffer to the output buffer
depending on the behavior requested by the framework.
Current implementation is copying the input buffer unconditionally.

Related to issue 5433942.

Change-Id: Ic488ca97eadcc4c763de570d7e6c6f5b7a979415
2011-11-02 09:14:13 -07:00
Eric Laurent
19774dda20 am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
  Fix volume indication in vibrate mode.
2011-11-01 21:59:18 +00:00
Andreas Huber
fe5f0aae65 Properly decode ADTS files with ID3 headers.
Change-Id: I55247e79ac9cc9547e3e0f6fe048bcbdc9b639d1
2011-11-01 12:09:53 -07:00
Eric Laurent
b0c6e3bcf1 Fix device management in lvm effect bundle wrapper.
The virtualizer and bass boost effects should be disabled when
not playing throught headsets or headphones.

There is a bug in current wrapper implementation that makes that those
effects are not disabled if the effect is enabled by the user after
the headset has been removed (current logic only works if the device selection
occurs while the effect is enabled).

Change-Id: I7c66b15a0339d95fb9ed13c8320d66379725d3b6
2011-11-01 09:12:19 -07:00
Andreas Huber
688ff9a7d6 Merge "Support new HLS byte-range extensions" 2011-11-01 08:30:54 -07:00
Eric Laurent
cd84197ac1 am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
  Fix volume indication in vibrate mode.
2011-10-31 23:23:15 +00:00
Amith Yamasani
468825f60a am 18936d7d: am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
* commit '18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb':
  Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
2011-10-31 22:13:08 +00:00
Andreas Huber
796da70392 Support new HLS byte-range extensions
Change-Id: Ic767ddea93ffcb87d83b8fbc20837486648da3d7
2011-10-31 14:25:16 -07:00
Eric Laurent
8ca9a1cf35 Fix volume indication in vibrate mode.
The latest change in silent/vibrate mode selection via volume keys
was such that ringtone volume was not showing 0 when entering vibrate mode
by continuous press on vol down.

Issue 5530217.

Change-Id: I9ba817648e5dca40e0d19f5f606d7763ae61b1c6
2011-10-31 12:12:37 -07:00
Joe Fernandez
eba186448f am 74b2b954: am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '74b2b9547329a0b05e0bd5701057696007b854bb':
  docs: add developer guide cross references, Project ACRE, round 3
2011-10-31 12:26:31 +00:00
Amith Yamasani
18936d7d1d am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
  Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
2011-10-30 21:37:09 +00:00
Joe Fernandez
74b2b95473 am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '09848bc89de999416e2de82a7693b2deec6bf802':
  docs: add developer guide cross references, Project ACRE, round 3
2011-10-29 02:16:10 +00:00
Amith Yamasani
69e640ee84 Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 2011-10-28 18:59:11 -07:00
Amith Yamasani
c696a53d1f Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
In order to completely mute the ringer (no vibrate), introduce an extra
state beyond mute, which mutes the vibrator as well, if it was enabled.

Bug: 5530217

Change-Id: Ib1f299ee6bbca56c1aa7e1100662591362d08307
2011-10-28 18:40:43 -07:00
Joe Fernandez
09848bc89d Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0 2011-10-28 15:40:11 -07:00
Joe Fernandez
61fd1e8d8c docs: add developer guide cross references, Project ACRE, round 3
Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
2011-10-28 14:23:23 -07:00
Andreas Huber
e10d9126e5 am 27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1
* commit '27ed12492dfbec6ec67b66ff3cf60febce370b01':
  Properly report that we're no longer playing after receiving event
2011-10-28 16:17:54 +00:00
Andreas Huber
27ed12492d Merge "Properly report that we're no longer playing after receiving event" into ics-mr1 2011-10-28 09:13:54 -07:00
Jamie Gennis
e396e993a5 am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit 'fc9592f8a5f2f75207e5e532655ac294eb2b334b':
  Stagefright: ANW::connect in MediaPlayerService
2011-10-28 02:53:20 +00:00
Jamie Gennis
fc9592f8a5 am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
  Stagefright: ANW::connect in MediaPlayerService
2011-10-28 02:14:01 +00:00
James Dong
21122cb44e am da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
* commit 'da57c0e8cf7e5022dd927b51fab3c1a40a8adf54':
  Report call status from AudioSource::start() to file writer
2011-10-27 22:28:08 +00:00
James Dong
da57c0e8cf Merge "Report call status from AudioSource::start() to file writer" into ics-mr1 2011-10-27 15:24:28 -07:00
James Dong
b4a9fd9faf am 17a5fb36: Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
* commit '17a5fb36f88d90e30fd656d0d93b540ec2e2b84a':
  Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.
2011-10-27 21:13:54 +00:00
James Dong
17a5fb36f8 Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1 2011-10-27 14:09:50 -07:00
Andreas Huber
0a69dc0719 am 1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
* commit '1388aced2a5ce3aafa8b0ae922925efafb61a5e1':
  Fix a reference to a stale pointer in AwesomePlayer.
2011-10-27 16:11:56 +00:00
Andreas Huber
1388aced2a Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1 2011-10-27 09:07:23 -07:00
James Dong
33fe290ca3 Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording.
Change-Id: I328d9fa83a381415d7648218a6fb93b3724bbcc6
related-to-bug: 5343832
2011-10-27 08:47:07 -07:00
James Dong
b888fd1306 Fix a hang issue where the first frame can be dropped for timelapse video recording.
Change-Id: I04754f1005a983953a80a659ff13f8762d0e120c
related-to-bug: 5523502
2011-10-26 23:47:55 -07:00
James Dong
02b32fc33a Report call status from AudioSource::start() to file writer
Change-Id: I5109dc87a92170dede4eaa58b039efe6d8b7c330
related-to-bug: 5514288
2011-10-26 23:35:01 -07:00
Jamie Gennis
2fa0ac2e44 Stagefright: ANW::connect in MediaPlayerService
This change moves the ANativeWindow connect and disconnect logic from
MediaPlayer to MediaPlayerService::Client.

Bug: 5502654
Change-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d
2011-10-26 18:40:00 -07:00
Andreas Huber
e96e84b577 Properly report that we're no longer playing after receiving event
MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR.

Change-Id: I03eeba751d3728adb33d9c66de4c7444a91696f3
2011-10-26 15:23:31 -07:00
Jamie Gennis
8b5c6efdbc am 5ded5fc5: am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit '5ded5fc55f2da2af0a76a9ddc52d27948b227037':
  Stagefright: push blank buffers when tearing down
2011-10-26 20:39:25 +00:00
Jamie Gennis
5ded5fc55f am b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit 'b7b4eaaa05284634d50d581d924a250f1194f66d':
  Stagefright: push blank buffers when tearing down
2011-10-26 20:34:38 +00:00
Andreas Huber
d2b76d707b Fix a reference to a stale pointer in AwesomePlayer.
The pointer returned by MetaData::findCString may become stale if the metadata
object is modified. Make a copy of the returned mime type in order to prevent
MediaPlayer::dump log corruption.

Change-Id: I9077aee36c4316d83b37fb909bf91e6b3f75d5d2
2011-10-26 12:35:03 -07:00
Steve Block
71f2cf116a Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
2011-10-26 09:57:54 +01:00
Jamie Gennis
c0e4293794 Stagefright: push blank buffers when tearing down
This change makes OMXCodec push RGB 565 buffers filled with black to an
ANativeWindow when tearing down after decoding to protected gralloc
buffers.  This allows the OMX tear down to zero out any protected
buffers that were used without the possibility that the buffer is still
being used by SurfaceFlinger or HWComposer.

Bug: 5483222
Change-Id: I8acedd81a7bb67dfdc2fd15733e3375b6ce8d560
2011-10-25 18:35:02 -07:00