summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devstaging/cm-14.0The Android Automerger2016-05-150-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| | |\ | | |/ | |/|
| * | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-010-0/+0
| |\|
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-270-0/+0
| | |\
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-220-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-200-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-150-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-130-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-100-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-020-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-230-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-190-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-170-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-140-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * unblock infinite loop when enumerating video codecsLajos Molnar2016-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 27115713 Change-Id: I5ff243ef633bd1419d58df3f964536f60002955f
| | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-110-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-100-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-090-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * Missing parentheses around #define.ilewis2016-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f945c9b5a882b2a787c233e1996fe29e52f9b9d
| | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | |/|
| | | | | | | | | | | | | | | | * | merge in nyc-release history after reset to masterThe Android Automerger2016-02-010-0/+0
| | | | | | | | | | | | | | | | |\|
| | | | | | | | | | | | | | | | | * Revert "Get codec from codec process"Marco Nelissen2016-01-281-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit db1d696afda13079daeeb584f086eaa49cb82825. Change-Id: I3dcae785842bcdbed87f846fef744c756a133df4
* | | | | | | | | | | | | | | | | | Don't specify sub-buffer count for non-fast tracksGlenn Kasten2016-05-131-4/+6
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 28695447 Change-Id: I81bfd3a02c9600e3f1d9abc68bb2d70d45112260
* / / / / / / / / / / / / / / / / Allow OpenSL ES to specify a total buffer size for a fast trackGlenn Kasten2016-04-281-1/+5
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by using the OpenSL ES buffer count to indicate the number of notifications (sub-buffers) per track buffer. Bug: 27819623 Change-Id: Idd782e971eb415298ea5b47a6f5d39b1bdd5c7fc
* | | | | | | | | | | | | | | | Merge "Fix 32-bit/64-bit problem in AquireJavaRoutingProxy() JNI." into nyc-devPaul Mclean2016-03-251-22/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix 32-bit/64-bit problem in AquireJavaRoutingProxy() JNI.Paul McLean2016-03-251-22/+26
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also allow Record proxies for unrealized recorders. Bug: 27787215 Bug: 27847964 Change-Id: I477727d1e91b93171fcb1ba13c9ada47b5a58bdf
* | | | | | | | | | | | | | | | Merge "Make build warnings be errors" into nyc-devGlenn Kasten2016-03-248-0/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Make build warnings be errorsGlenn Kasten2016-03-248-0/+55
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e88cdcc331a13d56cf1c2acb546e87a02ab1c40
* / / / / / / / / / / / / / / / Fix build warningsGlenn Kasten2016-03-2413-37/+2
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I243600bece4d5b0757287aa1ea83c41e73eb5bba
* / / / / / / / / / / / / / / Fix copy/paste errorGlenn Kasten2016-03-211-1/+1
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See OpenSL ES 1.0.1 section 9.2.19 SL_METADATA_FILTER Bug: 27658100 Change-Id: I0a82d27142454f73a1ee41d569b08bc558f3c43e
* | | | | | | | | | | | | | Merge "Use audio_session_t consistently" into nyc-devGlenn Kasten2016-03-177-16/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use audio_session_t consistentlyGlenn Kasten2016-03-107-16/+21
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 27562099 Change-Id: Ie04efb44923fdd2f034b771157fa30dababdfb58
* | | | | | | | | | | | | Native routing phase 4Paul McLean2016-03-143-13/+55
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Acquire before Realize Bug: 23899814 Change-Id: I27682ecb5259fc6ebbe3eca5c6aba5d956aa42bb
* | | | | | | | | | | | Native Routing API - Phase 3Paul McLean2016-03-092-2/+15
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release is automatically called during Destroy Bug: 23899814 Change-Id: I54a22d493f3de5b8562788ac14a2b8a3ebc6fb29
* / / / / / / / / / / "Refinements" to Native Audio Routing APIPaul McLean2016-03-094-81/+258
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change method names to more generic "AcquireJavaProxy" to support (potentially) multiple proxy types. Add "Release" method. Remove JNIEnv* parameter from Acquire and Release methods. Add Type ID parameter to support (potential) multiple proxy types. Enforce "singleton" allocation for proxies. Disallow proxy acquisition for innapropriate players/recorders. Refactor to make the code clearer. Bug: 23899814 Change-Id: Iff354ba46547781e0998a9032de96f445d1474b8
* | | | | | | | | | Merge "Single definition of USE_DEBUG in Configuration.h" into nyc-devGlenn Kasten2016-03-017-3/+34
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Single definition of USE_DEBUG in Configuration.hGlenn Kasten2016-03-017-3/+34
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 27423077 Change-Id: I75cf9e7d6dd6134fe5b818951fd23353e16c7656
* | | | | | | | | | Merge "Native Routing Implementation" into nyc-devPaul Mclean2016-03-012-2/+119
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Native Routing ImplementationPaul McLean2016-03-012-2/+119
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23899814 Change-Id: I3cd369339e429e8a3c8466730170fb75f939fb88
* / / / / / / / / / Add use for audio_unique_id_tGlenn Kasten2016-02-292-2/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 25641253 Bug: 21019153 Change-Id: I795a013cad2cf1ba85eb7079bf4d994612ce18b8
* / / / / / / / / Enable -Werror and fix warnings in frameworks/wilhelm.Aurimas Liutikas2016-02-2216-56/+35
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 27147881 Change-Id: I5e767007d85a160864a606926ee81adb94eae899
* | | | | | | | Merge "Fix the last warnings in frameworks/wilhelm." into nyc-devAurimas Liutikas2016-02-194-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the last warnings in frameworks/wilhelm.Aurimas Liutikas2016-02-184-6/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 27147881 Change-Id: I2723a0bc58d27be30f0f3749699485c8aad50c73
* / / / / / / / Suppress -Winitializer-overrides warnings in frameworks/wilhelm.Aurimas Liutikas2016-02-181-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MPH_to.c was carefully designed to override initializers to make sure all the unset values are initialized as -1. This CL suppresses this warning. Bug: 27147881 Change-Id: I8fe44892a2f6e38b22f695b99150763dbd1ca704
* / / / / / / Emulating old channel mask behavior for both input and outputilewis2016-02-162-7/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the "ignore positional channel masks" behavior back into output as well as input. Bug: 27042146 Change-Id: I51fc4a4494cd9477fdcddb6901cd353b88ea2c2e (cherry picked from commit f4f89da331441ec4693c8ebb6ae3cf5460a22328)
* | | | | | remove OMXCodec.h dependencyLajos Molnar2016-02-123-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17108024 Change-Id: If09b4d935123323e910655172d8c249ad8638a8b
* | | | | | unblock infinite loop when enumerating video codecsLajos Molnar2016-02-111-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 27115713 Change-Id: I5ff243ef633bd1419d58df3f964536f60002955f
* | | | | Merge "Document default behavior when channel mask is 0" into nyc-devIan Ni-Lewis2016-02-101-0/+6
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 18:11:19 +0000