OSDN Git Service
Igor Murashkin [Wed, 12 Dec 2012 20:46:43 +0000 (12:46 -0800)]
Merge "Camera: Docs XML - allow multiple kinds per section"
Igor Murashkin [Wed, 5 Dec 2012 21:06:59 +0000 (13:06 -0800)]
Camera: Docs XML - allow multiple kinds per section
- When adding a new entry and maintaining ABI, make a new kind if can't be
semantically part of the last kind. Don't add to the end of an existing
non-last kind.
- Print generated file names in metadata-generate
(Aside) New sections should also be ended at the end of the root namespace to
maintain ABI compatibility.
Change-Id: I5df0a701763af3cc91ee6eead4fe9fd423c9aa86
Eino-Ville Talvala [Wed, 5 Dec 2012 18:12:13 +0000 (10:12 -0800)]
Update camera metadata tests to new enums
Change-Id: I9474f34de3c8d780f8bdbc388ddd883c123b41b9
Igor Murashkin [Wed, 5 Dec 2012 00:07:21 +0000 (16:07 -0800)]
Camera2: Doc entries no longer have type='enum', instead they use enum='true'
* This allows all entries to have any backing type
(usually a byte, but for availableFormats it's int32)
* No longer need special casing for availableFormats
* No longer need to coerce an enum type into a byte
Change-Id: Ib1d4b93521e90f243b54f66c3d4c4b35032bc06a
Igor Murashkin [Tue, 4 Dec 2012 22:59:53 +0000 (14:59 -0800)]
Camera2: Update generate scripts check for dependencies and to support MacPorts
Change-Id: Ice9b658f8e6f87a1a490c367bff2f9a685ddee44
Igor Murashkin [Mon, 3 Dec 2012 21:55:33 +0000 (13:55 -0800)]
Camera2: Dump enum data types as strings, not integers
Change-Id: Ia225662d4ee0aad81b22b96355d7f39c4aa70d42
Igor Murashkin [Thu, 29 Nov 2012 23:23:03 +0000 (15:23 -0800)]
Camera: Generate camera_metadata_tags and HTML docs from XML
Change-Id: Ib7e9bf4855adff91a317c910aaec960f1422302a
Igor Murashkin [Fri, 30 Nov 2012 01:08:36 +0000 (17:08 -0800)]
Camera2: Fix metadata XML to maintain ordering
Change-Id: I69adfbb1010b5f624d3ee618a1a45e0be510ca31
Igor Murashkin [Mon, 26 Nov 2012 23:26:38 +0000 (15:26 -0800)]
Camera2: Prepare to generate tags from script
Change-Id: Ic5195830cd6ff296de793eb4fbe418dd4e3136ca
Igor Murashkin [Mon, 26 Nov 2012 20:01:11 +0000 (12:01 -0800)]
Camera: Add a script to generate files from XML
Change-Id: I638017934ddfcfe8ab8f9f56bebb587dae35f17f
Igor Murashkin [Thu, 22 Nov 2012 01:11:37 +0000 (17:11 -0800)]
Camera: Generate tag string info from XML
Change-Id: I5109a3c46a065fb2dce31482d4377c33aeb84176
Igor Murashkin [Wed, 21 Nov 2012 22:23:24 +0000 (14:23 -0800)]
Camera: Generate camera_metadata_tags.h from XML
Change-Id: Ie98f9dca854841ff1430c1314fbc570e26e5398b
Igor Murashkin [Wed, 21 Nov 2012 17:44:05 +0000 (09:44 -0800)]
Camera: Metadata XML cleanup, add README
Change-Id: Ib53757029becbd4148867a144ba3725c4f9e5d82
Igor Murashkin [Thu, 29 Nov 2012 21:35:15 +0000 (13:35 -0800)]
Camera: Metadata docs HTML generated from XML
Change-Id: Ic39249d7019dab0a6c5f5daf5d54074f6cc9c0d4
Igor Murashkin [Tue, 20 Nov 2012 00:49:37 +0000 (16:49 -0800)]
Camera: Add an XML parser for the XML metadata
Change-Id: Ie97893e82d6cae2cb7fa3853b326df1cf0f3ff18
Igor Murashkin [Sat, 10 Nov 2012 00:15:02 +0000 (16:15 -0800)]
Camera: Define all Properties via an XML data file
Change-Id: I82aad9e1e8c8064373a9881f255ec2eb9d2f023e
Igor Murashkin [Tue, 27 Nov 2012 19:36:46 +0000 (11:36 -0800)]
am
555aac88: Camera2: Fix metadata alignment for double and int64 types
* commit '
555aac882ed63e70019c78ccc58032a5be0f58ec':
Camera2: Fix metadata alignment for double and int64 types
Igor Murashkin [Thu, 15 Nov 2012 18:54:57 +0000 (10:54 -0800)]
Camera2: Fix metadata alignment for double and int64 types
* camera_metadata_rational_t was only aligning to 4 bytes, we need to align to 8
* add an automated unit test to verify alignment for each type of data
Bug:
7498597
Change-Id: Ib5554d412e09b95d21933b6015db68d01a072f90
Eino-Ville Talvala [Fri, 16 Nov 2012 23:42:50 +0000 (15:42 -0800)]
am
b10d56ad: Camera: Actually make camera_metadata memcopyable
* commit '
b10d56ad43a91924d3666127963e5fdce725389c':
Camera: Actually make camera_metadata memcopyable
Eino-Ville Talvala [Tue, 13 Nov 2012 19:45:12 +0000 (11:45 -0800)]
Camera: Actually make camera_metadata memcopyable
- Use internal offsets instead of pointers for the entry and data
arrays.
- Add test to verify memcpy works and doesn't alias data.
- Remove support for forward-compatible reserved space handling, given
that it's unlikely to be useful
Bug:
7546079
Change-Id: I439aa27fed8d243b7a04155daf5e58fa1c4c730e
Eino-Ville Talvala [Tue, 13 Nov 2012 22:25:39 +0000 (14:25 -0800)]
am
3154036a: Camera: Fix metadata data alignment, other minor bugs.
* commit '
3154036acd2cc809388d08ff856198a8512f05f0':
Camera: Fix metadata data alignment, other minor bugs.
Eino-Ville Talvala [Thu, 8 Nov 2012 00:36:50 +0000 (16:36 -0800)]
Camera: Fix metadata data alignment, other minor bugs.
- When a metadata entry needs to overflow into the data buffer, make
sure the starting offset is aligned to the maximum needed by all the
metadata types.
- Bounds check the data buffer size when adding a new entry
- Add new test for the bounds check
- Print out doubles correctly.
Bug:
7498597
Change-Id: Ic8645a998c096f5b803839ee8076b97862127021
Glenn Kasten [Tue, 13 Nov 2012 15:49:55 +0000 (07:49 -0800)]
Merge "Add support for reading 8-bit PCM"
Glenn Kasten [Mon, 12 Nov 2012 22:42:31 +0000 (14:42 -0800)]
Add support for reading 8-bit PCM
Also:
Includable by C++
More compatibility with libsndfile external
Add frames field to SFINFO
sf_readf_short uses sf_count_t which is signed
Change-Id: Ice538d5f4ba3556b67c57bca856b605358d53c05
Glenn Kasten [Mon, 12 Nov 2012 22:39:36 +0000 (14:39 -0800)]
Add memcpy_to_u8_from_i16 to libaudioutils
Change-Id: I20066dbfaf8828d9d32266c589beaf3860677bc8
Glenn Kasten [Fri, 2 Nov 2012 14:59:08 +0000 (07:59 -0700)]
Line length 100
Change-Id: Ieecda2651cab0f4cfaef3a23454d3d852091be84
Glenn Kasten [Tue, 30 Oct 2012 23:09:18 +0000 (16:09 -0700)]
Add tinysndfile
Change-Id: Idc97a54f1e170fc06cc341fd1234c0635ada9757
Igor Murashkin [Wed, 3 Oct 2012 21:23:03 +0000 (14:23 -0700)]
Camera: Add quirk for metering regions to ignore crop region
If the HAL already takes into account the crop region when
consuming a{ewf}Region or producing face detection rectangles,
then it should set this quirk to 1.
Bug:
7246065
Change-Id: Ib77788b2fced1509d60a7fd1e2a4411e9c8f19dc
Eino-Ville Talvala [Mon, 1 Oct 2012 23:33:03 +0000 (16:33 -0700)]
Camera: Add scene mode override and quirks fields.
To provide scene mode override information while preview is disabled,
need more static metadata from the HAL.
In addition, add a quirks section to allow for temporary workarounds
for incomplete HAL behavior. Any quirks added will be deprecated as
soon as possible.
Bug:
7159577
Bug:
7172543
Change-Id: Icadb6baa4132bf20ad82b2c549ac2b9a0c6618de
Eino-Ville Talvala [Fri, 7 Sep 2012 16:36:23 +0000 (09:36 -0700)]
Camera: Add android.jpeg.size field.
When the camera is producing JPEG buffers, need a field to provide the
final buffer size.
Bug:
7108816
Change-Id: I67f27a3c1d69f32541402e516de9fb4b61ffd352
Eino-Ville Talvala [Mon, 3 Sep 2012 17:06:40 +0000 (10:06 -0700)]
Camera2: Separate AE/AWB locks from AE/AWB modes.
With AE/AWB modes including the LOCKED state, it was not possible for
the HAL to determine the current flash state, or to report fixed AWB
modes properly. Break out the locks into separate controls.
Bug:
6243944
Change-Id: I1b2d844420b8c4e06be32ea644e052f222ed825b
Eino-Ville Talvala [Fri, 31 Aug 2012 16:06:18 +0000 (09:06 -0700)]
Camera: Add request type and input streams metadata tags.
Bug:
6243944
Change-Id: I6fbf445ac8a6bb9dff916a17c051e7e911dd4a3f
Eino-Ville Talvala [Fri, 24 Aug 2012 18:42:06 +0000 (11:42 -0700)]
Camera: Add methods for read-only access to metadata.
- Define a read-only version of camera_metadata_entry_t
- Support finding with read-only output
- Add const to clone method input camera_metadata_t.
Bug:
6243944
Change-Id: I1bf37a4c8c8935711e803d7477393fe2c01f8216
Eino-Ville Talvala [Sun, 26 Aug 2012 21:43:50 +0000 (14:43 -0700)]
Revert "Camera: Add methods for read-only access to metadata."
Needs a third change that's not yet done with review.
This reverts commit
ad0c0c836d0276079bf8fe1bfb0bef25d4bce601
Change-Id: Id4325fe93b43a447eded5ae50e8f7faa70fd9140
Eino-Ville Talvala [Fri, 24 Aug 2012 18:42:06 +0000 (11:42 -0700)]
Camera: Add methods for read-only access to metadata.
- Define a read-only version of camera_metadata_entry_t
- Support finding with read-only output
- Add const to clone method input camera_metadata_t.
Bug:
6243944
Change-Id: Icd581e48f5fafaa6da22ca25e872bf3ede192222
Eino-Ville Talvala [Fri, 3 Aug 2012 20:56:01 +0000 (13:56 -0700)]
Camera: Update autofocus- and triggering-related metadata fields
- Add trigger IDs for precapture and autofocus to dynamic control
metadata
- Add enums for AE, AWB, AF algorithm state
Bug:
6243944
Change-Id: I04ce7709a4f1bdbfa39540059dbaf11fadc68f9c
Eino-Ville Talvala [Mon, 30 Jul 2012 17:46:22 +0000 (10:46 -0700)]
Camera: Add indented metadata dump
Bug:
6243944
Change-Id: Ib769ae2d40b9c4bfa456c812fd7ee2e426fd86df
Glenn Kasten [Mon, 9 Jan 2012 18:43:12 +0000 (10:43 -0800)]
comments on FX tags
Change-Id: Ic22c12c34303988c4a1616e49822859b975fe6c4
Glenn Kasten [Thu, 19 Jul 2012 20:59:50 +0000 (13:59 -0700)]
Add mono <-> stereo upmix and downmix routines
Change-Id: I3d960fb27fd3440f903333903c0dbf2ab59d3b56
Eino-Ville Talvala [Mon, 18 Jun 2012 15:50:23 +0000 (08:50 -0700)]
Camera: Add LOCKED values for AE/AWB modes.
Bug:
6243944
Change-Id: I52e842d568790e8ac0d9c231507e865aad58601b
Eino-Ville Talvala [Wed, 13 Jun 2012 01:39:46 +0000 (18:39 -0700)]
Merge "Camera: Add metadata field ANDROID_JPEG_MAX_SIZE"
Eino-Ville Talvala [Wed, 13 Jun 2012 00:56:30 +0000 (17:56 -0700)]
Camera: Add metadata field ANDROID_JPEG_MAX_SIZE
This is used for communicating how large JPEG buffers must be to the
framework.
Bug:
6243944
Change-Id: Ib296961c4033535cdcd9baf297d440a31cf94d84
The Android Open Source Project [Mon, 11 Jun 2012 16:25:46 +0000 (09:25 -0700)]
The Android Open Source Project [Mon, 11 Jun 2012 16:22:54 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: If0d3b223253e967731cf795e773045dc6d9affd2
The Android Automerger [Fri, 8 Jun 2012 15:23:26 +0000 (08:23 -0700)]
merge in jb-release history after reset to jb-dev
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
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
Marco Nelissen [Thu, 7 Jun 2012 14:23:06 +0000 (07:23 -0700)]
Add parameter for set visualizer latency
b/
6522728
Change-Id: If30ba44d44e54fd0a514ce5357ac438f8ae3ec5b
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
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
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
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."
Eino-Ville Talvala [Wed, 16 May 2012 17:59:11 +0000 (10:59 -0700)]
Merge "Improvements to camera metadata handling."
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
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
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
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
Jean-Baptiste Queru [Tue, 8 May 2012 16:23:12 +0000 (09:23 -0700)]
Merge "Fixed 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
The Android Automerger [Mon, 23 Apr 2012 14:08:14 +0000 (07:08 -0700)]
merge in jb-release history after reset to master
Jean-Michel Trivi [Thu, 19 Apr 2012 16:08:11 +0000 (09:08 -0700)]
Merge "Add new scaling mode parameter in Visualizer effect"
The Android Automerger [Wed, 18 Apr 2012 14:06:06 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
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
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
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
Mike Lockwood [Tue, 3 Apr 2012 17:33:04 +0000 (10:33 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
The Android Automerger [Tue, 3 Apr 2012 10:35:09 +0000 (03:35 -0700)]
merge in jb-release history after reset to master
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
The Android Automerger [Wed, 28 Mar 2012 14:06:01 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
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
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)"
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
The Android Automerger [Tue, 27 Mar 2012 14:06:03 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Glenn Kasten [Mon, 26 Mar 2012 23:28:48 +0000 (16:28 -0700)]
mv system/media/wilhelm to frameworks/wilhelm/
Change-Id: I2795954c04a01f68a6286ff85ac12a39a0381265
Eino-Ville Talvala [Mon, 26 Mar 2012 15:45:45 +0000 (08:45 -0700)]
Merge "Add a camera metadata structure and utility methods"
The Android Automerger [Mon, 26 Mar 2012 14:08:07 +0000 (07:08 -0700)]
merge in jb-release history after reset to master
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
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
The Android Automerger [Wed, 21 Mar 2012 14:06:18 +0000 (07:06 -0700)]
merge 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
The Android Automerger [Tue, 20 Mar 2012 14:05:27 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Glenn Kasten [Mon, 19 Mar 2012 14:32:04 +0000 (07:32 -0700)]
Merge "audio_channel_in/out_mask_from_count"
Glenn Kasten [Mon, 19 Mar 2012 14:30:28 +0000 (07:30 -0700)]
Merge "Prepare to move system/media"
The Android Automerger [Mon, 19 Mar 2012 14:06:53 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Glenn Kasten [Fri, 16 Mar 2012 20:00:39 +0000 (13:00 -0700)]
Merge "Add libmedia_native"
Glenn Kasten [Fri, 16 Mar 2012 17:35:28 +0000 (10:35 -0700)]
Merge "Fix indentation and redundant whitespace"
Glenn Kasten [Wed, 14 Mar 2012 22:22:38 +0000 (15:22 -0700)]
Prepare to move system/media
Change-Id: Iac6dcfb72753e53e9a42b5feeaa2d6523f2395a4
Glenn Kasten [Tue, 13 Mar 2012 22:30:11 +0000 (15:30 -0700)]
Add libmedia_native
Change-Id: I8fa7edb2872697164edb9bdd464e282ac113075b
Glenn Kasten [Wed, 14 Mar 2012 20:39:14 +0000 (13:39 -0700)]
audio_channel_in/out_mask_from_count
Change-Id: Id62e9dee55367495c1cff04ea0b9ff7f07742e58
The Android Automerger [Wed, 14 Mar 2012 14:06:36 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
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
The Android Automerger [Tue, 13 Mar 2012 14:07:13 +0000 (07:07 -0700)]
merge in jb-release history after reset to master
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
The Android Automerger [Mon, 12 Mar 2012 14:06:51 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Glenn Kasten [Sat, 10 Mar 2012 00:02:17 +0000 (16:02 -0800)]
Merge "Use audio_policy_output_flags_t consistently"
Glenn Kasten [Wed, 7 Mar 2012 02:48:58 +0000 (18:48 -0800)]
Use AudioRecord::record_flags consistently
Change-Id: Ibb185b1c461df2c17061a8a0d62cba0611a89e1e
Glenn Kasten [Wed, 7 Mar 2012 02:50:20 +0000 (18:50 -0800)]
Use audio_policy_output_flags_t consistently
Change-Id: Ie487ac0776e9bc6f12907945ec9bea0730200ad1
The Android Automerger [Thu, 8 Mar 2012 15:06:05 +0000 (07:06 -0800)]
merge in jb-release history after reset to master
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
The Android Automerger [Tue, 28 Feb 2012 15:04:45 +0000 (07:04 -0800)]
merge in jb-release history after reset to master