OSDN Git Service

android-x86/frameworks-av.git
6 years agoaaudio: deleted FifoBuffers to fix memory leak
Phil Burk [Wed, 9 Aug 2017 23:53:35 +0000 (16:53 -0700)]
aaudio: deleted FifoBuffers to fix memory leak

Bug: 64522125
Test: adb shell dumpsys media.audio_flinger --unreachable
Change-Id: I6045f951b4d793f31cac73e793258e168f74f3f2

6 years agoMerge "stagefright: MetadataRetriever API to specify mime and color format" into...
TreeHugger Robot [Wed, 9 Aug 2017 07:13:34 +0000 (07:13 +0000)]
Merge "stagefright: MetadataRetriever API to specify mime and color format" into oc-mr1-dev

6 years agoMerge "mtp: Send events async." into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 02:48:05 +0000 (02:48 +0000)]
Merge "mtp: Send events async." into oc-mr1-dev

6 years agoMerge "Add 'dash' as a compatible brand" into oc-dr1-dev
Marco Nelissen [Wed, 9 Aug 2017 01:35:35 +0000 (01:35 +0000)]
Merge "Add 'dash' as a compatible brand" into oc-dr1-dev
am: 5d6cc7d118

Change-Id: I312e265e479c44fb569614ccf77c34ceb9bf174c

6 years agoMerge "Add 'dash' as a compatible brand" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 01:19:51 +0000 (01:19 +0000)]
Merge "Add 'dash' as a compatible brand" into oc-dr1-dev

6 years agoMerge "Fix failure to check HIDL return status" into oc-dr1-dev
Jeff Tinker [Wed, 9 Aug 2017 01:09:05 +0000 (01:09 +0000)]
Merge "Fix failure to check HIDL return status" into oc-dr1-dev
am: 3373ab6abe

Change-Id: Idb5225d222ef732b4bdd43896e81bc0b20f7dc8a

6 years agoMerge "Fix failure to check HIDL return status" into oc-dr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 00:53:27 +0000 (00:53 +0000)]
Merge "Fix failure to check HIDL return status" into oc-dr1-dev

6 years agostagefright: MetadataRetriever API to specify mime and color format
Chong Zhang [Wed, 26 Jul 2017 23:25:28 +0000 (16:25 -0700)]
stagefright: MetadataRetriever API to specify mime and color format

- Allow setDataSource() to specify mime. In case of HEIF decoding
  request from skia, we don't want to sniff any other format other
  than mp4.

- Allow getFrameAtTime() to specify dst color format.

bug: 64077740

Test: cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice

Change-Id: I471f41c28a2252417c4b3331dcfd4bd00a24408a

6 years agoMerge "audioflinger: prevent crash in MmapThreadHandle destructor" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 23:24:32 +0000 (23:24 +0000)]
Merge "audioflinger: prevent crash in MmapThreadHandle destructor" into oc-mr1-dev

6 years agoMerge "Camera: Add more systrace points" into oc-mr1-dev
Eino-Ville Talvala [Tue, 8 Aug 2017 23:16:57 +0000 (23:16 +0000)]
Merge "Camera: Add more systrace points" into oc-mr1-dev

6 years agoMerge "Camera: update ndk docs" into oc-dev am: 6bc3288dab
Yin-Chia Yeh [Tue, 8 Aug 2017 23:12:56 +0000 (23:12 +0000)]
Merge "Camera: update ndk docs" into oc-dev am: 6bc3288dab
am: 83aa87633d

Change-Id: I320ea00efc0cd8435784c96aa94b293dea299fc5

6 years agoMerge "Camera: update ndk docs" into oc-dev
Yin-Chia Yeh [Tue, 8 Aug 2017 23:08:39 +0000 (23:08 +0000)]
Merge "Camera: update ndk docs" into oc-dev
am: 6bc3288dab

Change-Id: Ic1040690a50c410e9e38b536154af95fe1999a17

6 years agoMerge "Camera: update ndk docs" into oc-dev
TreeHugger Robot [Tue, 8 Aug 2017 22:54:06 +0000 (22:54 +0000)]
Merge "Camera: update ndk docs" into oc-dev

6 years agoAdd '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

6 years agoMerge "Fix double fd close in SharedMemoryParcelable." into oc-dr1-dev
Ruben Brunk [Tue, 8 Aug 2017 19:43:10 +0000 (19:43 +0000)]
Merge "Fix double fd close in SharedMemoryParcelable." into oc-dr1-dev
am: f5095b3373

Change-Id: I5e27c40c343717c81361410890924a7240c3272b

6 years agoMerge "Fix double fd close in SharedMemoryParcelable." into oc-dr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 19:36:45 +0000 (19:36 +0000)]
Merge "Fix double fd close in SharedMemoryParcelable." into oc-dr1-dev

6 years agoCamera: Add more systrace points
Eino-Ville Talvala [Tue, 8 Aug 2017 00:40:49 +0000 (17:40 -0700)]
Camera: Add more systrace points

Try to cover all methods that acquire locks, so that it's easier to
tell what function might be holding one and slowing down others

Test: Manual use of camera app
Bug: 63950311
Change-Id: Ib81b348bd274598a422c0138d9ebbad65aeff922

6 years agoFix double fd close in SharedMemoryParcelable.
Ruben Brunk [Tue, 8 Aug 2017 02:19:42 +0000 (19:19 -0700)]
Fix double fd close in SharedMemoryParcelable.

Bug: 64311216

Test: Checked that close() does not return EBADF.
Change-Id: Ia98c37d749dd3a6f22708657e8c7c346a9c0c5a4

6 years agoMerge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 16:53:12 +0000 (16:53 +0000)]
Merge "Mark the module as VNDK or VNDK-SP in Android.bp" into oc-mr1-dev

6 years agoMerge "aaudio: stop buzzing when MMAP stream disconnected" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 00:57:35 +0000 (00:57 +0000)]
Merge "aaudio: stop buzzing when MMAP stream disconnected" into oc-mr1-dev

6 years agoMerge "APM: cap earpiece voice in call by voice volume" into oc-dr1-dev
Jean-Michel Trivi [Tue, 8 Aug 2017 00:23:55 +0000 (00:23 +0000)]
Merge "APM: cap earpiece voice in call by voice volume" into oc-dr1-dev
am: a7a28931f1

Change-Id: Id1c78125fdb8c0b7cdf0352d59661aa8e02d7664

6 years agoMerge "APM: cap earpiece voice in call by voice volume" into oc-dr1-dev
Jean-Michel Trivi [Tue, 8 Aug 2017 00:15:21 +0000 (00:15 +0000)]
Merge "APM: cap earpiece voice in call by voice volume" into oc-dr1-dev

6 years agoMerge "aaudio: restore _get and _setSamplesPerFrame()" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 23:43:44 +0000 (23:43 +0000)]
Merge "aaudio: restore _get and _setSamplesPerFrame()" into oc-mr1-dev

6 years agoMerge "stagefright: misc preliminary fixes for HEIF support" into oc-mr1-dev
TreeHugger Robot [Mon, 7 Aug 2017 23:41:07 +0000 (23:41 +0000)]
Merge "stagefright: misc preliminary fixes for HEIF support" into oc-mr1-dev

6 years agoFix failure to check HIDL return status
Jeff Tinker [Mon, 7 Aug 2017 22:58:41 +0000 (15:58 -0700)]
Fix failure to check HIDL return status

HIDL transaction status wasn't being checked
resulting in a SIGABRT from createPlugin when the
remote process dies.

bug: 64441780
test: run Play Movies and repeat killing
  android.hardware.drm@1.0-service.widevine, check
  log for transaction failed messages.

Change-Id: I0ea70578d60bb84cf693f158963181781d7e35c3

6 years agoaaudio: stop buzzing when MMAP stream disconnected
Phil Burk [Mon, 7 Aug 2017 19:30:44 +0000 (12:30 -0700)]
aaudio: stop buzzing when MMAP stream disconnected

When a stream is disconnected, clear the MMAP memory
buffer to prevent the hardware from looping on stale data
and making a buzzing sound.

Bug: 63342351
Test: play GStomper with AAudio through headphones and then unplug them
Change-Id: I6372b0a031dea242e3830cc2d226a4c043d4467e

6 years agoaaudio: restore _get and _setSamplesPerFrame()
Phil Burk [Thu, 3 Aug 2017 22:25:43 +0000 (15:25 -0700)]
aaudio: restore _get and _setSamplesPerFrame()

This restores some deprecated functions that some released apps
were calling. Restored:

    AAudioStreamBuilder_setSamplesPerFrame()
    AAudioStream_getSamplesPerFrame()

Bug: 64346279
Test: put GStomper in AAudio mode using its Settings on Marlin
Change-Id: I2749a06cded9fc3863d233713efda2674cf7f5e3

6 years agomtp: Send events async.
Jerry Zhang [Wed, 26 Jul 2017 18:37:23 +0000 (11:37 -0700)]
mtp: Send events async.

AFT will not read the events endpoint at all
causing every sendEvent() to block. Since
event ordering doesn't really matter, send
events in their own detached thread instead.

Bug: 36802721
Test: Connect AFT, create a folder from device, check not frozen
Change-Id: I4b8aee93c19fa9c73e6b2f34d9794a491b2433e1

6 years agoAPM: cap earpiece voice in call by voice volume
Jean-Michel Trivi [Sat, 5 Aug 2017 20:51:35 +0000 (13:51 -0700)]
APM: cap earpiece voice in call by voice volume

The volume curves between AUDIO_STREAM_VOICE_CALL and other streams
  used during a call on AUDIO_DEVICE_OUT_EARPIECE can vary greatly,
  particularly when the volume curve is used to tune the voice signal
  going to earpiece, not just to select a desired curve shape.
This can be problematic during a call as a sound playing on a different
  stream may be assigned a much louder attenuation value than that
  of voice.
The fix consists in comparing the attenuation computed for earpiece
  to the one for VOICE_CALL, and using the lowest value (with a 3dB
  headroom).

Test: see bug
Bug: 63395386
Bug: 63976807
Bug: 38194285

Change-Id: Ia55e05e2a1d6fc55d45147f4234b693a905714cc

6 years agoMark the module as VNDK or VNDK-SP in Android.bp
Justin Yun [Mon, 24 Jul 2017 06:19:44 +0000 (15:19 +0900)]
Mark the module as VNDK or VNDK-SP in Android.bp

As a VNDK/VNDK-SP module, Android.bp must have 'vndk' tag as well
as 'vendor_available: true'.

For a VNDK module, the 'vndk' tag has 'enabled: true'.
It will be installed system/lib(64)/vndk as a vendor variant.

For a VNDK-SP module, the 'vndk' tag has
'support_system_process: true' as well as 'enabled: true'.
It will be installed system/lib(64)/vndk-sp as a vendor variant.

Bug: 63866913
Test: build and boot with BOARD_VNDK_VERSION=current
Change-Id: Iee7f2e14fea4635a64c4e5c5bb50f5d7e2691682

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Sat, 5 Aug 2017 00:31:00 +0000 (00:31 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours am: 8d68455f69  -s ours am: 369ad623bc  -s ours am: 920df6ca00  -s ours am: e21ab964c1  -s ours am: 4566e87270  -s ours am: 6d719ca88c  -s ours am: d6fba171b7  -s ours am: 8158fccafd  -s ours
am: 4c32e865d3  -s ours

Change-Id: If8f41b16e82632d013ea3031e7a22fc54d432d96

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Sat, 5 Aug 2017 00:20:01 +0000 (00:20 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours am: 8d68455f69  -s ours am: 369ad623bc  -s ours am: 920df6ca00  -s ours am: e21ab964c1  -s ours am: 4566e87270  -s ours am: 6d719ca88c  -s ours am: d6fba171b7  -s ours
am: 8158fccafd  -s ours

Change-Id: I017348bc4d68b70a552ad84af9ee7737104f870e

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Sat, 5 Aug 2017 00:08:22 +0000 (00:08 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours am: 8d68455f69  -s ours am: 369ad623bc  -s ours am: 920df6ca00  -s ours am: e21ab964c1  -s ours am: 4566e87270  -s ours am: 6d719ca88c  -s ours
am: d6fba171b7  -s ours

Change-Id: Ifee67b445e6fab32765f0ce0af27c61bffed788a

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Sat, 5 Aug 2017 00:00:45 +0000 (00:00 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours am: 8d68455f69  -s ours am: 369ad623bc  -s ours am: 920df6ca00  -s ours am: e21ab964c1  -s ours am: 4566e87270  -s ours
am: 6d719ca88c  -s ours

Change-Id: Ifff5a4a9be545f1d77bb9af78fed93c7336560b5

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:49:18 +0000 (23:49 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours am: 8d68455f69  -s ours am: 369ad623bc  -s ours am: 920df6ca00  -s ours am: e21ab964c1  -s ours
am: 4566e87270  -s ours

Change-Id: Idfc95e3dca8c4115daf8d88cbc631d13fbf21fae

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:40:18 +0000 (23:40 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours am: 8d68455f69  -s ours am: 369ad623bc  -s ours am: 920df6ca00  -s ours
am: e21ab964c1  -s ours

Change-Id: I00ac4a069a160f16600d081e2be3e97f7513a92f

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:34:15 +0000 (23:34 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours am: 8d68455f69  -s ours am: 369ad623bc  -s ours
am: 920df6ca00  -s ours

Change-Id: Ic6d99e347dc5e7230827b9aa0a360e23c17ab881

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours am: 8d68455f69  -s ours
am: 369ad623bc  -s ours

Change-Id: If89325cfb1e4ab00a3c87901d1d6c44d0e6c321c

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:21:45 +0000 (23:21 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours am: 0a78268055  -s ours
am: 8d68455f69  -s ours

Change-Id: I0d67f4871aea0df136ef7e26bfb7e7b9d0eadfc1

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:15:46 +0000 (23:15 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours am: 84b2e0717c  -s ours
am: 0a78268055  -s ours

Change-Id: Ifedba1a55e58651c9f4f93864ad52b8bf1f78461

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:10:13 +0000 (23:10 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303 am: 6d050827c3  -s ours
am: 84b2e0717c  -s ours

Change-Id: Ib5f483ddb67d18c95c720088f9b0ed1c64b65979

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e am: ff9e1b0303
am: 6d050827c3  -s ours

Change-Id: I192b34239fc52c5532a0ea4ce71fc110639d462f

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d am: 222dca470e
am: ff9e1b0303

Change-Id: I57d1b50eea3a31fae57bd20f856a0ebc53e73357

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199...
Marco Nelissen [Fri, 4 Aug 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199 am: 87f1a3041d
am: 222dca470e

Change-Id: Icd722065f9256e7afec3e3d7f53c2aa5340856d8

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199
Marco Nelissen [Fri, 4 Aug 2017 22:45:10 +0000 (22:45 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef am: f233415199
am: 87f1a3041d

Change-Id: I8fc2acbf9bbddbc4a401f51595752351c06acc79

6 years agoMerge "Skip track if verification fails" into klp-dev am: ab2c5046ef
Marco Nelissen [Fri, 4 Aug 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Skip track if verification fails" into klp-dev am: ab2c5046ef
am: f233415199

Change-Id: I93a9b7b1f48953ec52d6c0f23e3141ddf6dc30f3

6 years agoMerge "Skip track if verification fails" into klp-dev
Marco Nelissen [Fri, 4 Aug 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Skip track if verification fails" into klp-dev
am: ab2c5046ef

Change-Id: Ica76922fc399fe0e5b6af23d613a2f6e5bc7820b

6 years agoMerge "Skip track if verification fails" into klp-dev
TreeHugger Robot [Fri, 4 Aug 2017 22:28:18 +0000 (22:28 +0000)]
Merge "Skip track if verification fails" into klp-dev

6 years agoSkip track if verification fails
Marco Nelissen [Tue, 18 Jul 2017 21:57:11 +0000 (14:57 -0700)]
Skip track if verification fails

Bug: 62187433
Test: ran poc, CTS
Merged-In: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c
Change-Id: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c

6 years agoMerge "Fix failure to check HIDL return status" into oc-dr1-dev
Jeff Tinker [Fri, 4 Aug 2017 17:19:45 +0000 (17:19 +0000)]
Merge "Fix failure to check HIDL return status" into oc-dr1-dev
am: ddef08e725  -s ours

Change-Id: Icc116355d763a19170145cc4131481ffd77ecaf3

6 years agoMerge "Fix failure to check HIDL return status" into oc-dr1-dev
Jeff Tinker [Fri, 4 Aug 2017 17:14:46 +0000 (17:14 +0000)]
Merge "Fix failure to check HIDL return status" into oc-dr1-dev

6 years agoMerge "aaudio: improve error logging" into oc-mr1-dev
TreeHugger Robot [Fri, 4 Aug 2017 16:43:52 +0000 (16:43 +0000)]
Merge "aaudio: improve error logging" into oc-mr1-dev

6 years agoCamera: update ndk docs
Yin-Chia Yeh [Fri, 4 Aug 2017 00:56:38 +0000 (17:56 -0700)]
Camera: update ndk docs

Test: build (doc only update)
Bug: 64304111

Change-Id: I931f760d616bf3424ed00adb0e246592bbabe9bb

6 years agoMerge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc...
Zhijun He [Fri, 4 Aug 2017 01:46:14 +0000 (01:46 +0000)]
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev
am: dcca7ebd8b

Change-Id: Iaa6232308cbca7ebb61d43c76df9e15e6ef19b1c

6 years agoMerge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc...
Zhijun He [Fri, 4 Aug 2017 01:38:28 +0000 (01:38 +0000)]
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev

6 years agoRevert "media: Increase the maximum ctts offset to be 2 seconds."
Zhijun He [Fri, 4 Aug 2017 00:57:35 +0000 (17:57 -0700)]
Revert "media: Increase the maximum ctts offset to be 2 seconds."

This reverts commit 414708370eeb5379c1ec869455ede9e086dc8ef4.

The original CL caused video timestamp bug.

Bug: 64357813
Change-Id: I5171ef7287fe8db063949f5bfff305c6c3ae20b7

6 years agoMerge "AudioTrackShared: Log more detail on fatal errors" into oc-dr1-dev
Andy Hung [Fri, 4 Aug 2017 00:58:40 +0000 (00:58 +0000)]
Merge "AudioTrackShared: Log more detail on fatal errors" into oc-dr1-dev
am: c8adbea083

Change-Id: I6e183fe47b885c94b632335da5cc6727e972c3e0

6 years agoMerge "AudioTrackShared: Log more detail on fatal errors" into oc-dr1-dev
Andy Hung [Fri, 4 Aug 2017 00:47:25 +0000 (00:47 +0000)]
Merge "AudioTrackShared: Log more detail on fatal errors" into oc-dr1-dev

6 years agoMerge "Fix failure to check HIDL return status" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 23:07:41 +0000 (23:07 +0000)]
Merge "Fix failure to check HIDL return status" into oc-mr1-dev

6 years agoaudioflinger: prevent crash in MmapThreadHandle destructor
Phil Burk [Thu, 3 Aug 2017 19:02:00 +0000 (12:02 -0700)]
audioflinger: prevent crash in MmapThreadHandle destructor

The mThread smart pointer was getting cleared while the
thread was still in use.

Bug: 64316921
Test: use input_monitor.cpp, see bug for repro steps
Change-Id: I46095b4e67648208a2fb979696fc2d655432448b

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70...
Dongwon Kang [Thu, 3 Aug 2017 21:59:29 +0000 (21:59 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c am: 8dd4d58d28 am: 7e9fe019ff am: 58db80184a am: 064c64340a am: 3996238b97 am: a164342ccc am: b579ff3a0e
am: d0538c82ea

Change-Id: I5c36b400f75ffe46d44b8c77991bd22c370f986b

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70...
Dongwon Kang [Thu, 3 Aug 2017 21:48:18 +0000 (21:48 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c am: 8dd4d58d28 am: 7e9fe019ff am: 58db80184a am: 064c64340a am: 3996238b97 am: a164342ccc
am: b579ff3a0e

Change-Id: I4acef1155296c82ce7e582aa7c8b6de1dcea3e72

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 21:35:58 +0000 (21:35 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f am: fa7be9da95 am: b31373e62c am: 2df7cd6571 am: 64e7c6089f am: 739585fb8d am: a3df50b011 am: 189c8ca25f am: 72eca8ab5a
am: d31c726b72

Change-Id: Id25ae65ea5f2c89672327f178658b3a40637744f

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70...
Dongwon Kang [Thu, 3 Aug 2017 21:35:56 +0000 (21:35 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c am: 8dd4d58d28 am: 7e9fe019ff am: 58db80184a am: 064c64340a am: 3996238b97
am: a164342ccc

Change-Id: I7f61bf6b993e82acb7107b97f5da1c7ec91aa8a3

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 21:31:27 +0000 (21:31 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f am: fa7be9da95 am: b31373e62c am: 2df7cd6571 am: 64e7c6089f am: 739585fb8d am: a3df50b011 am: 189c8ca25f
am: 72eca8ab5a

Change-Id: I6f7ad02307b203c462ff00b0ab534dc1c696e0de

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70...
Dongwon Kang [Thu, 3 Aug 2017 21:31:26 +0000 (21:31 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c am: 8dd4d58d28 am: 7e9fe019ff am: 58db80184a am: 064c64340a
am: 3996238b97

Change-Id: Ia35b0f602f3d002df244b2baec8fb72ebb4280f3

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 21:24:56 +0000 (21:24 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f am: fa7be9da95 am: b31373e62c am: 2df7cd6571 am: 64e7c6089f am: 739585fb8d am: a3df50b011
am: 189c8ca25f

Change-Id: I90d4a5f82a27f1ad19af965b04576b3837910b58

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70...
Dongwon Kang [Thu, 3 Aug 2017 21:24:54 +0000 (21:24 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c am: 8dd4d58d28 am: 7e9fe019ff am: 58db80184a
am: 064c64340a

Change-Id: Ie0b3d067a3039215b6678baa4ba22248e16c0582

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70...
Dongwon Kang [Thu, 3 Aug 2017 21:19:24 +0000 (21:19 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c am: 8dd4d58d28 am: 7e9fe019ff
am: 58db80184a

Change-Id: Ib156d3acbe9ebdd1407ad5896b3ece25f6c9a9ea

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 21:19:24 +0000 (21:19 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f am: fa7be9da95 am: b31373e62c am: 2df7cd6571 am: 64e7c6089f am: 739585fb8d
am: a3df50b011

Change-Id: I014932315c3b489fc23b9fe50949cbfc8f680c83

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d...
Dongwon Kang [Thu, 3 Aug 2017 21:15:00 +0000 (21:15 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9 am: 5b6106b02e am: 995ffd91a4 am: 464af3dc2e am: e7aba4ca81 am: 962ea2d280 am: 852e902636 am: 3a8976ce36
am: 168cbf6cab

Change-Id: Id59a53dbb3f917b047de090e19ec840c2c4c272b

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70...
Dongwon Kang [Thu, 3 Aug 2017 21:14:54 +0000 (21:14 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c am: 8dd4d58d28
am: 7e9fe019ff

Change-Id: I89c184722d4c937b0ea99204fe11bcd5a1f170af

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 21:14:54 +0000 (21:14 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f am: fa7be9da95 am: b31373e62c am: 2df7cd6571 am: 64e7c6089f
am: 739585fb8d

Change-Id: I5d72f60baaed58bf9deaaefc8b3a607de9a04e11

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70...
Dongwon Kang [Thu, 3 Aug 2017 21:08:52 +0000 (21:08 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70 am: 20ff47b39c
am: 8dd4d58d28

Change-Id: Ie7d200d4c74a91ce8f4a7c8d4e91ff71d0d1d12e

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d...
Dongwon Kang [Thu, 3 Aug 2017 21:08:52 +0000 (21:08 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9 am: 5b6106b02e am: 995ffd91a4 am: 464af3dc2e am: e7aba4ca81 am: 962ea2d280 am: 852e902636
am: 3a8976ce36

Change-Id: I1d4ed7d11aac63e93a69d70eb6093e984165d2a5

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 21:08:24 +0000 (21:08 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f am: fa7be9da95 am: b31373e62c am: 2df7cd6571
am: 64e7c6089f

Change-Id: I08e269ad2cc21c8411d79b8ca4901aa1c9cce580

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d...
Dongwon Kang [Thu, 3 Aug 2017 21:03:23 +0000 (21:03 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9 am: 5b6106b02e am: 995ffd91a4 am: 464af3dc2e am: e7aba4ca81 am: 962ea2d280
am: 852e902636

Change-Id: I730b14907f8544b361bb0f7f7bc608d953494f81

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 21:03:22 +0000 (21:03 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f am: fa7be9da95 am: b31373e62c
am: 2df7cd6571

Change-Id: Idf2a4fa0b847e8ef6fefdb55fc4fc11d5fcde342

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70
Dongwon Kang [Thu, 3 Aug 2017 21:03:21 +0000 (21:03 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56 am: 73c41f9d70
am: 20ff47b39c

Change-Id: I75981256fe8a29ff53e6018064d705ec6d1be71e

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d...
Dongwon Kang [Thu, 3 Aug 2017 20:57:24 +0000 (20:57 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9 am: 5b6106b02e am: 995ffd91a4 am: 464af3dc2e am: e7aba4ca81
am: 962ea2d280

Change-Id: Ifc1b1f4bf3fb547e0ef56d771eb462afaf8487ac

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 20:57:24 +0000 (20:57 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f am: fa7be9da95
am: b31373e62c

Change-Id: I4266df6693d6f6e261e5959f8006f658be57d656

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56
Dongwon Kang [Thu, 3 Aug 2017 20:57:21 +0000 (20:57 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev am: a7a43d9b56
am: 73c41f9d70

Change-Id: I12556bc1f16c13abfe7018a9c21258c73e46c7a0

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 20:51:21 +0000 (20:51 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
am: a7a43d9b56

Change-Id: If7a317b2a9de1daaafb83aeb466c52ef494b972d

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d...
Dongwon Kang [Thu, 3 Aug 2017 20:51:21 +0000 (20:51 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9 am: 5b6106b02e am: 995ffd91a4 am: 464af3dc2e
am: e7aba4ca81

Change-Id: Id20d06c65ff8ee2a223591182f34253cfe932bc3

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 20:51:20 +0000 (20:51 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e am: 218692ec4f
am: fa7be9da95

Change-Id: Icc90b2c750e5d75697579cb98532d0667280dced

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am...
Wei Jia [Thu, 3 Aug 2017 20:45:52 +0000 (20:45 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60 am: 067ab2f74e
am: 218692ec4f

Change-Id: I5abf7e89e0476f46492ca3166ff2245d70e87068

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d...
Dongwon Kang [Thu, 3 Aug 2017 20:45:51 +0000 (20:45 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9 am: 5b6106b02e am: 995ffd91a4
am: 464af3dc2e

Change-Id: Ia1cd21978199447253de057599b26c8d187d31cf

6 years agoMerge "Fix memory leak in OggExtractor" into mnc-dev
TreeHugger Robot [Thu, 3 Aug 2017 20:44:43 +0000 (20:44 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d...
Dongwon Kang [Thu, 3 Aug 2017 20:39:51 +0000 (20:39 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9 am: 5b6106b02e
am: 995ffd91a4

Change-Id: If56ea7ccce2d7689a2dd674f04ab303f4aed2226

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60
Wei Jia [Thu, 3 Aug 2017 20:39:50 +0000 (20:39 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d am: bbc5c8fc60
am: 067ab2f74e

Change-Id: Id86327d63b5b8aa3edc62b7e6c15689b6ef4afa7

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d...
Dongwon Kang [Thu, 3 Aug 2017 20:34:20 +0000 (20:34 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d am: 3b8c1df6e9
am: 5b6106b02e

Change-Id: I4dbc87895ab8bb7ac44c8f8a1c82efeee73786d1

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d
Wei Jia [Thu, 3 Aug 2017 20:34:20 +0000 (20:34 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376 am: 96114e7c5d
am: bbc5c8fc60

Change-Id: I0844a8bac332664d4d8e668257c470b0a89addfe

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d
Dongwon Kang [Thu, 3 Aug 2017 20:27:49 +0000 (20:27 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5 am: 1e3070e56d
am: 3b8c1df6e9

Change-Id: I73dc7e47baecddf4d9df119b324aad3fe0bbf144

6 years agoMPEG4Source: fix fragmented read. am: 6b401a3376
Wei Jia [Thu, 3 Aug 2017 20:27:48 +0000 (20:27 +0000)]
MPEG4Source: fix fragmented read. am: 6b401a3376
am: 96114e7c5d

Change-Id: I8616480a004aa44e947939db7e5b8cce1b7ec72a

6 years agoMPEG4Source: fix fragmented read.
Wei Jia [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
MPEG4Source: fix fragmented read.
am: 6b401a3376

Change-Id: I14b767357500d6680379c34ad74efdab1d7bb6ee

6 years agoMerge "Skip track if verification fails" into mnc-dev am: 6168d8eba5
Dongwon Kang [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
Merge "Skip track if verification fails" into mnc-dev am: 6168d8eba5
am: 1e3070e56d

Change-Id: Iefa80b90d92ab9f14364eeb77b5cb2608f919496

6 years agoMerge "Skip track if verification fails" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 20:15:18 +0000 (20:15 +0000)]
Merge "Skip track if verification fails" into mnc-dev
am: 6168d8eba5

Change-Id: Ic098164694aaea4a455e95f5fe4e662bfa832ce7

6 years agoMerge "Skip track if verification fails" into mnc-dev
Dongwon Kang [Thu, 3 Aug 2017 19:58:37 +0000 (19:58 +0000)]
Merge "Skip track if verification fails" into mnc-dev

6 years agoFix failure to check HIDL return status
Jeff Tinker [Wed, 26 Jul 2017 22:44:33 +0000 (15:44 -0700)]
Fix failure to check HIDL return status

Test: run Play Movies and repeat killing
  android.hardware.drm@1.0-service.widevine, check
  log for transaction failed messages.  This uncovered
  a related problem in closeSession which is also fixed
  in this CL.

bug: 64022042
Change-Id: I4e86414aa1625c35689339389391e9fa6d377b1c
Merged-In: I4e86414aa1625c35689339389391e9fa6d377b1c

6 years agoFix failure to check HIDL return status
Jeff Tinker [Wed, 26 Jul 2017 22:44:33 +0000 (15:44 -0700)]
Fix failure to check HIDL return status

Test: run Play Movies and repeat killing
  android.hardware.drm@1.0-service.widevine, check
  log for transaction failed messages.  This uncovered
  a related problem in closeSession which is also fixed
  in this CL.

bug: 64022042
Change-Id: I4e86414aa1625c35689339389391e9fa6d377b1c