OSDN Git Service

android-x86/frameworks-av.git
6 years agoMerge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5
Wei Jia [Tue, 10 Oct 2017 23:39:58 +0000 (23:39 +0000)]
Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5
am: e14c028ff7

Change-Id: I15b17df04afbbd0379c98f74e4fcf7aef7cb5a42

6 years agoMerge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev
Wei Jia [Tue, 10 Oct 2017 23:28:26 +0000 (23:28 +0000)]
Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev
am: 402b8a0ef5

Change-Id: Id2a604cf81ce8f44739365d77d5777caccf76220

6 years agoMerge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156
Lajos Molnar [Tue, 10 Oct 2017 23:27:45 +0000 (23:27 +0000)]
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156
am: 648703351f

Change-Id: I0e610da707f2988f441eb86d5b55f6d9088feec6

6 years agoMerge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev
Lajos Molnar [Tue, 10 Oct 2017 23:24:34 +0000 (23:24 +0000)]
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev
am: 1e79b0c156

Change-Id: I2ce31c4b8db21cf20975f9855215b48e3779915e

6 years agoMerge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev
Android Build Merger (Role) [Tue, 10 Oct 2017 23:20:56 +0000 (23:20 +0000)]
Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev

* changes:
  MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9  -s ours am: 41392611b5 am: 0b6424a441 am: b9e0bdb6e8 am: 1d242fdfff am: c8ab764e51
  Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657  -s ours am: 769a422071 am: 4797f02aee am: d951771d27 am: bd9ffb2a77 am: da86840b7b

6 years agoMediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0...
Wei Jia [Tue, 10 Oct 2017 23:19:32 +0000 (23:19 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9  -s ours am: 41392611b5 am: 0b6424a441 am: b9e0bdb6e8 am: 1d242fdfff
am: c8ab764e51

Change-Id: Icb9afd4abcdca6b64fdedbb5dbf5f468d9d88130

6 years agoMerge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev
TreeHugger Robot [Tue, 10 Oct 2017 23:14:36 +0000 (23:14 +0000)]
Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev

6 years agoDon't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e95...
Marco Nelissen [Tue, 10 Oct 2017 23:14:17 +0000 (23:14 +0000)]
Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657  -s ours am: 769a422071 am: 4797f02aee am: d951771d27 am: bd9ffb2a77
am: da86840b7b

Change-Id: I67fa80e2f3da716d86a4a08ec25b795036a6524e

6 years agoMediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0...
Wei Jia [Tue, 10 Oct 2017 23:07:06 +0000 (23:07 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9  -s ours am: 41392611b5 am: 0b6424a441 am: b9e0bdb6e8
am: 1d242fdfff

Change-Id: Ifac6eee45c655b843f782ce732643f44dd0dd986

6 years agoDon't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e95...
Marco Nelissen [Tue, 10 Oct 2017 23:05:51 +0000 (23:05 +0000)]
Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657  -s ours am: 769a422071 am: 4797f02aee am: d951771d27
am: bd9ffb2a77

Change-Id: I7eb4c7d04b7c51fc5a8fa230cfc1db03829760c7

6 years agoMediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0...
Wei Jia [Tue, 10 Oct 2017 22:56:46 +0000 (22:56 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9  -s ours am: 41392611b5 am: 0b6424a441
am: b9e0bdb6e8

Change-Id: Id003ce3e6655581041f2a427408b177f1235f431

6 years agoDon't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e95...
Marco Nelissen [Tue, 10 Oct 2017 22:54:58 +0000 (22:54 +0000)]
Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657  -s ours am: 769a422071 am: 4797f02aee
am: d951771d27

Change-Id: I7345add98dd4856771587bd5b42179fe76bf5032

6 years agoMediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0...
Wei Jia [Tue, 10 Oct 2017 22:41:24 +0000 (22:41 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9  -s ours am: 41392611b5
am: 0b6424a441

Change-Id: I37a115a1778d1852401427cd2a7c16299c8c60f4

6 years agoDon't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e95...
Marco Nelissen [Tue, 10 Oct 2017 22:40:41 +0000 (22:40 +0000)]
Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657  -s ours am: 769a422071
am: 4797f02aee

Change-Id: I27dea01e8c38ea4768043d5b1f1075e75fe36581

6 years agoMerge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc...
Eric Laurent [Tue, 10 Oct 2017 22:40:39 +0000 (22:40 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e  -s ours am: 1fd129f457  -s ours
am: a5d924154e  -s ours

Change-Id: I1810d2f976168e3b32bbdc16726cd73182f979ed

6 years agoMerge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c ...
Marco Nelissen [Tue, 10 Oct 2017 22:36:29 +0000 (22:36 +0000)]
Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c  -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6
am: cf3b663306

Change-Id: I63bf2c7a0ec2769aaeccfd5b97677dab47975a27

6 years agoMediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0...
Wei Jia [Tue, 10 Oct 2017 22:33:02 +0000 (22:33 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9  -s ours
am: 41392611b5

Change-Id: I5a120cc1fc60d9e4d47efe4c953286eb8dc6b3f2

6 years agoDon't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e95...
Marco Nelissen [Tue, 10 Oct 2017 22:32:13 +0000 (22:32 +0000)]
Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657  -s ours
am: 769a422071

Change-Id: I78f95557dfa60537f1a8da92b6c5f8668f18a4c8

6 years agoMerge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc...
Eric Laurent [Tue, 10 Oct 2017 22:29:54 +0000 (22:29 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e  -s ours
am: 1fd129f457  -s ours

Change-Id: I5471dae8cdbd105f8f76e8c7fd3bcb1f9cc847a8

6 years agoMerge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c ...
Marco Nelissen [Tue, 10 Oct 2017 22:24:30 +0000 (22:24 +0000)]
Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c  -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0
am: fc64ad47f6

Change-Id: Ie7cf45469fd8d2a731c2d888027cec9ba76f1bc8

6 years agoMediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0...
Wei Jia [Tue, 10 Oct 2017 22:22:16 +0000 (22:22 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747
am: 6c15ae2aa9  -s ours

Change-Id: I100024372f76521ea697a7742dba8ac064e972cc

6 years agoMerge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc...
Eric Laurent [Tue, 10 Oct 2017 22:22:05 +0000 (22:22 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e
am: 960f0f335e  -s ours

Change-Id: I9e99134af75cc2f03eaec7e8686ee1ab04c678ed

6 years agoDon't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b
Marco Nelissen [Tue, 10 Oct 2017 22:21:58 +0000 (22:21 +0000)]
Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b
am: efcbb62657  -s ours

Change-Id: I418cd498a25c0a1670ab1ba52c5e85ced779c3e0

6 years agoMerge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c ...
Marco Nelissen [Tue, 10 Oct 2017 22:18:25 +0000 (22:18 +0000)]
Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c  -s ours am: 4758facf28 am: db1e02306c
am: 32d62af8e0

Change-Id: I9f59f0429fdbb0e6bc6607b3e757fc1ac8f017b1

6 years agoMerge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc...
Eric Laurent [Tue, 10 Oct 2017 22:17:24 +0000 (22:17 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137
am: 830bbb259e

Change-Id: Ibd1f49311e7315b67d361c1ac48bbb436e4cf1d7

6 years agoMerge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c ...
Marco Nelissen [Tue, 10 Oct 2017 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c  -s ours am: 4758facf28
am: db1e02306c

Change-Id: I81c93c34c33f32ff0ebd471a9e91b8e8a230abaa

6 years agoMerge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc...
Eric Laurent [Tue, 10 Oct 2017 22:08:14 +0000 (22:08 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d
am: 31ac3bd137

Change-Id: Ia824880f1020c46b30989325d154f88134cbdaed

6 years agoMerge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c ...
Marco Nelissen [Tue, 10 Oct 2017 22:04:53 +0000 (22:04 +0000)]
Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c  -s ours
am: 4758facf28

Change-Id: Ie6a6ff729b8d5461f86a7ab9e3dbb6f04f4659b5

6 years agoMerge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc...
Eric Laurent [Tue, 10 Oct 2017 22:01:19 +0000 (22:01 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb
am: 7f0263ba2d

Change-Id: I1777f119f17e359bead997c1bd043e1554c5125c

6 years agoMerge changes from topic "b23270724" into nyc-dev am: 45a05eb567
Marco Nelissen [Tue, 10 Oct 2017 21:57:23 +0000 (21:57 +0000)]
Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567
am: e79b2f044c  -s ours

Change-Id: I39d12c1761c74291eead9f98fc3a7409a79b2c43

6 years agoSoundtrigger service: fix cross deadlock with audio policy service am: 0957621867
Eric Laurent [Tue, 10 Oct 2017 21:32:01 +0000 (21:32 +0000)]
Soundtrigger service: fix cross deadlock with audio policy service am: 0957621867
am: 87da65273f  -s ours

Change-Id: I72d68a8ba1dbed53e2887879c9b391bfb59c987e

6 years agoMerge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
Eric Laurent [Tue, 10 Oct 2017 21:30:46 +0000 (21:30 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
am: dbda8a95eb

Change-Id: I325b9ad452b2ee6da8368ad5951fc37cad80723f

6 years agoSoundtrigger service: fix cross deadlock with audio policy service
Eric Laurent [Tue, 10 Oct 2017 21:28:46 +0000 (21:28 +0000)]
Soundtrigger service: fix cross deadlock with audio policy service
am: 0957621867

Change-Id: I7007032007fda2505fe567dc75e91d666cf9dcf3

6 years agoMerge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
Eric Laurent [Tue, 10 Oct 2017 21:21:31 +0000 (21:21 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev

6 years agoMediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0...
Wei Jia [Tue, 10 Oct 2017 21:15:33 +0000 (21:15 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c
am: 7b66ddb747

Change-Id: I70c6a85ff698c487031aed697a880ab0c5e62769

6 years agoDon't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2
Marco Nelissen [Tue, 10 Oct 2017 21:14:35 +0000 (21:14 +0000)]
Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2
am: 0ada8e950b

Change-Id: I0a88ce1fa0a73966d2c1a61e1ff70d0f30d711ae

6 years agoMediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0
Wei Jia [Tue, 10 Oct 2017 21:10:51 +0000 (21:10 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0
am: 1fad937a9c

Change-Id: If2da3bc028a3dd7bcbbb96ac1abe567e2ba71f86

6 years agoDon't CHECK if the source can't be started am: 711f83fa6c
Marco Nelissen [Tue, 10 Oct 2017 21:09:54 +0000 (21:09 +0000)]
Don't CHECK if the source can't be started am: 711f83fa6c
am: c3f16a62a2

Change-Id: Ie546935111a19ca0ff157e8bffb95dffd7ed8a46

6 years agoMediaExtractor: ensure users to check returned value by getTrack.
Wei Jia [Tue, 10 Oct 2017 21:02:53 +0000 (21:02 +0000)]
MediaExtractor: ensure users to check returned value by getTrack.
am: 46e359cbc0

Change-Id: I4a953b55c86be7590e7cf54b01b01c26e98aba19

6 years agoMerge changes from topic "b23270724" into nyc-dev
Marco Nelissen [Tue, 10 Oct 2017 21:02:10 +0000 (21:02 +0000)]
Merge changes from topic "b23270724" into nyc-dev
am: 45a05eb567

Change-Id: Iee4799062b31b85d92fd2a1ca9ca1000839bc7e6

6 years agoDon't CHECK if the source can't be started
Marco Nelissen [Tue, 10 Oct 2017 21:01:59 +0000 (21:01 +0000)]
Don't CHECK if the source can't be started
am: 711f83fa6c

Change-Id: Ib21b34c2c9707cfeb9a20a31417c84c9af8a585e

6 years agoMerge changes from topic "b23270724" into nyc-dev
TreeHugger Robot [Tue, 10 Oct 2017 20:56:11 +0000 (20:56 +0000)]
Merge changes from topic "b23270724" into nyc-dev

* changes:
  Handle idle->loaded state transition when loaded->idle is still in progress
  IMediaExtractor: ensure users to check returned value by getTrack.
  Don't CHECK if the source can't be started
  Fix issues with extractor dumpsys

6 years agoSoundtrigger service: fix cross deadlock with audio policy service
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service

Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().

Regression introduced by fix for b/64340921 commit f759b8c4

Bug: 64340921
Bug: 67310830
Test: repro steps in b/67310830

Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583

Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583

6 years agoSoundtrigger service: fix cross deadlock with audio policy service
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service

Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().

Regression introduced by fix for b/64340921 commit f759b8c4

Bug: 64340921
Bug: 67310830
Test: repro steps in b/67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583

Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583

6 years agoMerge "stagefright: convert heif rotation angle to clockwise" into oc-mr1-dev
TreeHugger Robot [Fri, 6 Oct 2017 05:20:15 +0000 (05:20 +0000)]
Merge "stagefright: convert heif rotation angle to clockwise" into oc-mr1-dev

6 years agostagefright: convert heif rotation angle to clockwise
Chong Zhang [Thu, 5 Oct 2017 22:16:59 +0000 (15:16 -0700)]
stagefright: convert heif rotation angle to clockwise

bug: 67470228
Test: verify rotation using test app attached in the bug
Change-Id: I75605d207243e2bc0cc67abc7cdc135c02984779

6 years agoSoundtrigger service: fix cross deadlock with audio policy service
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service

Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().

Regression introduced by fix for b/64340921 commit f759b8c4

Bug: 64340921
Bug: 67310830
Test: repro steps in b/67310830
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583

6 years agoaaudio: disable MMAP mode by not creating AAudioService am: 969f2c97f0
Phil Burk [Wed, 4 Oct 2017 23:38:59 +0000 (23:38 +0000)]
aaudio: disable MMAP mode by not creating AAudioService am: 969f2c97f0
am: 73b78ac7d9  -s ours

Change-Id: Iab154cd4cd91b60e479b77077f3c2fe42f1c26e9

6 years agoaaudio: disable MMAP mode by not creating AAudioService
Phil Burk [Wed, 4 Oct 2017 23:35:11 +0000 (23:35 +0000)]
aaudio: disable MMAP mode by not creating AAudioService
am: 969f2c97f0

Change-Id: I360ee2a32a4ed67539932775ef8c1f001b756092

6 years agoMerge "Increase heap size for fast capture in stereo" into oc-mr1-dev
Glenn Kasten [Wed, 4 Oct 2017 22:44:57 +0000 (22:44 +0000)]
Merge "Increase heap size for fast capture in stereo" into oc-mr1-dev

6 years agoMerge "Monitor binder status to media.metrics service" into oc-mr1-dev
TreeHugger Robot [Wed, 4 Oct 2017 03:34:36 +0000 (03:34 +0000)]
Merge "Monitor binder status to media.metrics service" into oc-mr1-dev

6 years agoMerge "Check transaction status in WGraphicBufferSource" into oc-mr1-dev
TreeHugger Robot [Wed, 4 Oct 2017 03:08:45 +0000 (03:08 +0000)]
Merge "Check transaction status in WGraphicBufferSource" into oc-mr1-dev

6 years agoaaudio: disable MMAP mode by not creating AAudioService
Phil Burk [Tue, 12 Sep 2017 23:42:44 +0000 (16:42 -0700)]
aaudio: disable MMAP mode by not creating AAudioService

Only Legacy mode will work, which uses AudioFlinger.

Note that another CL with the same ID in oc-mr1-dev is used to prevent
AAudio MMAP from being disabled in MR1 and master.

Bug: 65280854
Bug: 65262790
Test: See bugs. Any attempt to use MMAP will fail to open the service.
Merged-In: Ic68d136c99c16134aa704495311ab25285fd76a9
Change-Id: Ic68d136c99c16134aa704495311ab25285fd76a9

6 years agoMerge "audioserver: enable AAudioService for MR1" into oc-mr1-dev
Phil Burk [Tue, 3 Oct 2017 19:16:54 +0000 (19:16 +0000)]
Merge "audioserver: enable AAudioService for MR1" into oc-mr1-dev

6 years agoIncrease heap size for fast capture in stereo
Glenn Kasten [Tue, 3 Oct 2017 17:12:20 +0000 (10:12 -0700)]
Increase heap size for fast capture in stereo

Test: at bug
Bug: 66967812
Change-Id: I06423217e02f644452d6a03ae01316fd6d2d9145

6 years agoMerge "Correct cleanup when compacting metrics attributes" into oc-mr1-dev
TreeHugger Robot [Tue, 3 Oct 2017 10:59:59 +0000 (10:59 +0000)]
Merge "Correct cleanup when compacting metrics attributes" into oc-mr1-dev

6 years agoCheck transaction status in WGraphicBufferSource
Pawin Vongmasa [Tue, 3 Oct 2017 00:58:37 +0000 (17:58 -0700)]
Check transaction status in WGraphicBufferSource

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 67298613
Change-Id: Ibd6f4c28e3bffc65c59a32d5790cec52e29ab8ec

6 years agoCorrect cleanup when compacting metrics attributes
Ray Essick [Mon, 2 Oct 2017 17:56:18 +0000 (10:56 -0700)]
Correct cleanup when compacting metrics attributes

Correct management of compacted media metrics attributes; ensure
proper release of a stale reference after copying it down into
a spot vacated as part of a deletion.

Bug: 67110197
Test: logcat to see it trip through the fix
Change-Id: I19031ebf257e958141524458da6b808fa741cce7

6 years agoMonitor binder status to media.metrics service
Ray Essick [Mon, 2 Oct 2017 16:29:49 +0000 (09:29 -0700)]
Monitor binder status to media.metrics service

Add code to use binder's linkToDeath() so that our clients learn when
(infrequently, we hope) the media.metrics service dies for some
reason. When this happens, arrange for the client to re-establish
its connection to the service.

Bug: 66948389
Test: kill media.metrics, watch logcat for reestablishment messages
Change-Id: Ic518b955ce6816698b21e6a9c844587cef2e2712

6 years agoaudioserver: enable AAudioService for MR1
Phil Burk [Fri, 29 Sep 2017 22:06:40 +0000 (15:06 -0700)]
audioserver: enable AAudioService for MR1

Another CL in OC-DEV may have turned it off.
This was added to resolve merge conflicts and to
only enable AAudioService when supported by the vendor.

Bug: 65280854
Bug: 65262790
Test: Enter  adb shell setprop aaudio.mmap_policy 1
Test: Enter  adb shell killall audioserver
Test: Enter  adb shell dumpsys media.aaudio
Test: It should print "Can't find service: media.aaudio".
Test: Enter  adb shell setprop aaudio.mmap_policy 2
Test: Enter  adb shell killall audioserver
Test: Enter  adb shell dumpsys media.aaudio
Test: It should print a short dump because the service is running.

Change-Id: Ic68d136c99c16134aa704495311ab25285fd76a9

6 years agoCamera: fix wrong vector size bug
Yin-Chia Yeh [Fri, 29 Sep 2017 21:13:28 +0000 (14:13 -0700)]
Camera: fix wrong vector size bug

Test: partner testing, CTS
Bug: 67107422
Change-Id: If9db3cca35aecceb8ca24ebf0e913efb84bc0dae

6 years agoCamera: check HIDL transaction ret value
Yin-Chia Yeh [Fri, 29 Sep 2017 19:01:02 +0000 (12:01 -0700)]
Camera: check HIDL transaction ret value

Test: CTS
Bug: 67102043
Change-Id: I40d6ec4f576850fdc8b39a795cf5bb01dc00b3db

6 years agoMerge "camera: Use device level ZSL if supported" into oc-mr1-dev
TreeHugger Robot [Thu, 28 Sep 2017 22:12:16 +0000 (22:12 +0000)]
Merge "camera: Use device level ZSL if supported" into oc-mr1-dev

6 years agoMerge "audioflinger: do not call onTearDown() in threadLoop_exit()" into oc-mr1-dev
Phil Burk [Thu, 28 Sep 2017 15:55:24 +0000 (15:55 +0000)]
Merge "audioflinger: do not call onTearDown() in threadLoop_exit()" into oc-mr1-dev

6 years agoaudioflinger: do not call onTearDown() in threadLoop_exit()
Phil Burk [Wed, 27 Sep 2017 20:51:41 +0000 (13:51 -0700)]
audioflinger: do not call onTearDown() in threadLoop_exit()

This is just for MmapThread.
This change will prevent a recursive mutex lock when the teardown calls
stop() on the stream.

Bug: 66971139
Test: unplug headphones with aaudio-echo, see bugreport
Change-Id: I904a8e575bbc5ae8b03350c061dd23cba62783f0

6 years agoMerge "Camera: don't hold memory map lock during callback" into oc-mr1-dev
TreeHugger Robot [Tue, 26 Sep 2017 20:36:49 +0000 (20:36 +0000)]
Merge "Camera: don't hold memory map lock during callback" into oc-mr1-dev

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5f...
Julien Desprez [Tue, 26 Sep 2017 17:29:00 +0000 (17:29 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f am: 35c28bb88f am: c2b8b3f072 am: 0e4a89e436
am: fbf55f744a

Change-Id: I87b131a0444f83fdec3c05efde00e8c1056d67b9

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5f...
Julien Desprez [Tue, 26 Sep 2017 17:27:00 +0000 (17:27 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f am: 35c28bb88f am: c2b8b3f072
am: 0e4a89e436

Change-Id: I57e3b1d15ffd012e2346fc394d4a701b49ef0754

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5f...
Julien Desprez [Tue, 26 Sep 2017 17:24:32 +0000 (17:24 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f am: 35c28bb88f
am: c2b8b3f072

Change-Id: I90cce4197d2537e4821607c9948f07086e51f070

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5f...
Julien Desprez [Tue, 26 Sep 2017 17:22:29 +0000 (17:22 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb am: af93be238f
am: 35c28bb88f

Change-Id: I2971472558c986121f134bde112ca57829d19cea

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb
Julien Desprez [Tue, 26 Sep 2017 17:20:31 +0000 (17:20 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539 am: 8dc2a5fdfb
am: af93be238f

Change-Id: Id023ae01a22e71617b898c8ce2c65ccae6ca295a

6 years agoRevert "Make stagefright command available for STS tests." am: 4197479539
Julien Desprez [Tue, 26 Sep 2017 17:17:59 +0000 (17:17 +0000)]
Revert "Make stagefright command available for STS tests." am: 4197479539
am: 8dc2a5fdfb

Change-Id: I2679093d7a32ac111cf674dc357ac32853a99b81

6 years agoRevert "Make stagefright command available for STS tests."
Julien Desprez [Tue, 26 Sep 2017 17:15:31 +0000 (17:15 +0000)]
Revert "Make stagefright command available for STS tests."
am: 4197479539

Change-Id: I3fd20c38c33720d6e0824022976fb2db21eb6419

6 years agoRevert "Make stagefright command available for STS tests."
Julien Desprez [Tue, 26 Sep 2017 17:02:21 +0000 (17:02 +0000)]
Revert "Make stagefright command available for STS tests."

Bug: 66943976
This reverts commit e286ff463b46ca987562adc9b24d49f1ee191b92.

Change-Id: I9704307962d86e82baf0215b60fadeaa1cc470df

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am...
Andres Celis [Mon, 25 Sep 2017 22:41:52 +0000 (22:41 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582 am: 15052a13c1 am: c29da42e23 am: 9ab0a4da85
am: f35ee5186c

Change-Id: I8426fbf133c87dffcc2e5ec8f0a9f6156e660e33

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am...
Andres Celis [Mon, 25 Sep 2017 22:39:23 +0000 (22:39 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582 am: 15052a13c1 am: c29da42e23
am: 9ab0a4da85

Change-Id: I8f774a856e7137bb0d46548611bd0cb4732c88fd

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am...
Andres Celis [Mon, 25 Sep 2017 22:35:49 +0000 (22:35 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582 am: 15052a13c1
am: c29da42e23

Change-Id: I02da406a30367840f32d2112d1b4dc7f2babaeb2

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am...
Andres Celis [Mon, 25 Sep 2017 22:31:20 +0000 (22:31 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e am: 80a9c17582
am: 15052a13c1

Change-Id: I9d74a9914420bbf71203f8c79ad09eeca77e3d2f

6 years agoMake stagefright command available for STS tests. am: e286ff463b am: ef136ff97e
Andres Celis [Mon, 25 Sep 2017 22:29:19 +0000 (22:29 +0000)]
Make stagefright command available for STS tests. am: e286ff463b am: ef136ff97e
am: 80a9c17582

Change-Id: I41d392a8930721fce8359a6814d8db8ff7859d5f

6 years agoMake stagefright command available for STS tests. am: e286ff463b
Andres Celis [Mon, 25 Sep 2017 22:27:19 +0000 (22:27 +0000)]
Make stagefright command available for STS tests. am: e286ff463b
am: ef136ff97e

Change-Id: I64167e4b7aaca441a13d33667a519c0ffd8899d2

6 years agoMake stagefright command available for STS tests.
Andres Celis [Mon, 25 Sep 2017 22:24:49 +0000 (22:24 +0000)]
Make stagefright command available for STS tests.
am: e286ff463b

Change-Id: I3ad4b941d5aebce2bf33f621b872e9ce0dc72ac1

6 years agoMerge "Camera NDK: fix release image failure during destructor" into oc-mr1-dev
TreeHugger Robot [Fri, 22 Sep 2017 20:55:30 +0000 (20:55 +0000)]
Merge "Camera NDK: fix release image failure during destructor" into oc-mr1-dev

6 years agoCamera: don't hold memory map lock during callback
Yin-Chia Yeh [Fri, 22 Sep 2017 18:32:53 +0000 (11:32 -0700)]
Camera: don't hold memory map lock during callback

Test: partner stress tests
Bug: 66691828
Change-Id: I2f0048293380f0a89ba46c441c1d77bae8aec7be

6 years agoMerge "softFlac: handle eos buffers at any stage" into oc-mr1-dev
TreeHugger Robot [Fri, 22 Sep 2017 03:54:39 +0000 (03:54 +0000)]
Merge "softFlac: handle eos buffers at any stage" into oc-mr1-dev

6 years agoMerge "audioflinger: volume control to HAL for VoIP streams" into oc-mr1-dev
TreeHugger Robot [Fri, 22 Sep 2017 02:07:55 +0000 (02:07 +0000)]
Merge "audioflinger: volume control to HAL for VoIP streams" into oc-mr1-dev

6 years agoCamera NDK: fix release image failure during destructor
Yin-Chia Yeh [Wed, 20 Sep 2017 00:28:25 +0000 (17:28 -0700)]
Camera NDK: fix release image failure during destructor

Test: new CTS test that close reader with images in
      acquired state
Bug: 65839749

Change-Id: Iac9d2b1a3298ca619f2ab71a02641052f9a51f2e

6 years agosoftFlac: handle eos buffers at any stage
Ram Mohan [Fri, 15 Sep 2017 14:52:36 +0000 (20:22 +0530)]
softFlac: handle eos buffers at any stage

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Host \
-l INFO

Bug: 63796949

Change-Id: I528b4bc041aab8affc28cb7d1b96ea6065754798

6 years agoaudioflinger: volume control to HAL for VoIP streams
Eric Laurent [Thu, 21 Sep 2017 00:54:22 +0000 (17:54 -0700)]
audioflinger: volume control to HAL for VoIP streams

Do not apply stream volume in software for special VoIP output
stream mixers but send it to the HAL instead.

Bug: 64392515.
Test: Fi calls
Change-Id: I698a1a0ad17d672d09187529dcbc5d259284e4af

6 years agoMerge "Remove codec aggregation/summarization" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Sep 2017 15:03:28 +0000 (15:03 +0000)]
Merge "Remove codec aggregation/summarization" into oc-mr1-dev

6 years agoMerge "add media.metrics tracking of fatal codec errors" into oc-mr1-dev
TreeHugger Robot [Thu, 21 Sep 2017 14:56:01 +0000 (14:56 +0000)]
Merge "add media.metrics tracking of fatal codec errors" into oc-mr1-dev

6 years agoRemove codec aggregation/summarization
Ray Essick [Wed, 20 Sep 2017 23:36:33 +0000 (16:36 -0700)]
Remove codec aggregation/summarization

The aggregation, which tries to collect info for standard deviation,
used a 64-bit counter. But with a 4GB video file, when you square the
bytecount, you quickly run up against the 64 bit limit.
So we won't be aggregating those records any longer on-device.

Bug: 66226775
Test: dumpsys media.metrics -summary, no aggregated codec lines
Change-Id: I7c8347eba3d48dfd3b26916e9eb76de1c129817f

6 years agoadd media.metrics tracking of fatal codec errors
Ray Essick [Tue, 19 Sep 2017 18:48:35 +0000 (11:48 -0700)]
add media.metrics tracking of fatal codec errors

add error code tracking to media metrics records for codecs.
So we can learn what's going wrong (bad data, chopped data, bad code,
etc).

Bug: 65250664
Test: ran good/bad media through codecs, read 'dumpsys media.metrics'
Change-Id: Ia46bdff865fb6c965f669e4189c7be5dbc1598fe

6 years agoMake stagefright command available for STS tests.
Andres Celis [Wed, 20 Sep 2017 20:24:48 +0000 (13:24 -0700)]
Make stagefright command available for STS tests.

Bug:65246490
Change-Id: If34d5e625181bd81bc112b1c9b519b2c0891740b

6 years agoMerge "Blur media.metrics timestamps for privacy" into oc-mr1-dev
TreeHugger Robot [Wed, 20 Sep 2017 20:17:39 +0000 (20:17 +0000)]
Merge "Blur media.metrics timestamps for privacy" into oc-mr1-dev

6 years agoMerge "trim packagename if sideloaded, get versioncode" into oc-mr1-dev
Ray Essick [Wed, 20 Sep 2017 16:08:48 +0000 (16:08 +0000)]
Merge "trim packagename if sideloaded, get versioncode" into oc-mr1-dev

6 years agotrim packagename if sideloaded, get versioncode
Ray Essick [Tue, 19 Sep 2017 16:27:31 +0000 (09:27 -0700)]
trim packagename if sideloaded, get versioncode

implement policy of not uploading package info when sideloaded
or through a non-playstore channel. Include versioncode information
when we do include a particular package.

Bug: 65027506
Test: watch logs and dumpsys for various package combinations
Change-Id: I8e601c899070b57c25181ba705e997f10ea052b4

6 years agoMerge "Camera service: Add support for camera.device@3.3" into oc-mr1-dev
Eino-Ville Talvala [Tue, 19 Sep 2017 15:53:44 +0000 (15:53 +0000)]
Merge "Camera service: Add support for camera.device@3.3" into oc-mr1-dev

6 years agoMerge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 01:14:06 +0000 (01:14 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev

6 years agoFix various AAudio device selection issues
Eric Laurent [Fri, 15 Sep 2017 03:06:42 +0000 (20:06 -0700)]
Fix various AAudio device selection issues

Bug: 65292224
- Audio policy manager should not use an unavailable device when an explicit
route is requested. This causes a device selection made by a client to
become sticky after device disconnection.

Bug: 64945845
- Remove spurious device change callback occuring after registering a
new client to audio server by creating a specific configuration event
for client registration.
- Do not keep strong references to device callback interfaces in
AudioTrack, AudioRecord and AudioSystem.
- Do not update selected device in AudioTrack and AudioRecord when
not active as the new device selection on the stream is because of other
clients activity which is not relevant to an inactive client.

Bug: 65693340
- Fix missing increment of SessionRoute ref count in getInputForAttr() for
MMAP inputs

Test: AAudio CTS tests

Change-Id: I2a01b02e8b064d352004f6065495fd99aee55745

6 years agoRename "bitrate-control" to "bitrate-modes"
Pawin Vongmasa [Sat, 16 Sep 2017 13:49:48 +0000 (06:49 -0700)]
Rename "bitrate-control" to "bitrate-modes"

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 65769027
Change-Id: I09e92841daffdb09d9e236d590462f345f7a1ed8