OSDN Git Service
Phil Burk [Wed, 12 Jul 2017 03:40:09 +0000 (03:40 +0000)]
Merge "aaudio: command line argument parser" into oc-dr1-dev
am:
0acb320910
Change-Id: Id1153f25bbecf8df959eabcea465aafe1cbc15c6
TreeHugger Robot [Wed, 12 Jul 2017 03:31:03 +0000 (03:31 +0000)]
Merge "aaudio: command line argument parser" into oc-dr1-dev
Pawin Vongmasa [Wed, 12 Jul 2017 03:19:02 +0000 (03:19 +0000)]
Merge "Handle nullptr from mapMemory properly" into oc-dr1-dev
am:
b9bacc624e
Change-Id: I25c5959c7a295eb1c46d688aa8f52f2f2195c1ad
TreeHugger Robot [Wed, 12 Jul 2017 03:12:39 +0000 (03:12 +0000)]
Merge "Handle nullptr from mapMemory properly" into oc-dr1-dev
Phil Burk [Fri, 30 Jun 2017 23:27:38 +0000 (16:27 -0700)]
aaudio: command line argument parser
Generic parser that is used in multiple examples.
Added -n{numberOfBursts} for buffer size.
This is being used to test the MMAP features.
Bug:
63002656
Test: this is a test
Change-Id: Idf7560f9bb3ed7834f6c4686dd6009f27f04220e
Merged-In: Idf7560f9bb3ed7834f6c4686dd6009f27f04220e
Yunlian Jiang [Wed, 12 Jul 2017 00:08:48 +0000 (00:08 +0000)]
Merge "Fix memory leak warning." am:
ae6088e456 am:
37cd5f116d
am:
4c09f57e62
Change-Id: Ie864652e4f5344d50e68ede6aa23b021b1ee84c1
Yunlian Jiang [Wed, 12 Jul 2017 00:04:48 +0000 (00:04 +0000)]
Merge "Fix memory leak warning." am:
ae6088e456
am:
37cd5f116d
Change-Id: Ie4fb09cdd3fec819eb67563e251b927d4202de07
Yunlian Jiang [Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)]
Merge "Fix memory leak warning."
am:
ae6088e456
Change-Id: I3dff126ce299da44030ae92822f48e34e9693a55
Treehugger Robot [Tue, 11 Jul 2017 23:54:36 +0000 (23:54 +0000)]
Merge "Fix memory leak warning."
Eric Laurent [Tue, 11 Jul 2017 17:58:57 +0000 (17:58 +0000)]
Merge "audio policy: fix audio device properties loading" into oc-dr1-dev
am:
ed0f8f425d
Change-Id: I2d4580aae05072e2f12d1393a0b53c973d3bfe4e
TreeHugger Robot [Tue, 11 Jul 2017 17:50:26 +0000 (17:50 +0000)]
Merge "audio policy: fix audio device properties loading" into oc-dr1-dev
Android Build Merger (Role) [Tue, 11 Jul 2017 02:25:35 +0000 (02:25 +0000)]
Merge "Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88 am:
dce2faae4f -s ours am:
747c025ebf am:
799ebbb3bc" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 11 Jul 2017 02:25:33 +0000 (02:25 +0000)]
Merge "Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88 am:
dce2faae4f -s ours am:
747c025ebf am:
c038bb4280" into oc-dr1-dev-plus-aosp
Ray Essick [Tue, 11 Jul 2017 02:25:22 +0000 (02:25 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88 am:
dce2faae4f -s ours am:
747c025ebf
am:
799ebbb3bc
Change-Id: Ie221c8b39311fdea1d1224b438b3f09116739929
Ray Essick [Tue, 11 Jul 2017 02:25:21 +0000 (02:25 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88 am:
dce2faae4f -s ours am:
747c025ebf
am:
c038bb4280
Change-Id: I8ea76083b006f383e830173a12daa68c060dccbd
Android Build Merger (Role) [Tue, 11 Jul 2017 02:25:15 +0000 (02:25 +0000)]
Merge "Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97 am:
18162a5a35 am:
e8fa1a74ee am:
0f2dde714c am:
fee00bb293" into oc-dr1-dev-plus-aosp
Eric Laurent [Tue, 11 Jul 2017 02:25:02 +0000 (02:25 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97 am:
18162a5a35 am:
e8fa1a74ee am:
0f2dde714c
am:
625b66030b
Change-Id: I59cb959320606624ee05ac601c1b356d14ab576b
Eric Laurent [Tue, 11 Jul 2017 02:25:01 +0000 (02:25 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97 am:
18162a5a35 am:
e8fa1a74ee am:
0f2dde714c
am:
fee00bb293
Change-Id: I26f72ea4f58e7d394f7a1087c49bd66bdec567fb
Ray Essick [Tue, 11 Jul 2017 02:22:54 +0000 (02:22 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88 am:
dce2faae4f -s ours
am:
747c025ebf
Change-Id: Id540ca0eda77b3e04a33289a26f53646afe9dbc6
Ray Essick [Tue, 11 Jul 2017 02:22:52 +0000 (02:22 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88 am:
dce2faae4f -s ours
am:
747c025ebf
Change-Id: If12923a338c76a86a8781c28ab27a947c181c4fb
Eric Laurent [Tue, 11 Jul 2017 02:22:30 +0000 (02:22 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97 am:
18162a5a35 am:
e8fa1a74ee
am:
0f2dde714c
Change-Id: I3856ef329f6177182b11a9eab104e679575a252c
Eric Laurent [Tue, 11 Jul 2017 02:22:30 +0000 (02:22 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97 am:
18162a5a35 am:
e8fa1a74ee
am:
0f2dde714c
Change-Id: I989d49750287cab0dace0485f7d0a9bd8fae5887
Ray Essick [Tue, 11 Jul 2017 02:20:19 +0000 (02:20 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88
am:
dce2faae4f -s ours
Change-Id: I7e552a80892b02274c77066db556f0d7794847a0
Eric Laurent [Tue, 11 Jul 2017 02:20:02 +0000 (02:20 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97 am:
18162a5a35
am:
e8fa1a74ee
Change-Id: I18b86f01373860b748528911f167cf84baaf7894
Ray Essick [Tue, 11 Jul 2017 02:17:51 +0000 (02:17 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46
am:
fd175e7f88
Change-Id: Idcb4ef749ef42113a6f37ba4e3bf6b025581e5a6
Eric Laurent [Tue, 11 Jul 2017 02:17:30 +0000 (02:17 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97
am:
18162a5a35
Change-Id: I4b0fb80d27a53941c99f49d672bac94ea7a81691
Ray Essick [Tue, 11 Jul 2017 02:15:16 +0000 (02:15 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9
am:
389c6ede46
Change-Id: I17fe125bacb15f85706425c3267896a240073d94
Eric Laurent [Tue, 11 Jul 2017 02:14:56 +0000 (02:14 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e
am:
56007baa97
Change-Id: Ibb9e25ac658b185c17d2e594c3cd69df4091ce5a
Ray Essick [Tue, 11 Jul 2017 02:12:48 +0000 (02:12 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd
am:
c36cdf16a9
Change-Id: I113d6d04f01f61be1e5837c13bf9d51731caab55
Eric Laurent [Tue, 11 Jul 2017 02:12:29 +0000 (02:12 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours
am:
880adb1f2e
Change-Id: Ie26a5a8a2a2459feec0b44f1a0573c2170d0e303
Ray Essick [Tue, 11 Jul 2017 02:10:46 +0000 (02:10 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev
am:
ce2cdf02bd
Change-Id: I06aec170231079b7a5155d25974db2d356aab410
Eric Laurent [Tue, 11 Jul 2017 02:10:25 +0000 (02:10 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787
am:
db02180546 -s ours
Change-Id: Id1faed6d6b5fcb927f4f98b5ae0b37c8b0ab94a0
Android Build Merger (Role) [Mon, 10 Jul 2017 20:55:20 +0000 (20:55 +0000)]
Merge "Merge "Check frame handle validity before freeing buffer." into oc-dev am:
c9d2ceb9c2 am:
41779c4849" into oc-dr1-dev-plus-aosp
Ray Essick [Mon, 10 Jul 2017 20:55:06 +0000 (20:55 +0000)]
Merge "Check frame handle validity before freeing buffer." into oc-dev am:
c9d2ceb9c2
am:
7983d30105
Change-Id: Ic3e39189aa3b84289020ac564fb4ce0794a2cbb7
Ray Essick [Mon, 10 Jul 2017 20:55:06 +0000 (20:55 +0000)]
Merge "Check frame handle validity before freeing buffer." into oc-dev am:
c9d2ceb9c2
am:
41779c4849
Change-Id: I29926177d6e8c76ed715997d1e548ed18e569274
Ray Essick [Mon, 10 Jul 2017 20:50:37 +0000 (20:50 +0000)]
Merge "Check frame handle validity before freeing buffer." into oc-dev
am:
c9d2ceb9c2
Change-Id: Ia6676e28a6415df2f9d01a17db5f5bda2805858c
Ray Essick [Mon, 10 Jul 2017 20:50:36 +0000 (20:50 +0000)]
Merge "Check frame handle validity before freeing buffer." into oc-dev
am:
c9d2ceb9c2
Change-Id: I8d1dafc03a9a4bd9fdae836361298c9bf7890df3
TreeHugger Robot [Mon, 10 Jul 2017 20:47:14 +0000 (20:47 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev
TreeHugger Robot [Mon, 10 Jul 2017 20:43:39 +0000 (20:43 +0000)]
Merge "Check frame handle validity before freeing buffer." into oc-dev
Eric Laurent [Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f
am:
b1a72c8787
Change-Id: I251baae005c3e276f409a754de251ce20a125e65
Eric Laurent [Mon, 10 Jul 2017 20:34:03 +0000 (20:34 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598
am:
46da92fa8f
Change-Id: Iea5b777e88e42ffb60ccd517794f8a8fdd9c1f23
Eric Laurent [Mon, 10 Jul 2017 20:30:04 +0000 (20:30 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b
am:
be01ebd598
Change-Id: Id3aa2f4891fd79411edb719a6b6abd741d1110bc
Eric Laurent [Mon, 10 Jul 2017 20:26:36 +0000 (20:26 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2
am:
a9565fba8b
Change-Id: Ia37bc6340f420113445c58c3d0f92d73e9d29148
Eric Laurent [Mon, 10 Jul 2017 20:22:05 +0000 (20:22 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910
am:
62948f53a2
Change-Id: Ia99ed9e04cf2d90ee3f201efd9f238fb06e3be88
Eric Laurent [Mon, 10 Jul 2017 20:17:34 +0000 (20:17 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1
am:
c6358fa910
Change-Id: Ic8ebb5b01026b6762afb1ea7f2bc26f51f5d189e
Eric Laurent [Mon, 10 Jul 2017 20:13:34 +0000 (20:13 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7
am:
acbb8e7dd1
Change-Id: Ie2cd641decc7e654f021df75fd4f600f7255eea2
Eric Laurent [Mon, 10 Jul 2017 20:09:02 +0000 (20:09 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808
am:
4324bdc8f7
Change-Id: I161bc14d3059af24463cfa4f473305b516a3bcd8
Eric Laurent [Mon, 10 Jul 2017 20:04:31 +0000 (20:04 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f
am:
dc2efe3808
Change-Id: I7a613ea97315971ce0abfc34ce5f1fc4034d5ad8
Eric Laurent [Mon, 10 Jul 2017 20:00:32 +0000 (20:00 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev
am:
f57dc8b72f
Change-Id: Ia41a68044abc25ac120ad63a27281345dd959fb7
TreeHugger Robot [Mon, 10 Jul 2017 19:52:17 +0000 (19:52 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev
Eric Laurent [Sun, 9 Jul 2017 23:51:08 +0000 (16:51 -0700)]
audio policy: fix audio device properties loading
Only load removable digital device properties from streams
with dynamic profiles. This avoids aggregating properties from
other stream profiles when the device can also be reached via those
profiles.
Bug:
38423100
Test: connect various USB devices and check properties are loaded
properly.
Change-Id: Ie5eed397d3a475848a3d423d18ffae9d55917ac4
Phil Burk [Fri, 7 Jul 2017 23:10:32 +0000 (23:10 +0000)]
Merge "aaudio: do not assert if deleting an unopened stream" into oc-dr1-dev
am:
15fb0ee6bd
Change-Id: If35f2ec8b17da06b3c43bddb836107982b9535c6
TreeHugger Robot [Fri, 7 Jul 2017 23:06:32 +0000 (23:06 +0000)]
Merge "aaudio: do not assert if deleting an unopened stream" into oc-dr1-dev
Phil Burk [Fri, 7 Jul 2017 21:31:45 +0000 (21:31 +0000)]
Merge "aaudio test: test both input and output stream limits" into oc-dr1-dev
am:
bea2c338a3
Change-Id: Ia42c988c6465bcaf495aa75d657978bf4b2db09e
TreeHugger Robot [Fri, 7 Jul 2017 21:24:42 +0000 (21:24 +0000)]
Merge "aaudio test: test both input and output stream limits" into oc-dr1-dev
Phil Burk [Fri, 7 Jul 2017 19:44:48 +0000 (12:44 -0700)]
aaudio: do not assert if deleting an unopened stream
Bug:
63440754
Test: write_sine.cpp, see bug for repro case
Change-Id: I1f7ed1bd97d4cfcd54d27d41d708c6c03d3d88ac
Marco Nelissen [Fri, 7 Jul 2017 19:20:43 +0000 (19:20 +0000)]
Merge "Add 'dash' as a compatible brand" am:
7937b6bb18 am:
0377dccbf8
am:
e49dc6a1fe
Change-Id: If4e352d5124948fad2e9d26a9b4f583ca4af7730
Marco Nelissen [Fri, 7 Jul 2017 19:18:42 +0000 (19:18 +0000)]
Merge "Add 'dash' as a compatible brand" am:
7937b6bb18
am:
0377dccbf8
Change-Id: I631278692ac2374ce49cdcf262a524bbdab258d6
Marco Nelissen [Fri, 7 Jul 2017 19:16:27 +0000 (19:16 +0000)]
Merge "Add 'dash' as a compatible brand"
am:
7937b6bb18
Change-Id: Iae7f10136ef4e8aafc858178d304227a8b7a79f3
Treehugger Robot [Fri, 7 Jul 2017 19:08:31 +0000 (19:08 +0000)]
Merge "Add 'dash' as a compatible brand"
Marco Nelissen [Fri, 7 Jul 2017 16:02:35 +0000 (09:02 -0700)]
Add 'dash' as a compatible brand
Per the spec, the 'dash' brand indicates support for the concatenation
of an Initialization Segment and a single Indexed Media Segment. Since
we support this, add 'dash' as a supported brand to improve compatibility.
Bug:
63390273
Test: played 'dash' brand file
Change-Id: Ifb38337200857f190085bda030434d7f56a817f3
Marco Nelissen [Fri, 7 Jul 2017 15:56:49 +0000 (15:56 +0000)]
Merge "Fix parsing of gps location atom in mp4" am:
bdccee1eee am:
1a3af9525a
am:
f3ac05af93
Change-Id: I49487f5f9c6b7ba74d9f460815d86b00e34d5676
Marco Nelissen [Fri, 7 Jul 2017 15:39:41 +0000 (15:39 +0000)]
Merge "Fix parsing of gps location atom in mp4" am:
bdccee1eee
am:
1a3af9525a
Change-Id: I25d9fa96a32bfa4c40e2650e0e6273003ef4edf4
Marco Nelissen [Fri, 7 Jul 2017 15:37:13 +0000 (15:37 +0000)]
Merge "Fix parsing of gps location atom in mp4"
am:
bdccee1eee
Change-Id: Idfe31962c83b0f2f46caa2c47563ded6ae2c78f6
Treehugger Robot [Fri, 7 Jul 2017 15:30:43 +0000 (15:30 +0000)]
Merge "Fix parsing of gps location atom in mp4"
Pawin Vongmasa [Fri, 7 Jul 2017 04:08:36 +0000 (04:08 +0000)]
Merge "Release the mutex before calling hidl_cb" into oc-dr1-dev
am:
c06dd405a6
Change-Id: I2a85c04475a3f8af58406e527a0adb68831ef905
TreeHugger Robot [Fri, 7 Jul 2017 03:57:48 +0000 (03:57 +0000)]
Merge "Release the mutex before calling hidl_cb" into oc-dr1-dev
Phil Burk [Fri, 7 Jul 2017 03:24:55 +0000 (03:24 +0000)]
aaudio: stop calling virtual methods from destructor
am:
98d6d9227f
Change-Id: I3e5212360642396db4f4cd5e1624946b292bdd57
Phil Burk [Thu, 6 Jul 2017 18:52:45 +0000 (11:52 -0700)]
aaudio: stop calling virtual methods from destructor
Was calling close(), which is abstract and virtual.
This may have been related to some audioserver crashes.
Also cleaned up some strong pointer handling.
Bug:
63390734
Bug:
63353455
Test: run CTS nativemedia/aaudio many times
Change-Id: Ib95aed60a64771b64395c67f0921c67146f9d10f
Marco Nelissen [Tue, 20 Jun 2017 17:49:42 +0000 (10:49 -0700)]
Fix parsing of gps location atom in mp4
Allow for missing trailing slash and longer strings, validate
string length.
Bug:
62802112
Test: manual
Change-Id: I58e0eb3a976639ae0d4eec7ad9d450f8eb552eb4
Phil Burk [Thu, 6 Jul 2017 03:54:05 +0000 (03:54 +0000)]
Merge "aaudio: MMAP input not implement pause flush" into oc-dr1-dev
am:
014a56b57a
Change-Id: If685934379e5f34540dfade0a5c31f36281dd8cc
TreeHugger Robot [Thu, 6 Jul 2017 03:44:32 +0000 (03:44 +0000)]
Merge "aaudio: MMAP input not implement pause flush" into oc-dr1-dev
Hangyu Kuang [Thu, 6 Jul 2017 03:29:53 +0000 (03:29 +0000)]
Merge "(DO NOT MERGE) media: Don't wait at MediaRecorder::stop() if we haven't received any frames." into oc-dr1-dev
am:
0f96fc772a
Change-Id: Ia0eee918b5094278d929f06005fb373219ebd37a
TreeHugger Robot [Thu, 6 Jul 2017 03:21:08 +0000 (03:21 +0000)]
Merge "(DO NOT MERGE) media: Don't wait at MediaRecorder::stop() if we haven't received any frames." into oc-dr1-dev
Phil Burk [Wed, 5 Jul 2017 22:35:43 +0000 (15:35 -0700)]
aaudio: MMAP input not implement pause flush
They should return AAUDIO_ERROR_UNIMPLEMENTED
just like the legacy streams.
Bug:
63351465
Test: CTS test_aaudio.cpp testPauseAndFlushNotSupported
Change-Id: I42c8d45517bf0d808e648287579b9fb0c0cb3ae0
Hangyu Kuang [Tue, 20 Jun 2017 18:25:06 +0000 (11:25 -0700)]
(DO NOT MERGE) media: Don't wait at MediaRecorder::stop() if we haven't received any frames.
Also add a maximum stopTimeOffset in MediaCodecSource to guard against long delay
in MediaSource which leads to MediaRecorder::stop() getting stuck.
Bug:
62231788
Test: MediaRecorder CTS test.
Change-Id: Ic58f295c9be1b1f500324261be6a34f322ef518e
(cherry picked from commit
cf3205fab08adfdc9d5c0fef1cef54cab0074117)
Phil Burk [Wed, 5 Jul 2017 23:13:38 +0000 (23:13 +0000)]
Merge "aaudio: only use MMAP for low latency perf mode" into oc-dr1-dev
am:
27e9c66294
Change-Id: Iebd09fe7d785527cc2e3bd11307297da36c8433a
TreeHugger Robot [Wed, 5 Jul 2017 23:04:33 +0000 (23:04 +0000)]
Merge "aaudio: only use MMAP for low latency perf mode" into oc-dr1-dev
Phil Burk [Wed, 5 Jul 2017 22:16:04 +0000 (22:16 +0000)]
aaudio: return channelCount in legacy stream
am:
a5247769a8
Change-Id: Ia6679fb05f311c564b7c4c87ed82311374a0fc17
Phil Burk [Wed, 5 Jul 2017 20:54:32 +0000 (13:54 -0700)]
aaudio: only use MMAP for low latency perf mode
This is a quick workaround that just disables MMAP mode unless
performance mode is LOW_LATENCY.
Bug:
63176221
Test: use write_sine and change performance mode
Change-Id: Ic17ad45366d51d86fb4801c84ada4f6f82b5ff98
Phil Burk [Wed, 5 Jul 2017 19:57:58 +0000 (12:57 -0700)]
aaudio: return channelCount in legacy stream
Bug:
63336407
Test: Use input_monitor.cpp and set requested channel count to zero
Change-Id: Ibe7688bb94e0142ee0779c74ddec62c9552efb79
Phil Burk [Wed, 5 Jul 2017 00:24:39 +0000 (17:24 -0700)]
aaudio test: test both input and output stream limits
Bug:
62951298
Test: this is a test
Change-Id: I03521e2a6147733c7b89f2371cc3f46ca5001d77
Eric Laurent [Sun, 2 Jul 2017 02:30:17 +0000 (02:30 +0000)]
aaudio: enable exclusive MMAP mode support
am:
d51329eca8
Change-Id: I7b618a0073c1bada8c263ab9c56baf54698f5e10
Eric Laurent [Fri, 30 Jun 2017 23:06:16 +0000 (16:06 -0700)]
aaudio: enable exclusive MMAP mode support
Allow exclusive MMAP mode only if the HAL indicates
that the FD returned for shared memory buffer can be shared
with any application.
NOTE: the way the HAL indicates this is temporary until the audio
HAL is modified in next HIDL release.
Bug:
37167970
Test: check playback and capture in mmap exclusive and shared mode
Change-Id: I09c1461b2f99532ded2ef9d36d483b82096fda68
Phil Burk [Sat, 1 Jul 2017 23:54:09 +0000 (23:54 +0000)]
aaudio: improved dumpsys
am:
4501b3510f
Change-Id: Ieef211c004dc07f0cd9ec49860ae52057ec01f42
Phil Burk [Fri, 30 Jun 2017 01:12:36 +0000 (18:12 -0700)]
aaudio: improved dumpsys
Add more information about various streams and endpoints.
Bug:
38396780
Test: adb shell dumpsys media.aaudio
Change-Id: I5cc116574bfc3aa93703c182d933dbdfcbefad7a
Phil Burk [Sat, 1 Jul 2017 19:57:30 +0000 (19:57 +0000)]
Merge "aaudio: limit number of streams per process" into oc-dr1-dev
am:
8dd045aaf7
Change-Id: Id45d02293f50707413c4a43247ce6402759fb941
TreeHugger Robot [Sat, 1 Jul 2017 19:52:04 +0000 (19:52 +0000)]
Merge "aaudio: limit number of streams per process" into oc-dr1-dev
Phil Burk [Fri, 30 Jun 2017 19:23:05 +0000 (12:23 -0700)]
aaudio: limit number of streams per process
Testing the new max streams restriction revealed the bug
involving the second shared stream.
Bug:
62951298
Bug:
63171495
Test: test_n_streams.cpp can open MAX_STREAMS_PER_PROCESS MMAP streams
Change-Id: Ibea7d9c4716326a37c669954b52f397ed2968caa
Pawin Vongmasa [Sat, 1 Jul 2017 07:03:50 +0000 (00:03 -0700)]
Release the mutex before calling hidl_cb
In Omx::allocateNode, Omx::serviceDied may be called by hidl_cb in
Omx::allocateNode if the observer dies before hidl_cb is called. This CL
prevents a deadlock from happening in this situation.
Test: make cts -j99 && cts-tradefed run cts-dev \
--module CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
63177989
Change-Id: I8e1357ff637b0912a3a97c6611d886533caaaf8a
Phil Burk [Sat, 1 Jul 2017 05:35:30 +0000 (05:35 +0000)]
Merge "aaudio: disconnect when onTearDown() called" into oc-dr1-dev
am:
80f5e44d60
Change-Id: Ieb2008d6725c1f507ed8fcf483897c8e69ec3a72
TreeHugger Robot [Sat, 1 Jul 2017 05:31:56 +0000 (05:31 +0000)]
Merge "aaudio: disconnect when onTearDown() called" into oc-dr1-dev
Hangyu Kuang [Sat, 1 Jul 2017 03:36:52 +0000 (03:36 +0000)]
Merge "Revert "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align""" into oc-dr1-dev
am:
6ec18f8ce3
Change-Id: I96911274a6f52809a2750a127b355cf99bf947ed
TreeHugger Robot [Sat, 1 Jul 2017 03:29:48 +0000 (03:29 +0000)]
Merge "Revert "Revert "media: Globaly adjust timestamp to make sure all tracks' time are align""" into oc-dr1-dev
Phil Burk [Fri, 30 Jun 2017 18:43:37 +0000 (11:43 -0700)]
aaudio: disconnect when onTearDown() called
It will be called, for example, when switching from speaker to Bluetooth.
Bug:
62883778
Test: run a long app and switch to or from Bluetooth
Change-Id: Iafb9b52d85c30fee71de46abfb99a27a1daabf59
Phil Burk [Sat, 1 Jul 2017 03:11:51 +0000 (03:11 +0000)]
Merge "aaudio: fix resource leak in client tracking" into oc-dr1-dev
am:
fef6b3d4fd
Change-Id: I9aa64dc3e76f0858ca898a1be036e38ba5ab810f
TreeHugger Robot [Sat, 1 Jul 2017 03:03:58 +0000 (03:03 +0000)]
Merge "aaudio: fix resource leak in client tracking" into oc-dr1-dev
Phil Burk [Sat, 1 Jul 2017 02:08:47 +0000 (02:08 +0000)]
Merge "aaudio: fix mixer volume" into oc-dr1-dev
am:
097da17bd5
Change-Id: I32d35f0b0d5ec43950362def009f3e71f18c5cdc
TreeHugger Robot [Sat, 1 Jul 2017 02:03:50 +0000 (02:03 +0000)]
Merge "aaudio: fix mixer volume" into oc-dr1-dev
Eric Laurent [Sat, 1 Jul 2017 02:03:47 +0000 (02:03 +0000)]
Merge "aaudio: modify endpoint sharing logic" into oc-dr1-dev
am:
358ad4257d
Change-Id: I08614f5f530106f2d03074bf1a0b3b03cbaafcc0
OSDN Git Service
