OSDN Git Service

android-x86/system-media.git
12 years agoam 63a6d6f7: am ab0deb6c: Add parameter for set visualizer latency
Marco Nelissen [Thu, 7 Jun 2012 18:13:18 +0000 (11:13 -0700)]
am 63a6d6f7: am ab0deb6c: Add parameter for set visualizer latency

* commit '63a6d6f7b1a0ae600d2008d249991b402d3be96b':
  Add parameter for set visualizer latency

12 years agoam ab0deb6c: Add parameter for set visualizer latency
Marco Nelissen [Thu, 7 Jun 2012 18:10:59 +0000 (11:10 -0700)]
am ab0deb6c: Add parameter for set visualizer latency

* commit 'ab0deb6cedd635d138e3d4f0d2c0623fa7f62e46':
  Add parameter for set visualizer latency

12 years agoAdd parameter for set visualizer latency
Marco Nelissen [Thu, 7 Jun 2012 14:23:06 +0000 (07:23 -0700)]
Add parameter for set visualizer latency

b/6522728

Change-Id: If30ba44d44e54fd0a514ce5357ac438f8ae3ec5b

12 years agoCamera: Add clone buffer, make type names public
Eino-Ville Talvala [Thu, 7 Jun 2012 00:22:42 +0000 (17:22 -0700)]
Camera: Add clone buffer, make type names public

Clone metadata buffer allows for straightforward duplication of
existing buffers; type names are useful for debugging code.

Bug: 6243944
Change-Id: Ibf70f4e3bcf49d6c772bba18a577e2673f2b9213

12 years agoCamera: Add opaque user pointer to camera metadata buffer
Eino-Ville Talvala [Mon, 21 May 2012 21:46:49 +0000 (14:46 -0700)]
Camera: Add opaque user pointer to camera metadata buffer

This is useful for associating a metadata buffer handed off to a third
party with its parent object, when the buffer is returned.

Change-Id: I7e19708bb3adf4da26fc6101e78c276477276608

12 years agoCamera: Update to latest metadata definitions
Eino-Ville Talvala [Mon, 21 May 2012 00:21:04 +0000 (17:21 -0700)]
Camera: Update to latest metadata definitions

- Revamp resolution information
- Add sizes for shading, geometric correction map
- Add hyperfocal distance
- Add sensor physical size
- Remove unneeded color modes
- Add scene, effect modes
- Add some missing enums for other parameters
  - Facing
  - AF modes
  - Available scene modes

Bug: 6243944
Change-Id: Ia5c9448ef2857f8dd39488810030b4e548711194

12 years agoMerge "Camera: Minor revision to metadata tags, many more enum definitions."
Eino-Ville Talvala [Wed, 16 May 2012 18:55:24 +0000 (11:55 -0700)]
Merge "Camera: Minor revision to metadata tags, many more enum definitions."

12 years agoMerge "Improvements to camera metadata handling."
Eino-Ville Talvala [Wed, 16 May 2012 17:59:11 +0000 (10:59 -0700)]
Merge "Improvements to camera metadata handling."

12 years agoReconcile with jb-release nakasi-factoryrom-release
The Android Open Source Project [Wed, 16 May 2012 15:41:17 +0000 (08:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release

Change-Id: I247268c7e5086e0d117c0ae133731f0353cd492e

12 years agoCamera: Minor revision to metadata tags, many more enum definitions.
Eino-Ville Talvala [Mon, 14 May 2012 21:56:04 +0000 (14:56 -0700)]
Camera: Minor revision to metadata tags, many more enum definitions.

- Remove some tags, adding a few others
- Add enums for all current tags that need them for their values.

Bug: 6243944
Change-Id: I69085eaad68ef39f7047e93570b4591165cca308

12 years agoImprovements to camera metadata handling.
Eino-Ville Talvala [Thu, 10 May 2012 21:22:28 +0000 (14:22 -0700)]
Improvements to camera metadata handling.

- Cleaner interface to get/find
- Adds delete entry, an expensive O(n) operation
- Adds update entry, which is O(n) sometimes
- Minor bugfixes:
  - Keep sorted state when appending empty buffers
  - Misspelling of camera_metadata_type_size in header
  - Missing entry in type name array

Bug: 6243944
Change-Id: I316507d6adcc22aff6e7c464c6c484f31ef1510d

12 years agoam 7a789817: (-s ours) Merge "Fixed runtime linkage problems for libOpenSLES and...
Jean-Baptiste Queru [Tue, 8 May 2012 20:39:19 +0000 (13:39 -0700)]
am 7a789817: (-s ours) Merge "Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL"

* commit '7a78981743646776bb96a80a45900e53d2cc6ab8':
  Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL

12 years agoMerge "Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL"
Jean-Baptiste Queru [Tue, 8 May 2012 16:23:12 +0000 (09:23 -0700)]
Merge "Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL"

12 years agoFixed runtime linkage problems for libOpenSLES and libOpenMAXAL
Andrew Hsieh [Tue, 8 May 2012 14:55:10 +0000 (22:55 +0800)]
Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL

Libraries libOpenSLES and libOpenMAXAL depend on liblog but Android.mk
doesn't specify it.  Native app links libOpenSLES or libOpenMAXAL
may fail with the following error message (taking
$NDK/samples/native-media as an example)

E/AndroidRuntime(  824): Caused by: java.lang.UnsatisfiedLinkError:
Cannot load library: link_image[2260]:    82 could not load needed
library 'libOpenMAXAL.so' for 'libnative-media-jni.so'
(mips_relocate_got[1804]:    82 In 'libOpenMAXAL.so',
can't locate symbol __android_log_assert)

The root cause is that both libOpenSLES.so and libOpenMAXAL.so depends on
liblog (containing the offending __android_log_assert) but Android makefile
doesn't specify it.  The reason that linker doesn't complain about it
is because "--gc-sections" causes linker to "garbage-collect" which
removes unused (in this case "invisible") functions __assert/__assert2
in both shared libraries.  Unfortunately, due to a bug (recently fixed
in 2.22.52 http://sourceware.org/bugzilla/show_bug.cgi?id=13811), linker
forgot to also remove references to dead function __android_log_assert
called in __assert/__assert2.

In theory this should affect all Android devices for native app linking
libOpenMAXAL.so or libOpenSLES.so, but it seems at this moment only MIPS-based
device is affected.

Fixed Android.mk to make it explicit.

bug: http://code.google.com/p/android/issues/detail?id=30179
related CL: https://android-review.googlesource.com/#/c/36302/

Change-Id: I61655a77d85f57cf103f9ac51505dc3d58f7c866

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 23 Apr 2012 14:08:14 +0000 (07:08 -0700)]
merge in jb-release history after reset to master

12 years agoMerge "Add new scaling mode parameter in Visualizer effect"
Jean-Michel Trivi [Thu, 19 Apr 2012 16:08:11 +0000 (09:08 -0700)]
Merge "Add new scaling mode parameter in Visualizer effect"

12 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 18 Apr 2012 14:06:06 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

12 years agoAdd new scaling mode parameter in Visualizer effect
Jean-Michel Trivi [Mon, 16 Apr 2012 00:20:23 +0000 (17:20 -0700)]
Add new scaling mode parameter in Visualizer effect

Change-Id: I5c47f5a81891022ff409161aff34d7b2c4b0a2ea

12 years agoMake camera metadata tag definitions more robust to mismatches.
Eino-Ville Talvala [Wed, 11 Apr 2012 23:15:50 +0000 (16:15 -0700)]
Make camera metadata tag definitions more robust to mismatches.

Use array assignment-by-index syntax to make sure we match the desired
index to the entry, so it's easier to keep the metadata header and the
info structures in sync.

Change-Id: I06d1ea3d52c651b447cc167cd551e907c8e001ab

12 years agoImprovements to the camera metadata structure
Eino-Ville Talvala [Wed, 4 Apr 2012 22:30:06 +0000 (15:30 -0700)]
Improvements to the camera metadata structure

- Add vendor_tag_query_ops_t as argument to methods inside it.

- Add version and flags fields

- Add sorted flag; additions and appends are not sorted, and thus
  reset the flag.

- Add sort method, which sets the sorted flag.

- Add find-by-tag method, which uses a linear search on a non-sorted
  buffer, and a binary search on a sorted buffer.

- Change dump method to take in a fd, like the HAL-level dump methods
  do.

- Minor revisions to tag definitions, including a few enums for
  enumerated-value tags.

Change-Id: I5f37e326519bda032cb3362da4ab3bf50eb98b4e

12 years agoMerge remote-tracking branch 'goog/ics-aah'
Mike Lockwood [Tue, 3 Apr 2012 17:33:04 +0000 (10:33 -0700)]
Merge remote-tracking branch 'goog/ics-aah'

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 3 Apr 2012 10:35:09 +0000 (03:35 -0700)]
merge in jb-release history after reset to master

12 years agoEcho reference tuning and bug fixes
Eric Laurent [Fri, 30 Mar 2012 16:39:46 +0000 (09:39 -0700)]
Echo reference tuning and bug fixes

- Add some smoothing in the method used to detect and compensate for echo path
delay deviation: update the reference buffer only if a deviation in the same
direction is observed for more than N consecutive reads.
Also increase the threshold controlling the reference buffer update to avoid
excessive adjustments.

- Fix problem in get_next_buffer() when echo_reference_write() is called with
variable buffer sizes which happens when the echo reference is used after a
resampler in the audio HAL.

- Use the same resampler quality level in echo reference and audio HAL to help
the AEC by reducing the delay variation and filtering differences between the
capture and echo path.

- Take resampler delay into account when calculating echo reference delay.

Change-Id: I2f425154efddd9a28f1d035fde70d55104043606

12 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 28 Mar 2012 14:06:01 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

12 years agoCleanup: Remove filterfw.jar from devices.
Eino-Ville Talvala [Wed, 28 Mar 2012 00:21:44 +0000 (17:21 -0700)]
Cleanup: Remove filterfw.jar from devices.

The filter framework is now merged with frameworks.jar; remove it from
the output of incremental builds so it's not taking up needless space
on devices.

Change-Id: I2d24cecb3e52d246853ada558b2e3015222b6f58

12 years agoMerge "Multi-Project Commit: Move of filterfw out of system/media (1 of 7)"
Marius Renn [Tue, 27 Mar 2012 23:29:39 +0000 (16:29 -0700)]
Merge "Multi-Project Commit: Move of filterfw out of system/media (1 of 7)"

12 years agoMulti-Project Commit: Move of filterfw out of system/media (1 of 7)
Marius Renn [Tue, 27 Mar 2012 17:33:06 +0000 (10:33 -0700)]
Multi-Project Commit: Move of filterfw out of system/media (1 of 7)

This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.

Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.

Change-Id: Ia065ab69c2431886ae3a3db96290fa5e0f1e652d

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 27 Mar 2012 14:06:03 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

12 years agomv system/media/wilhelm to frameworks/wilhelm/
Glenn Kasten [Mon, 26 Mar 2012 23:28:48 +0000 (16:28 -0700)]
mv system/media/wilhelm to frameworks/wilhelm/

Change-Id: I2795954c04a01f68a6286ff85ac12a39a0381265

12 years agoMerge "Add a camera metadata structure and utility methods"
Eino-Ville Talvala [Mon, 26 Mar 2012 15:45:45 +0000 (08:45 -0700)]
Merge "Add a camera metadata structure and utility methods"

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 26 Mar 2012 14:08:07 +0000 (07:08 -0700)]
merge in jb-release history after reset to master

12 years agoFix a bug with the MFF use of SurfaceTexture.
Jamie Gennis [Fri, 23 Mar 2012 19:49:24 +0000 (12:49 -0700)]
Fix a bug with the MFF use of SurfaceTexture.

This change makes the MFF use a SurfaceTexture rather than a BufferQueue
for its dummy surface.  Using a dummy BufferQueue became invalid
recently, as it's now an error to connect a BQ producer before the
consumer has connected.

Bug: 6207884
Change-Id: Iffb5d623e398838c8ecffd50ee15a6fe56414810

12 years agoAdd a camera metadata structure and utility methods
Eino-Ville Talvala [Fri, 10 Feb 2012 22:27:08 +0000 (14:27 -0800)]
Add a camera metadata structure and utility methods

Change-Id: I320cc33f31ebd8ce183572a447df8fae691eec0d

12 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 21 Mar 2012 14:06:18 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 20 Mar 2012 21:16:24 +0000 (14:16 -0700)]
merge in jb-release history after reset to master

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 20 Mar 2012 14:05:27 +0000 (07:05 -0700)]
merge in jb-release history after reset to master

12 years agoMerge "audio_channel_in/out_mask_from_count"
Glenn Kasten [Mon, 19 Mar 2012 14:32:04 +0000 (07:32 -0700)]
Merge "audio_channel_in/out_mask_from_count"

12 years agoMerge "Prepare to move system/media"
Glenn Kasten [Mon, 19 Mar 2012 14:30:28 +0000 (07:30 -0700)]
Merge "Prepare to move system/media"

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 19 Mar 2012 14:06:53 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

12 years agoMerge "Add libmedia_native"
Glenn Kasten [Fri, 16 Mar 2012 20:00:39 +0000 (13:00 -0700)]
Merge "Add libmedia_native"

12 years agoMerge "Fix indentation and redundant whitespace"
Glenn Kasten [Fri, 16 Mar 2012 17:35:28 +0000 (10:35 -0700)]
Merge "Fix indentation and redundant whitespace"

12 years agoPrepare to move system/media
Glenn Kasten [Wed, 14 Mar 2012 22:22:38 +0000 (15:22 -0700)]
Prepare to move system/media

Change-Id: Iac6dcfb72753e53e9a42b5feeaa2d6523f2395a4

12 years agoAdd libmedia_native
Glenn Kasten [Tue, 13 Mar 2012 22:30:11 +0000 (15:30 -0700)]
Add libmedia_native

Change-Id: I8fa7edb2872697164edb9bdd464e282ac113075b

12 years agoaudio_channel_in/out_mask_from_count
Glenn Kasten [Wed, 14 Mar 2012 20:39:14 +0000 (13:39 -0700)]
audio_channel_in/out_mask_from_count

Change-Id: Id62e9dee55367495c1cff04ea0b9ff7f07742e58

12 years agomerge in jb-release history after reset to master
The Android Automerger [Wed, 14 Mar 2012 14:06:36 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

12 years agoSurfaceTexture: Fully refactored from BufferQueue
Daniel Lam [Tue, 13 Mar 2012 19:07:18 +0000 (12:07 -0700)]
SurfaceTexture: Fully refactored from BufferQueue

gl_env uses a dummy BufferQueue instead of SurfaceTexture

Change-Id: I6f50b372a376186a8455e34dad598b5800ba86a3

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 13 Mar 2012 14:07:13 +0000 (07:07 -0700)]
merge in jb-release history after reset to master

12 years agoSwitched to use header files in /frameworks/native
James Dong [Tue, 13 Mar 2012 01:11:30 +0000 (18:11 -0700)]
Switched to use header files in /frameworks/native

o related-to-bug: 6044887

Change-Id: Iedc72c551ce4792e695dce3cf222b76598667f43

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 12 Mar 2012 14:06:51 +0000 (07:06 -0700)]
merge in jb-release history after reset to master

12 years agoMerge "Use audio_policy_output_flags_t consistently"
Glenn Kasten [Sat, 10 Mar 2012 00:02:17 +0000 (16:02 -0800)]
Merge "Use audio_policy_output_flags_t consistently"

12 years agoUse AudioRecord::record_flags consistently
Glenn Kasten [Wed, 7 Mar 2012 02:48:58 +0000 (18:48 -0800)]
Use AudioRecord::record_flags consistently

Change-Id: Ibb185b1c461df2c17061a8a0d62cba0611a89e1e

12 years agoUse audio_policy_output_flags_t consistently
Glenn Kasten [Wed, 7 Mar 2012 02:50:20 +0000 (18:50 -0800)]
Use audio_policy_output_flags_t consistently

Change-Id: Ie487ac0776e9bc6f12907945ec9bea0730200ad1

12 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 8 Mar 2012 15:06:05 +0000 (07:06 -0800)]
merge in jb-release history after reset to master

12 years agoAdd downmix effect header
Jean-Michel Trivi [Tue, 6 Mar 2012 16:52:14 +0000 (08:52 -0800)]
Add downmix effect header

Downmix effect header defines the only parameter currently defined,
 the type of downmix to apply, and the valid values for this parameter.

Change-Id: I0beeefa7a35af0a2c6640eeb10efd2bab5992b9c

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 28 Feb 2012 15:04:45 +0000 (07:04 -0800)]
merge in jb-release history after reset to master

12 years agocleanup includes
Mathias Agopian [Sun, 26 Feb 2012 05:16:26 +0000 (21:16 -0800)]
cleanup includes

Change-Id: Ia98b76b2e0c49ee257e1f31c61c2d6f72a9fe894

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 20 Feb 2012 15:06:05 +0000 (07:06 -0800)]
merge in jb-release history after reset to master

12 years agoecho reference: fix buffer overflow
Eric Laurent [Fri, 17 Feb 2012 21:40:29 +0000 (13:40 -0800)]
echo reference: fix buffer overflow

commit 33e8f78b introduced a regression causing the input buffer
size to be underestimated when downsampling and doing stereo to mono
conversion.

Also a test in create_echo_reference() was not removed and prevented
write sampling rates lower than read sampling rates.

Change-Id: I2ce2e32748eb9d00f4d5b32e5db5149f177c8804

12 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 16 Feb 2012 15:05:03 +0000 (07:05 -0800)]
merge in jb-release history after reset to master

12 years agoFix memory leak
Glenn Kasten [Tue, 14 Feb 2012 21:56:42 +0000 (13:56 -0800)]
Fix memory leak

Change-Id: I6937d23aa5c8f1f85368f8a6909272cd9b0994dc

12 years agomerge in jb-release history after reset to master
The Android Automerger [Tue, 14 Feb 2012 15:04:52 +0000 (07:04 -0800)]
merge in jb-release history after reset to master

12 years agoMerge "audio utils: modify echo reference resampler"
Eric Laurent [Mon, 13 Feb 2012 20:27:10 +0000 (12:27 -0800)]
Merge "audio utils: modify echo reference resampler"

12 years agomerge in jb-release history after reset to master
The Android Automerger [Thu, 9 Feb 2012 15:03:13 +0000 (07:03 -0800)]
merge in jb-release history after reset to master

12 years agoMove away from MediaDebug and use ADebug instead
James Dong [Wed, 8 Feb 2012 22:00:13 +0000 (14:00 -0800)]
Move away from MediaDebug and use ADebug instead

Change-Id: Ic448bdd6462708779f0e5c78a25e0a359b129654

12 years agoFix for bug 5584451: Match Java standard with code organization in filterpacks
Marius Renn [Tue, 7 Feb 2012 18:24:32 +0000 (10:24 -0800)]
Fix for bug 5584451: Match Java standard with code organization in filterpacks

Filterpacks have been restructured:
- mca/filterpacks/$PACK/java -> mca/filterpacks/java/android/filterpacks/$PACK
- mca/filterpacks/$PACK/native -> mca/filterpacks/native/$PACK

Change-Id: Ic2607d368d67a363a48908ac97c6be99f2d61804

12 years agoaudio utils: modify echo reference resampler
Eric Laurent [Mon, 6 Feb 2012 21:57:31 +0000 (13:57 -0800)]
audio utils: modify echo reference resampler

Modify echo reference resampler to accept upsampling.
This allows higher sampling rates in the capture path than
in the playback path.

Change-Id: Id7b5a11a53e8e09511dcb060bff8355bca3c1420

12 years agoam 609d361b: am e453cdbf: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:06:16 +0000 (10:06 -0800)]
am 609d361b: am e453cdbf: Reconcile with ics-mr1-release

* commit '609d361bd2ab3883921069eef29edffad7f210e3':

12 years agoam e453cdbf: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:01:14 +0000 (10:01 -0800)]
am e453cdbf: Reconcile with ics-mr1-release

* commit 'e453cdbf3cdfc9940b471156cad8ccd5442678d0':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 16:50:53 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release

Change-Id: I950f3e06350ffce1ccd9f468e8a895972e22b3fa

12 years agomerge in jb-release history after reset to master
The Android Automerger [Mon, 30 Jan 2012 15:04:29 +0000 (07:04 -0800)]
merge in jb-release history after reset to master

12 years agoUse audio_source_t consistently
Glenn Kasten [Tue, 24 Jan 2012 00:18:28 +0000 (16:18 -0800)]
Use audio_source_t consistently

Use audio_source_t instead of int.

Change-Id: I88256ee508b8f5b50635985361efa7c458f11296

12 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 23 Jan 2012 15:01:37 +0000 (07:01 -0800)]
merge in ics-release history after reset to master

12 years agoMove memcpy_to_i16_from_u8 from libmedia
Glenn Kasten [Mon, 16 Jan 2012 21:21:31 +0000 (13:21 -0800)]
Move memcpy_to_i16_from_u8 from libmedia

Change-Id: I178b953767f11abcca721efcd7f255d0cb2f3bd0

12 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 18 Jan 2012 15:01:10 +0000 (07:01 -0800)]
merge in ics-release history after reset to master

12 years agoMove fixed FFT from frameworks/base/media/libmedia
Glenn Kasten [Mon, 16 Jan 2012 21:12:57 +0000 (13:12 -0800)]
Move fixed FFT from frameworks/base/media/libmedia

Change-Id: I55a3706c329de471ac867f196f777c71c1306bcb

12 years agoMerge "Use audio_stream_type_t consistently"
Glenn Kasten [Tue, 17 Jan 2012 15:25:53 +0000 (07:25 -0800)]
Merge "Use audio_stream_type_t consistently"

12 years agomerge in ics-release history after reset to master
The Android Automerger [Thu, 12 Jan 2012 22:14:22 +0000 (14:14 -0800)]
merge in ics-release history after reset to master

12 years agoMerge "Use audio_format_t consistently"
Glenn Kasten [Thu, 12 Jan 2012 18:30:19 +0000 (10:30 -0800)]
Merge "Use audio_format_t consistently"

12 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 11 Jan 2012 18:18:14 +0000 (10:18 -0800)]
merge in ics-release history after reset to master

12 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 10 Jan 2012 15:01:55 +0000 (07:01 -0800)]
merge in ics-release history after reset to master

12 years agoRename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
Steve Block [Mon, 9 Jan 2012 18:43:07 +0000 (18:43 +0000)]
Rename LOG_ASSERT to ALOG_ASSERT  DO NOT MERGE

See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: Id51183ff952e627fb2749fe750c93315d39f910a

12 years agoMerge "Fix bug in use of getPositionUsec()"
Glenn Kasten [Mon, 9 Jan 2012 20:02:19 +0000 (12:02 -0800)]
Merge "Fix bug in use of getPositionUsec()"

12 years agoMerge "Minor improvements to test app"
Glenn Kasten [Mon, 9 Jan 2012 20:00:43 +0000 (12:00 -0800)]
Merge "Minor improvements to test app"

12 years agoMerge "Remove virtual from methods that don't need it"
Glenn Kasten [Mon, 9 Jan 2012 18:25:12 +0000 (10:25 -0800)]
Merge "Remove virtual from methods that don't need it"

12 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 9 Jan 2012 15:02:24 +0000 (07:02 -0800)]
merge in ics-release history after reset to master

12 years agoRename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
Steve Block [Sun, 8 Jan 2012 10:37:59 +0000 (10:37 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I584e6f6a3c52308b7a5a5c9980ca429c831f4320

12 years agoFix bug in use of getPositionUsec()
Glenn Kasten [Fri, 6 Jan 2012 20:24:08 +0000 (12:24 -0800)]
Fix bug in use of getPositionUsec()

getPositionUsec() returns int64_t, not uint32_t, so it would truncate
after 71 minutes.  Also the check ANDROID_UNKNOWN_TIME always failed.

Change-Id: I3152d7715dfe4b67a5fad6985c6717c7a802b464

12 years agoUse audio_stream_type_t consistently
Glenn Kasten [Fri, 6 Jan 2012 20:23:25 +0000 (12:23 -0800)]
Use audio_stream_type_t consistently

Change-Id: I6c02c9b285a00cefefc5d90d655d92ca8690765a

12 years agoRename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
Steve Block [Fri, 6 Jan 2012 10:23:51 +0000 (10:23 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I270cbf7b920d5f2fbb5f345f3c88426697c4391d

12 years agoMinor improvements to test app
Glenn Kasten [Thu, 5 Jan 2012 15:15:07 +0000 (07:15 -0800)]
Minor improvements to test app

Continuous pitch bend.
Expand the help text for options.
Improve error recovery for invalid options.
Fix typo in error message.

Change-Id: I7724372a510cb3733d31feeaffb22fbfa13b328c

12 years agoRename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
Steve Block [Wed, 4 Jan 2012 20:21:59 +0000 (20:21 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE

See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Id162f100e77d64cce4a12cd62b330e7cb847d816

12 years agoUse audio_format_t consistently
Glenn Kasten [Wed, 4 Jan 2012 17:41:53 +0000 (09:41 -0800)]
Use audio_format_t consistently

Change-Id: I81bfafb1fcb374a100b156d9c52771a4b2eb2943

12 years agomerge in ics-release history after reset to master
The Android Automerger [Mon, 2 Jan 2012 15:01:02 +0000 (07:01 -0800)]
merge in ics-release history after reset to master

12 years agoMerge "add a "long" type to MFF structs"
Rodrigo Carceroni [Fri, 30 Dec 2011 02:38:13 +0000 (18:38 -0800)]
Merge "add a "long" type to MFF structs"

12 years agoadd a "long" type to MFF structs
Rodrigo Carceroni [Thu, 29 Dec 2011 00:37:07 +0000 (16:37 -0800)]
add a "long" type to MFF structs

Change-Id: Idd6e5abe2f2efb122ee0cb78c51e20fc21c7341a

12 years agomerge in ics-release history after reset to master
The Android Automerger [Wed, 21 Dec 2011 15:01:00 +0000 (07:01 -0800)]
merge in ics-release history after reset to master

12 years agoMerge "Cleanup CreateAudioPlayer and CreateMediaPlayer"
Glenn Kasten [Tue, 20 Dec 2011 20:48:42 +0000 (12:48 -0800)]
Merge "Cleanup CreateAudioPlayer and CreateMediaPlayer"

12 years agomerge in ics-release history after reset to master
The Android Automerger [Tue, 20 Dec 2011 15:00:41 +0000 (07:00 -0800)]
merge in ics-release history after reset to master

12 years agoMerge "Consistent formatting for if ("
Glenn Kasten [Mon, 19 Dec 2011 23:07:43 +0000 (15:07 -0800)]
Merge "Consistent formatting for if ("

12 years agoMerge "Add curlies to if / else"
Glenn Kasten [Mon, 19 Dec 2011 23:07:36 +0000 (15:07 -0800)]
Merge "Add curlies to if / else"