OSDN Git Service

android-x86/frameworks-av.git
7 years agoaaudio: fix leak of AAudioBinderClient
Phil Burk [Tue, 16 May 2017 18:37:43 +0000 (11:37 -0700)]
aaudio: fix leak of AAudioBinderClient

Made it a Singleton that gets reused.

Bug: 37992613
Test: write_sine_callback.cpp
Change-Id: I63c045bd71d3bc1fc84f5fd4d7a6159fa5184c1c
Signed-off-by: Phil Burk <philburk@google.com>
7 years agoMerge "aaudio: fix output bugs and improve input performance, add loopback test"...
Phil Burk [Wed, 17 May 2017 19:43:16 +0000 (19:43 +0000)]
Merge "aaudio: fix output bugs and improve input performance, add loopback test" into oc-dev

7 years agoMerge "aaudio: control MMAP mode using system properties" into oc-dev
Phil Burk [Wed, 17 May 2017 00:51:40 +0000 (00:51 +0000)]
Merge "aaudio: control MMAP mode using system properties" into oc-dev

7 years agoMerge "Don't load legacy plugins from /vendor/lib/drm" into oc-dev
TreeHugger Robot [Tue, 16 May 2017 23:42:18 +0000 (23:42 +0000)]
Merge "Don't load legacy plugins from /vendor/lib/drm" into oc-dev

7 years agoMerge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938...
Marco Nelissen [Tue, 16 May 2017 19:55:14 +0000 (19:55 +0000)]
Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938 am: 670ba92946 am: 8bcf9aa2c4 am: e054111199
am: 3be14c2e41

Change-Id: I574e6e2f270b8a1b9bd95e665dce240898e176d6

7 years agoMerge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938...
Marco Nelissen [Tue, 16 May 2017 19:52:12 +0000 (19:52 +0000)]
Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938 am: 670ba92946 am: 8bcf9aa2c4
am: e054111199

Change-Id: I2abeb0b6b9763878ae7961d96fc2014305d07f57

7 years agoMerge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938...
Marco Nelissen [Tue, 16 May 2017 19:49:42 +0000 (19:49 +0000)]
Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938 am: 670ba92946
am: 8bcf9aa2c4

Change-Id: If521f57152351ee5c5923311316862aec0d0bc8f

7 years agoMerge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938
Marco Nelissen [Tue, 16 May 2017 19:46:12 +0000 (19:46 +0000)]
Merge "Modifying MetaData invalidates previous char*" into nyc-dev am: eb36bac938
am: 670ba92946

Change-Id: I2890cde112e1b3bd910094774764a658079fb4e9

7 years agoMerge "Modifying MetaData invalidates previous char*" into nyc-dev
Marco Nelissen [Tue, 16 May 2017 19:42:43 +0000 (19:42 +0000)]
Merge "Modifying MetaData invalidates previous char*" into nyc-dev
am: eb36bac938

Change-Id: I1a401b30afed8fccdf48c9b41ae414f7410520a9

7 years agoMerge "Modifying MetaData invalidates previous char*" into nyc-dev
Marco Nelissen [Tue, 16 May 2017 19:37:16 +0000 (19:37 +0000)]
Merge "Modifying MetaData invalidates previous char*" into nyc-dev

7 years agoaaudio: control MMAP mode using system properties
Phil Burk [Thu, 11 May 2017 22:53:06 +0000 (15:53 -0700)]
aaudio: control MMAP mode using system properties

To facilitate testing of MMAP mode.

Bug: 38268547
Test: set properties, see framesPerBurst in write_sine_callback.cpp
Change-Id: I6e15c563215017f6a5020d89ac312ff8331afc4f
Signed-off-by: Phil Burk <philburk@google.com>
7 years agoMerge "Modular DRM for MediaPlayer/Race at stop/releaseDrm" into oc-dev
Hassan Shojania [Tue, 16 May 2017 16:14:52 +0000 (16:14 +0000)]
Merge "Modular DRM for MediaPlayer/Race at stop/releaseDrm" into oc-dev

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 16:13:00 +0000 (16:13 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f am: 7c3b47540e am: 0967b342f4 am: b47837e3c6 am: cc8ee0ef47
am: 1182c9d9e5

Change-Id: I9b43a2bdafbc5bb86e276ea36cf633ee2c57bffa

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 16:10:00 +0000 (16:10 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f am: 7c3b47540e am: 0967b342f4 am: b47837e3c6
am: cc8ee0ef47

Change-Id: I2ee55ff2503b9ac3428ddee8ea03f3c9c93ae4a2

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 16:06:58 +0000 (16:06 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f am: 7c3b47540e am: 0967b342f4
am: b47837e3c6

Change-Id: I9c12cfac58775cf5bb900e55804634c092422f17

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 16:03:30 +0000 (16:03 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f am: 7c3b47540e
am: 0967b342f4

Change-Id: I9a41425bbfbb6c71fd2dd91e9d4b9b6abed024b4

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 16:00:03 +0000 (16:00 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696 am: 6721b0295f
am: 7c3b47540e

Change-Id: I7af91e2469b5e7e3b7a2d4f0e65cb9620bfe037c

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:56:30 +0000 (15:56 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256 am: 15f2244696
am: 6721b0295f

Change-Id: I56cc783d993f01ee26df858151d1ee649ee62c51

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:53:29 +0000 (15:53 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c am: e4b59cb256
am: 15f2244696

Change-Id: I220aa6cbd2de6ac74a409d6be5aa62c331931929

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:49:58 +0000 (15:49 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f am: 00be42f32c
am: e4b59cb256

Change-Id: I89844419918d671a11696909cf530185ab452822

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:46:30 +0000 (15:46 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388 am: dd2f7e982f
am: 00be42f32c

Change-Id: I651a449830219d0e7513417246d0d269cf44fe88

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:42:58 +0000 (15:42 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca am: 4bd7103388
am: dd2f7e982f

Change-Id: I4cdcb7694baea6c10980860880c4bdcf41905a8f

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:39:56 +0000 (15:39 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408 am: a2fbd251ca
am: 4bd7103388

Change-Id: I159ed2c6b4184689517bf39d791cb516d505e4ed

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6...
Marco Nelissen [Tue, 16 May 2017 15:36:54 +0000 (15:36 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6 am: 55057ab408
am: a2fbd251ca

Change-Id: I8a0e99463feb24350f02d5b5ccdc9419ebb2d71d

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6
Marco Nelissen [Tue, 16 May 2017 15:33:25 +0000 (15:33 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f am: 60657857c6
am: 55057ab408

Change-Id: I5107a57def4be19aad9dca950cca06bebecad1e8

7 years agoMerge "Fix memory leak in error case" into klp-dev am: 5136b7436f
Marco Nelissen [Tue, 16 May 2017 15:30:24 +0000 (15:30 +0000)]
Merge "Fix memory leak in error case" into klp-dev am: 5136b7436f
am: 60657857c6

Change-Id: I1564d4e2626a31b7018bae301c50a268ccc79749

7 years agoMerge "Fix memory leak in error case" into klp-dev
Marco Nelissen [Tue, 16 May 2017 15:27:25 +0000 (15:27 +0000)]
Merge "Fix memory leak in error case" into klp-dev
am: 5136b7436f

Change-Id: I479e015461fa46227c4cae49829b0f3c0d769de9

7 years agoMerge "Fix memory leak in error case" into klp-dev
Marco Nelissen [Tue, 16 May 2017 15:20:59 +0000 (15:20 +0000)]
Merge "Fix memory leak in error case" into klp-dev

7 years agoModular DRM for MediaPlayer/Race at stop/releaseDrm
Hassan Shojania [Fri, 12 May 2017 17:33:16 +0000 (10:33 -0700)]
Modular DRM for MediaPlayer/Race at stop/releaseDrm

Bug: 34559906
Bug: 37960096
Test: GTS LLAMA_H264_XX_V0_SYNC (1000 rounds)
Change-Id: I8576fb9dadf8922c2a54f2ea9e199d2e07c1820e

7 years agoMerge "Fix file transfer corner cases." into oc-dev
Jerry Zhang [Tue, 16 May 2017 00:06:51 +0000 (00:06 +0000)]
Merge "Fix file transfer corner cases." into oc-dev

7 years agoModifying MetaData invalidates previous char*
Marco Nelissen [Mon, 15 May 2017 22:40:14 +0000 (15:40 -0700)]
Modifying MetaData invalidates previous char*

so don't use those char* after having updated the MetaData

Bug: 36576151
Change-Id: I1430f3151cb929e436fbdac566cf91fc4164b934

7 years agoFix file transfer corner cases.
Jerry Zhang [Mon, 15 May 2017 18:54:19 +0000 (11:54 -0700)]
Fix file transfer corner cases.

Fix zero packet read/write in corner cases
with initial read/writes. This affects transfers
of 16372 bytes to the device and transfers of
1012 bytes (or packet size - 12) from the device.

Test: Transfer various length files
Bug: 37175601
Change-Id: Ic1281e8757d1a33d78c66d2c57319b5ee38d6a46

7 years agoMerge "Fix resource leaks in drm hal" into oc-dev
TreeHugger Robot [Mon, 15 May 2017 19:54:09 +0000 (19:54 +0000)]
Merge "Fix resource leaks in drm hal" into oc-dev

7 years agoaaudio: fix output bugs and improve input performance, add loopback test
Phil Burk [Tue, 9 May 2017 22:55:02 +0000 (15:55 -0700)]
aaudio: fix output bugs and improve input performance, add loopback test

Support AAUDIO_PERFORMANCE_MODE in AudioStreamRecord.cpp
Fix race condition when closing a stream, which this test revealed.
Fix setting of negative notificationFrames for non-FAST tracks.

Convert test from old Oboe API to AAudio.
Add command line options to the test.
Add systrace calls.

Bug: 34093052
Bug: 38313432
Bug: 38178592
Test: loopback.cpp
Change-Id: Ib6d2995cdd3ed432937fde2f26c5394013f0d6e0
Signed-off-by: Phil Burk <philburk@google.com>
7 years agoDon't load legacy plugins from /vendor/lib/drm
Jeff Tinker [Mon, 15 May 2017 19:03:12 +0000 (12:03 -0700)]
Don't load legacy plugins from /vendor/lib/drm

Only the OMA forward lock plugin remains and it is
loaded from system/lib/drm.

bug:38114169
Change-Id: I8768656c08482b406cacc6d050ff4df72ddca888

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:27:30 +0000 (17:27 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7 am: d68e4e45b0 am: 90f3fe5f66 am: 08d9bb8cb6 am: 398fa51c1c
am: a6a7b14909

Change-Id: I4b74843f8d4df0d682873b8635deafcc8624d419

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:25:30 +0000 (17:25 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7 am: d68e4e45b0 am: 90f3fe5f66 am: 08d9bb8cb6
am: 398fa51c1c

Change-Id: I9315cf95e40ad3966cf1de410cddc78651bdb6ef

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:22:59 +0000 (17:22 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7 am: d68e4e45b0 am: 90f3fe5f66
am: 08d9bb8cb6

Change-Id: Ie0d6865eb46464bb946d74d680d401968d6ad27d

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:20:29 +0000 (17:20 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7 am: d68e4e45b0
am: 90f3fe5f66

Change-Id: I7bd6c35a924687ca4a6e659dc49754acf01a7f44

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:17:59 +0000 (17:17 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5 am: bf913622a7
am: d68e4e45b0

Change-Id: Ia1ca35c6f723696256c4e379b29f2ac64e9e10b4

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:15:30 +0000 (17:15 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db am: 8c805395e5
am: bf913622a7

Change-Id: I0306abb9a6a8ffd5bc4351b4af78121fd32a4890

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:12:25 +0000 (17:12 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e am: 433dacf8db
am: 8c805395e5

Change-Id: Id4f4b331c2f4fd56a18e032ad1d55983e6b91bc5

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:09:55 +0000 (17:09 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94 am: fd7cba4d0e
am: 433dacf8db

Change-Id: Ibffd67ae4a98c0b38c42f68efcb8cc7b401deb0c

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:07:58 +0000 (17:07 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735 am: 045c64fe94
am: fd7cba4d0e

Change-Id: I0c11db2bb63c110732c925cfc482deee246dc720

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367...
Marco Nelissen [Mon, 15 May 2017 17:04:56 +0000 (17:04 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367 am: 412be4b735
am: 045c64fe94

Change-Id: I02f221f5a4a14706c83ce12c3273df75bd23361f

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367
Marco Nelissen [Mon, 15 May 2017 17:01:55 +0000 (17:01 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89 am: b65b0a8367
am: 412be4b735

Change-Id: I70263d5cb5fca57353337a60686d1468692819cf

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89
Marco Nelissen [Mon, 15 May 2017 16:59:57 +0000 (16:59 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf am: 086cee9d89
am: b65b0a8367

Change-Id: I2faa1a87e934851ee2a4a865e3e3d7084381dac6

7 years agoLimit ogg packet size am: bf928560ac am: f349435fcf
Marco Nelissen [Mon, 15 May 2017 16:56:55 +0000 (16:56 +0000)]
Limit ogg packet size am: bf928560ac am: f349435fcf
am: 086cee9d89

Change-Id: I9687649ed25dade9f872c83a290bbcd0abb4b5fc

7 years agoLimit ogg packet size am: bf928560ac
Marco Nelissen [Mon, 15 May 2017 16:53:54 +0000 (16:53 +0000)]
Limit ogg packet size am: bf928560ac
am: f349435fcf

Change-Id: I952944295017f01b254c80c8db935e33c51337f3

7 years agoLimit ogg packet size
Marco Nelissen [Mon, 15 May 2017 16:50:55 +0000 (16:50 +0000)]
Limit ogg packet size
am: bf928560ac

Change-Id: I102f6e9b1b4933d043b2a3e1e3f7fc885aaf6779

7 years agoMerge "Camera: Advertise only unique API1 compatible devices" into oc-dev
TreeHugger Robot [Mon, 15 May 2017 10:10:35 +0000 (10:10 +0000)]
Merge "Camera: Advertise only unique API1 compatible devices" into oc-dev

7 years agoMerge "Suppress empty media.metrics records from nuplayer" into oc-dev
TreeHugger Robot [Sat, 13 May 2017 01:31:02 +0000 (01:31 +0000)]
Merge "Suppress empty media.metrics records from nuplayer" into oc-dev

7 years agoMerge changes Ida15546f,I1b099e23 into oc-dev
TreeHugger Robot [Sat, 13 May 2017 01:04:05 +0000 (01:04 +0000)]
Merge changes Ida15546f,I1b099e23 into oc-dev

* changes:
  aaudio: make openStream behavior more specific
  aaudio: add a test for openStream() with varying parameters

7 years agoMerge "AAudio: fix exclusive mode" into oc-dev
Eric Laurent [Sat, 13 May 2017 00:47:45 +0000 (00:47 +0000)]
Merge "AAudio: fix exclusive mode" into oc-dev

7 years agoSuppress empty media.metrics records from nuplayer
Ray Essick [Fri, 12 May 2017 23:22:05 +0000 (16:22 -0700)]
Suppress empty media.metrics records from nuplayer

tweaks the mechanism (a count) we use to suppress nuplayer records
for media.metrics to reflect recent changes that included datasource
information.

This stops spurious records that pollute / degrade the uploaded
metrics data.

Bug: 38270725
Test: examine output from: dumpsys media.metrics

7 years agoMerge "fix mmap fd leak inn HIDL audio stream" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 22:49:26 +0000 (22:49 +0000)]
Merge "fix mmap fd leak inn HIDL audio stream" into oc-dev

7 years agoLimit ogg packet size
Marco Nelissen [Fri, 12 May 2017 22:35:30 +0000 (15:35 -0700)]
Limit ogg packet size

A malformed ogg file might lace together a very large packet, which
could lead to out of memory conditions. Limit the packet size to
avoid this.

Bug: 36592202
Change-Id: I8650b3ec54a0de9ec302a7cbac296bb85efcfb3d

7 years agoaaudio: make openStream behavior more specific
Phil Burk [Thu, 11 May 2017 18:44:20 +0000 (11:44 -0700)]
aaudio: make openStream behavior more specific

Change API specification to state that if sampleRate, channelCount
or dataFormat are specified, then the open stream will use those values.

This change does not break the original API, which stated that the actual
values might or might not match the requested values.

The documented API now matches the actual code behavior.

Bug: 38236303
Test: unit test, test_open_params.cpp
Change-Id: Ida15546f0ee2a8cc888158f564492363a700f9ea
Signed-off-by: Phil Burk <philburk@google.com>
7 years agoaaudio: add a test for openStream() with varying parameters
Phil Burk [Thu, 11 May 2017 19:03:13 +0000 (12:03 -0700)]
aaudio: add a test for openStream() with varying parameters

Bug: 38236303
Test: this is a test
Change-Id: I1b099e230acc2168af9c1a4d08ef6753e7066625
Signed-off-by: Phil Burk <philburk@google.com>
7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f...
Ray Essick [Fri, 12 May 2017 18:07:21 +0000 (18:07 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0 am: a43be7d42d am: 3c375611d6 am: 96b4e70f44 am: 9eb9b1b849
am: 91af834b13

Change-Id: Icb076c1e7f90b7ece6cf7f36f9f2e5f3062121cf

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f...
Ray Essick [Fri, 12 May 2017 18:02:01 +0000 (18:02 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0 am: a43be7d42d am: 3c375611d6 am: 96b4e70f44
am: 9eb9b1b849

Change-Id: I603637d9ca99cea3aa899a3883ebe21d928ed3c3

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f...
Ray Essick [Fri, 12 May 2017 17:59:30 +0000 (17:59 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0 am: a43be7d42d am: 3c375611d6
am: 96b4e70f44

Change-Id: Id6038e76dc85b326dd701a4d0916bd8f7591c949

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f...
Ray Essick [Fri, 12 May 2017 17:57:32 +0000 (17:57 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0 am: a43be7d42d
am: 3c375611d6

Change-Id: I2af6025bbfea9927fb37e876b449f93732ddcd33

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f...
Ray Essick [Fri, 12 May 2017 17:55:01 +0000 (17:55 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f am: cd35c846f0
am: a43be7d42d

Change-Id: I9cf2d9117293f14f14fc240c674f02594f8944bd

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f
Ray Essick [Fri, 12 May 2017 17:52:31 +0000 (17:52 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6 am: b6bf46944f
am: cd35c846f0

Change-Id: Id65aa9338a1a362488f33708b4bf5f36d8581104

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6
Ray Essick [Fri, 12 May 2017 17:50:30 +0000 (17:50 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949 am: 97db64baf6
am: b6bf46944f

Change-Id: Ib5533f65db8acecfa3b02e13a07815af8901047c

7 years agoPrevent OOB write in soft_avc encoder am: 463452a949
Ray Essick [Fri, 12 May 2017 17:48:28 +0000 (17:48 +0000)]
Prevent OOB write in soft_avc encoder am: 463452a949
am: 97db64baf6

Change-Id: Ia77a7a995dab5a20d1757ab36d0dda680946274b

7 years agoPrevent OOB write in soft_avc encoder
Ray Essick [Fri, 12 May 2017 17:45:57 +0000 (17:45 +0000)]
Prevent OOB write in soft_avc encoder
am: 463452a949

Change-Id: I7cad9d84093cce83b2edf09a55bb8b9a588bee43

7 years agoFix memory leak in error case
Marco Nelissen [Fri, 12 May 2017 17:45:14 +0000 (10:45 -0700)]
Fix memory leak in error case

Bug: 37239013
Change-Id: Ic33e0f7ed946d0729efa46f69aff1a5d35e81b1e

7 years agoMerge "Camera: Close acquire fences on failed buffers" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 11:49:57 +0000 (11:49 +0000)]
Merge "Camera: Close acquire fences on failed buffers" into oc-dev

7 years agoMerge "Camera: Re-enumarate new providers" into oc-dev
TreeHugger Robot [Fri, 12 May 2017 11:49:42 +0000 (11:49 +0000)]
Merge "Camera: Re-enumarate new providers" into oc-dev

7 years agoCamera: Advertise only unique API1 compatible devices
Emilian Peev [Thu, 11 May 2017 19:29:52 +0000 (20:29 +0100)]
Camera: Advertise only unique API1 compatible devices

Providers could have devices with same id but different
API versions. The total number of API1 compatible devices
needs to consider only the unique ids in this case.

Bug: 38237265
Test: Manual using application
Change-Id: I5a31c3cd28f00e8af3029213711505e4075a61b2

7 years agoMerge "media: Write maker and model information into recorded videos." into oc-dev
TreeHugger Robot [Fri, 12 May 2017 08:00:39 +0000 (08:00 +0000)]
Merge "media: Write maker and model information into recorded videos." into oc-dev

7 years agoAAudio: fix exclusive mode
Eric Laurent [Fri, 12 May 2017 01:11:05 +0000 (18:11 -0700)]
AAudio: fix exclusive mode

Regression introduced by commit e2fbb59e.

Bug: 38247512
Test: verify exclusive mode with write_sine_ndk app.
Change-Id: Id85b922d994fba33561489ca06d4a8fd6e97c416

7 years agofix mmap fd leak inn HIDL audio stream
Eric Laurent [Fri, 12 May 2017 01:08:51 +0000 (18:08 -0700)]
fix mmap fd leak inn HIDL audio stream

Do not dup the fd received from HAL in StreamHalHidl::createMmapBuffer()

Bug: 38232872
Test: verify that MMAP streams can be opened and closed multiple times
Change-Id: I4813f78bd1ae1e8c705d1769a59710c9437bf246

7 years agoOmx: Fix codec instance leak if Observer dies
Praveen Chavan [Tue, 9 May 2017 07:52:09 +0000 (00:52 -0700)]
Omx: Fix codec instance leak if Observer dies

If Observer dies, {instance, observer} book-keeping may be
cleaned up. In such case avoid only unlinking the death-notifier,
but proceed with instance cleanup

Test: Manual use of Camera, Photos, Play Movies and YouTube.
Test: Small CtsMediaTestCases

Bug: 38149818
Change-Id: I412953b55827c93730353a95560b865fb18b5f0f

7 years agoMerge "DO NOT MERGE Bring Metrics summarizers over from master" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 21:02:02 +0000 (21:02 +0000)]
Merge "DO NOT MERGE Bring Metrics summarizers over from master" into oc-dev

7 years agoMerge "stagefright: put battery update under a separate lock" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 20:54:17 +0000 (20:54 +0000)]
Merge "stagefright: put battery update under a separate lock" into oc-dev

7 years agostagefright: put battery update under a separate lock
Chong Zhang [Thu, 11 May 2017 18:44:56 +0000 (11:44 -0700)]
stagefright: put battery update under a separate lock

Battery update doesn't need to lock the main lock for
mediaplayerservice. Battery update sometimes is called
from lower level componenet (eg. StagefrightRecorder),
locking the main lock here has potential to deadlock.

Puting the battery update in a separate class so that
it's clear this is not to be mixed with the rest of
the mediaplayerservice states.

bug: 38230347
Change-Id: Idf5f26f2b07ad6303775763ce283dad0679843d5

7 years agomedia: Write maker and model information into recorded videos.
Hangyu Kuang [Tue, 11 Apr 2017 20:17:45 +0000 (13:17 -0700)]
media: Write maker and model information into recorded videos.

Bug: 34745604
Test: Camera recording and use isoviewer to look at the metadata
Change-Id: Idb556a0ec38d8a6a797c71b68c46979504d2cb4a

7 years agoCamera: Close acquire fences on failed buffers
Emilian Peev [Thu, 11 May 2017 16:23:41 +0000 (17:23 +0100)]
Camera: Close acquire fences on failed buffers

Buffers that didn't get a chance to be processed
might still hold valid acquire fences. Check and
close those if necessary.

Bug: 38229510
Test: Manual using application
Change-Id: I8e823a655cc30ed966e277ace090e96c64ba1c8c

7 years agoMerge "aaudio: validate audio data format" into oc-dev
Phil Burk [Thu, 11 May 2017 16:47:04 +0000 (16:47 +0000)]
Merge "aaudio:  validate audio data format" into oc-dev

7 years agoaaudio: validate audio data format
Phil Burk [Fri, 5 May 2017 00:16:13 +0000 (17:16 -0700)]
aaudio:  validate audio data format

Also lots of minor cleanup
Fix underscores in some headers
Refactor getTimestamp()

Bug: 34127069
Bug: 38227780
Test: CTS test_aaudio.cpp
Change-Id: I6fdb50eb00a41688df871018ced91d5f5f055f8a
Signed-off-by: Phil Burk <philburk@google.com>
7 years agoCamera: Re-enumarate new providers
Emilian Peev [Thu, 4 May 2017 15:35:48 +0000 (16:35 +0100)]
Camera: Re-enumarate new providers

Camera service should enumarate newly added
camera providers.

Bug: 37592461
Test: Manual using camera application
Change-Id: I4c886b99127d23148c70ce1e1e773cb8393d91b4

7 years agoMerge "VolumeShaper: Fixes for updated Cts test" into oc-dev
Andy Hung [Thu, 11 May 2017 04:24:04 +0000 (04:24 +0000)]
Merge "VolumeShaper: Fixes for updated Cts test" into oc-dev

7 years agoMerge "Fix -Wextra warnings in frameworks/av/include" into oc-dev
Andy Hung [Thu, 11 May 2017 04:04:31 +0000 (04:04 +0000)]
Merge "Fix -Wextra warnings in frameworks/av/include" into oc-dev

7 years agoMerge "ligbaaudio: Fix pause, flush and getXRunCount for input streams." into oc-dev
TreeHugger Robot [Thu, 11 May 2017 00:50:17 +0000 (00:50 +0000)]
Merge "ligbaaudio: Fix pause, flush and getXRunCount for input streams." into oc-dev

7 years agoMerge "aaudio: plug some resource leaks" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 23:14:53 +0000 (23:14 +0000)]
Merge "aaudio: plug some resource leaks" into oc-dev

7 years agoPrevent OOB write in soft_avc encoder
Ray Essick [Wed, 10 May 2017 22:38:51 +0000 (15:38 -0700)]
Prevent OOB write in soft_avc encoder

Soft avc encoder cached buffer sizes across a point where the sizes
could be reset by an app, allowing crafted requests to hit outside
of the current buffer. This remedies that by forcing buffer reallocation
with new sizes whenever the encoder state at such 'reset' points.

Bug: 35421151
Test: run POC with no crash
Change-Id: I8c689846142264f7b6a277332260a6bd8a2bd92d

7 years agoVolumeShaper: Fixes for updated Cts test
Andy Hung [Sat, 6 May 2017 00:33:32 +0000 (17:33 -0700)]
VolumeShaper: Fixes for updated Cts test

1) Limit number of VolumeShapers that can be created.
   a) 16 system VolumeShapers
   b) 16 application/client VolumeShapers
2) Return proper volume before VolumeShaper is started.
3) Consistent xOffset definition used internally:
   a) this is now always the position on the volumeshaper curve
      which can go backwards if in REVERSE.
   b) normalized time is always forward going and is scaled
      to 0.f and 1.f depending on progress relative to
      the curve's duration.
4) Fix replace method.
5) Add comments.

Test: Use updated CTS VolumeShaperTest
Bug: 37536598
Change-Id: I837ab2a481adc0abbd3f1338bfe2cb79831b11fa

7 years agoligbaaudio: Fix pause, flush and getXRunCount for input streams.
Phil Burk [Mon, 8 May 2017 23:36:41 +0000 (16:36 -0700)]
ligbaaudio: Fix pause, flush and getXRunCount for input streams.

Bug: 37941092
Bug: 37943598
Test: input_monitor_callback.cpp

Change-Id: Ifc2ea526e4722063e03956bd5f0747adc49ba6ee
Signed-off-by: Phil Burk <philburk@google.com>
7 years agoMerge "Add null check in setSidebandStream" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 03:15:06 +0000 (03:15 +0000)]
Merge "Add null check in setSidebandStream" into oc-dev

7 years agoMerge "nuplayer: Do not notify EOS when paused" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 01:57:14 +0000 (01:57 +0000)]
Merge "nuplayer: Do not notify EOS when paused" into oc-dev

7 years agoMerge "stagefright: provide consumer usage hint to consumers that request it" into...
TreeHugger Robot [Tue, 9 May 2017 23:36:09 +0000 (23:36 +0000)]
Merge "stagefright: provide consumer usage hint to consumers that request it" into oc-dev

7 years agoMerge "stagefright: do not reconnect surface for tunneled playback" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 23:17:48 +0000 (23:17 +0000)]
Merge "stagefright: do not reconnect surface for tunneled playback" into oc-dev

7 years agonuplayer: Do not notify EOS when paused
Haynes Mathew George [Mon, 13 Jun 2016 18:23:22 +0000 (11:23 -0700)]
nuplayer: Do not notify EOS when paused

Playback switches to next clip if a paused clip is seeked to EOS.
This happens as onDrainAudioQueue is allowed to fill buffer
when paused. During drain, EOS is notified even during paused state
and playback switches to next clip.

Avoid notifying EOS when paused.

authored-by: Chaithanya Krishna Bacharaju <chaithan@codeaurora.org>
Test: run mediaplayer
Bug: 38022556
Change-Id: I8261219615f4ce726e03d02b0cb3e71889a711d0
(cherry picked from commit b99e3649f468015f5156e71d02b11c2e2c236c58)

7 years agoAdd null check in setSidebandStream
Robert Shih [Tue, 9 May 2017 21:29:26 +0000 (14:29 -0700)]
Add null check in setSidebandStream

Bug: 38172844
Change-Id: I5d9a6b4c84b4c4cf9f5c9b1634a9cd35797c09b2

7 years agostagefright: lock mLock in codecBufferFilled
Chong Zhang [Tue, 9 May 2017 02:57:28 +0000 (19:57 -0700)]
stagefright: lock mLock in codecBufferFilled

The locking is to protect mOriginalTimeUs, adding to which is done
in emptyBuffer under mLock.

bug: 38111548
Change-Id: If7853e3fe50c68279ee5d74373b53bc34bd56cfd

7 years agoFix resource leaks in drm hal
Jeff Tinker [Tue, 9 May 2017 02:25:57 +0000 (19:25 -0700)]
Fix resource leaks in drm hal

bug:36408047
test: manual testing to verify leaks are fixed
Change-Id: I3ade65eff4bbe8603fe4cf04b00ab1f3e1122f90

7 years agoMerge "camera: Clarify ZSL supports" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 22:28:29 +0000 (22:28 +0000)]
Merge "camera: Clarify ZSL supports" into oc-dev