OSDN Git Service
Phil Burk [Fri, 1 Sep 2017 00:24:51 +0000 (17:24 -0700)]
aaudio: fix timestamps and underruns
Start the client after we get valid timing data from the server.
That can take a while because of the long cold start times.
The client is synced with the current position of the service.
Now the client can start clean with no underruns.
Bug:
63918065
Test: test_timestamps.cpp
Change-Id: I5d01eb844e4b14cd5477d56ea1dd9e309abc1c52
Phil Burk [Wed, 30 Aug 2017 16:29:48 +0000 (09:29 -0700)]
aaudio: prevent retrograde motion in Legacy timestamps
Use MonotonicCounter for timestamp position.
Bug:
63918065
Test: write_sine_callback.cpp and test_timestamps.cpp
Change-Id: Iea58384e2d96adcfad586e8c522024baaecccb8c
Phil Burk [Tue, 29 Aug 2017 16:04:35 +0000 (09:04 -0700)]
aaudio example: print timestamps during callbacks.
Bug:
63918065
Test: this is a test
Change-Id: Id25dd36764761583986d3ce29f7d82032ec4539f
Phil Burk [Fri, 1 Sep 2017 00:23:18 +0000 (17:23 -0700)]
aaudio: test timestamps
Run for a while, gathering timestamps
then print a report.
Bug:
63918065
Test: this is a test
Change-Id: Ie9ada2d22fc265247a4d6c9645e42cf94caa1c05
Phil Burk [Tue, 5 Sep 2017 16:12:15 +0000 (16:12 +0000)]
Merge "audioflinger: pass return code up from startClient" into oc-mr1-dev
Phil Burk [Fri, 1 Sep 2017 17:45:41 +0000 (10:45 -0700)]
audioflinger: pass return code up from startClient
Was ignoring failed start.
Bug:
65262790
Test: see bug
Change-Id: I0b1d19adfd50d2b00d86bb82f278b720fcbacdb1
TreeHugger Robot [Fri, 1 Sep 2017 22:55:42 +0000 (22:55 +0000)]
Merge "aaudio examples: handle disconnect in write_sine_callback" into oc-mr1-dev
Ray Essick [Fri, 1 Sep 2017 22:33:59 +0000 (22:33 +0000)]
Merge "Improve summarized statistics" into oc-mr1-dev
Ray Essick [Fri, 1 Sep 2017 22:29:10 +0000 (22:29 +0000)]
Merge "track pkgname/version in media.metrics" into oc-mr1-dev
Lajos Molnar [Fri, 1 Sep 2017 20:59:12 +0000 (20:59 +0000)]
Merge "stagefright: disable B-frames" into oc-mr1-dev
Phil Burk [Mon, 10 Jul 2017 18:53:09 +0000 (11:53 -0700)]
aaudio examples: handle disconnect in write_sine_callback
Automatically reopen the stream if we get disconnected.
Add a futex based signaling class so that the error callback can
immediately inform a waiting thread.
This can be used to prevent the system from playing an unpleasant sound
after the stream is disconnected.
Bug:
63342351
Test: plug and unplug headphones while running write_sine_callback
Change-Id: I3ea4fb24106156a29d2f302f3eb614f25f1b758a
Mikhail Naganov [Fri, 1 Sep 2017 17:30:56 +0000 (17:30 +0000)]
Merge "audio effects: Eliminate the cause warning logs about unreleased interface" into oc-mr1-dev
Lajos Molnar [Fri, 1 Sep 2017 01:43:51 +0000 (18:43 -0700)]
stagefright: disable B-frames
We cannot guarantee finalizing .mp4 files that contain B-frames,
so disable them.
Bug:
64949961
Change-Id: Ie2672881485576b19daf9f4cf369568410093b9e
Edwin Wong [Thu, 31 Aug 2017 20:51:36 +0000 (20:51 +0000)]
Merge "Fix ClearKey Drm base64 en/decoding to use base64url." into oc-mr1-dev
Ray Essick [Thu, 31 Aug 2017 18:45:05 +0000 (11:45 -0700)]
Improve summarized statistics
better management of how summarized records are managed.
Use differentiated names for the summations to avoid confusion with
individual records. Track values appropriate to calculating
min, max, mean, and standard deviation.
Bug:
65027360
Test: examination of dumpsys media.metrics -summary
Change-Id: I40d93d8a5a7cc2c188546574f59d557088d9c1e3
Ray Essick [Thu, 31 Aug 2017 18:41:19 +0000 (11:41 -0700)]
track pkgname/version in media.metrics
Enhances the media.metrics subsystem to track the pkg name & version
so analysis can move from "error rate has climbed" to "error rate has
climbed within app X".
Changes include fields to hold package name/version, the dump protocol
to emit those fields to upload, and better management of metrics data on
device (time and quantity).
Bug:
65027506
Test: review output of dumpsys media.metrics
Change-Id: Ia55b859d903835c84f7d43883f959dc1cdefb081
Jean-Michel Trivi [Thu, 31 Aug 2017 16:59:20 +0000 (16:59 +0000)]
Merge "APM: invert priority of sonification and enforced routing strategies" into oc-mr1-dev
Mikhail Naganov [Thu, 20 Jul 2017 00:54:29 +0000 (17:54 -0700)]
audio effects: Eliminate the cause warning logs about unreleased interface
The cause of frequent "EffectModule 0xxx destructor called with unreleased
interface" messages was due to not releasing the effects when purging
stale effects.
The cause of "Effect handle 0xxx disconnected after thread destruction"
message was due to late binder call for disconnecting already purged
effect handle.
Also improved logging to communicate uuids of the effects causing
these issues.
Bug:
62267926
Test: no aforementioned warnings in the log when opening the Effects
panel in Play Music
Change-Id: I6ec6f60c46dc704226931fb59a641e4cd74c2fd1
(cherry picked from commit
424c4f5b76a6ed11f2c713b42246a7220cfbb240)
TreeHugger Robot [Thu, 31 Aug 2017 04:10:48 +0000 (04:10 +0000)]
Merge "Set output volume for routing device in startSource()" into oc-mr1-dev
Jean-Michel Trivi [Thu, 31 Aug 2017 01:07:06 +0000 (18:07 -0700)]
APM: invert priority of sonification and enforced routing strategies
On device where the SONIFICATION (alarm, ringtone) strategy is
supported by SPEAKER_SAFE, prevent switching output devices
when the ENFORCED_AUDIBLE (shutter sound) strategy starts
by having SONIFICATION at a higher priority than
ENFORCED_AUDIBLE.
Test: take photos while phone rings
Bug:
64386853
Change-Id: I2f7bb45599bd51b2142611eefb84789a985e8841
Edwin Wong [Thu, 17 Aug 2017 01:56:04 +0000 (18:56 -0700)]
Fix ClearKey Drm base64 en/decoding to use base64url.
ClearKey's base64 en/decoding should use '-' and '_'
instead of '+' and '/' (web safe coding). Add support
for base64url coding in libstagefright foundation library
and update ClearKey plugins.
Test: CTS - ClearSystemTests
ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m
CtsMediaTestCases --test android.media.cts.ClearKeySystemTest
Test: CTS - NativeClearSystemTests
ANDROID_BUILD_droid-cts/tools/cts-tradefed run cts -m
CtsMediaTestCases --test android.media.cts.NativeClearKeySystemTest
Test: libstagefright/foundation/tests/Base64_test
adb shell /data/nativetest64/sf_foundation_test/sf_foundation_test
Test: ClearKeyDrmUnitTest
adb shell LD_LIBRARY_PATH="/vendor/lib/mediadrm"
/data/nativetest/ClearKeyDrmUnitTest/ClearKeyDrmUnitTest
Test: Vts
vts-tradefed run commandAndExit vts -m VtsHalDrmV1_0Target
--primary-abi-only -l VERBOSE
bug:
64388098
Change-Id: Ic08515fd491f15e088600c64603149401c117f4a
Shuhei Miyazaki [Mon, 31 Jul 2017 06:21:28 +0000 (15:21 +0900)]
Set output volume for routing device in startSource()
getNewOutputDevice selects a device by checking active strategy when
startSouce() is called. This behavior sometimes leads to set
unsupported device volume index. For example, BT A2DP resume from combo
output. a2dp output only supports A2DP sound devices. If sonification
stream is played via A2DP and Speaker during music playback, volume
index for speaker is applied as music volume when resume playback until
sonification stream is closed. At this time, A2DP device is selected as
routing device, so volume and routed device does not match.
To avoid this situation, setting volume index from supported device
in startSource().
Bug:
64053820
Test: Check volume after alarm sound finish during music playback via BT.
Change-Id: I71dae2c77d82abc0227ec45fc6c40bfd8f51c8c2
TreeHugger Robot [Wed, 30 Aug 2017 10:49:52 +0000 (10:49 +0000)]
Merge "Remove 64bit variant of software codecs" into oc-mr1-dev
Jiyong Park [Tue, 29 Aug 2017 08:16:49 +0000 (17:16 +0900)]
Remove 64bit variant of software codecs
Since mediacodec is a 32-bit process, we don't need the 64bit variant of
the software codecs. This will reduce the system partition usage by
about 11MB (for devices with VNDK) or 5.8MB (for other devices).
Bug:
64193930
Test: no libstagefright_soft_*.so files under /system/lib64/ and
/system/lib64/vndk directories
Test: YouTube, Camcorder recording, Video playback work
Change-Id: I52d4947c673c018ac094b3c84c1652d217611894
Phil Burk [Wed, 23 Aug 2017 19:56:15 +0000 (12:56 -0700)]
aaudio examples: Add deviceId option to examples
Note that this uses the -d option, which used to be for durationSeconds.
We now use the -s option for seconds.
Bug:
64981153
Test: this is a test
Change-Id: I9789a1f520dc93bfb26143582dacb9619650abf7
TreeHugger Robot [Tue, 29 Aug 2017 03:15:28 +0000 (03:15 +0000)]
Merge "audioflinger: fix mmap device selection" into oc-mr1-dev
TreeHugger Robot [Mon, 28 Aug 2017 23:05:31 +0000 (23:05 +0000)]
Merge "aaudio: fix hang in client when audioserver dies" into oc-mr1-dev
Eric Laurent [Mon, 28 Aug 2017 18:12:52 +0000 (11:12 -0700)]
audioflinger: fix mmap device selection
Preserve initial device selection on mmap streams in order to
reuse it when a new client starts on the same stream so that
audiopolicy does not use the default route for the new client.
Bug:
64981153
Test: verify AAudio playback over MMAP with forced device selection to
speaker while headset is connected.
Change-Id: I7c117c3c0f8e7ad08f8e63ea804c19ce21808874
Phil Burk [Mon, 28 Aug 2017 18:45:01 +0000 (11:45 -0700)]
aaudio: fix hang in client when audioserver dies
Fix timeout detection so that callback thread can die.
Prevent AAudioBinderClient singleton from getting deleted,
which caused a subsequent lock on a dead object to hang.
Bug:
64988439
Test: "write_sine -m2 -pl" and "adb shell killall audioserver"
Change-Id: I044bce385b66e69007d1997f051c9d6c042b7871
Yahan Zhou [Mon, 17 Jul 2017 22:32:51 +0000 (15:32 -0700)]
Set minimal AVC encoder level to AVCLevel1
There is a CTS test asking for a AVCLevel1 encoder. Lower the minimal
level to AVCLevel1 in low resolution so that it can pass the test.
BUG:
37101765
Test: run cts -m CtsMediaTestCases -t
android.media.cts.MediaRecorderTest#testProfileAvcBaselineLevel1
Change-Id: Id04d3389be8d6761c6d2040a7bea54a2753a7ee7
(cherry picked from commit
085bdc87edeb5304d9dc604a4d3aa4de67cb6009)
TreeHugger Robot [Fri, 25 Aug 2017 21:20:35 +0000 (21:20 +0000)]
Merge "heif: cache the entire stream if possible to support seek" into oc-mr1-dev
TreeHugger Robot [Fri, 25 Aug 2017 21:09:49 +0000 (21:09 +0000)]
Merge "aaudio: fix returned performanceMode for Legacy" into oc-mr1-dev
Chong Zhang [Wed, 23 Aug 2017 20:51:59 +0000 (13:51 -0700)]
heif: cache the entire stream if possible to support seek
Also, reuse decoding result if decode is called again. Currently
decode only retrieves primary picture, so there is no point to
go to metadata retriever again.
Bug:
64077740
Change-Id: I9243de396957f4d717c386bbaa8692494d624998
Phil Burk [Fri, 25 Aug 2017 05:12:56 +0000 (22:12 -0700)]
aaudio: fix returned performanceMode for Legacy
AAudio was setting the stream to PERFORMANCE_MODE_NONE
if we got the FAST mixer but did not get the RAW flag.
We now consider FAST flag by itself to be LOW_LATENCY.
Bug:
63004643
Test: see bug for repro case using NativeOboe app
Change-Id: Id4643d20926a8e983cd28408f70e176976c02195
TreeHugger Robot [Fri, 25 Aug 2017 14:00:02 +0000 (14:00 +0000)]
Merge "Camera: Handle RESULT_ERROR followed by BUFFER_ERROR" into oc-mr1-dev
Lajos Molnar [Mon, 14 Aug 2017 22:57:57 +0000 (15:57 -0700)]
CodecCapabilities: advertise constrained profiles for decoders
Also, use a SortedVector in builder to prevent duplicates for both
colors and profile/levels.
Bug:
64691727
Change-Id: I7a70f8e39fab9c9c139f3de421b916ada32e3a8b
Lajos Molnar [Mon, 14 Aug 2017 22:57:12 +0000 (15:57 -0700)]
stagefright: read constrained AVC profiles
Bug:
64691727
Change-Id: I98ef0e4abf22cf6a2815856975e0c0cd54173d70
Lajos Molnar [Mon, 14 Aug 2017 22:55:43 +0000 (15:55 -0700)]
stagefright: advertise proper profiles and levels
Advertise only the max level per profile
Advertise constrained AVC profiles
Bug:
64691241
Change-Id: I0456832564f4be6dff55f9f65351adaeabefb24d
TreeHugger Robot [Fri, 25 Aug 2017 00:23:27 +0000 (00:23 +0000)]
Merge "aaudio: fix EXCLUSIVE mode interfering with SHARED" into oc-mr1-dev
Shuzhen Wang [Thu, 24 Aug 2017 22:39:05 +0000 (15:39 -0700)]
Camera: Handle RESULT_ERROR followed by BUFFER_ERROR
In case a result error is followed by a buffer_error for a particular
request, current logic won't be able to remove the pending request from
the inflight queue.
Moving the skipResultMetadata flag into InFlightRequest struct fixes the
issue.
Test: Camera CTS
Bug:
64840907
Change-Id: Iac44e431f9e9fc38684f8509328c777f9cf5f956
Phil Burk [Fri, 4 Aug 2017 16:13:31 +0000 (09:13 -0700)]
aaudio: fix EXCLUSIVE mode interfering with SHARED
The MMAP endpoints were not tracked by the EndpointManager
so it could not broker EXCLUSIVE access. To fix this the MMAP stream
was refactored to use a per-client stream and a per-device endpoint.
Cleanup close() of MMAP stream.
Add AAudioServiceEndpointShared.cpp.
Extract AAudioServiceEndpointMMAP from AAudioServiceStreamMMAP.
Track MMAP endpoints so we can manage EXCLUSIVE and SHARED access.
Bug:
64494572
Bug:
64310586
Test: see bug, use write_sine to play a shared stream and a excl stream
Change-Id: I5053193abfd9b8a69a2f7e1110739d65e2af5d64
Merged-In: I5053193abfd9b8a69a2f7e1110739d65e2af5d64
TreeHugger Robot [Thu, 24 Aug 2017 02:41:37 +0000 (02:41 +0000)]
Merge "MPEG4Writer: Save container metadata during switching file output" into oc-mr1-dev
Chong Zhang [Wed, 23 Aug 2017 20:51:17 +0000 (13:51 -0700)]
heif: fix decoding of image size different from full tiled area
Bug:
64077740
Change-Id: I57ee7e1bc05e320be723d224b9328526543cad25
Hangyu Kuang [Mon, 14 Aug 2017 21:23:07 +0000 (14:23 -0700)]
MPEG4Writer: Save container metadata during switching file output
Bug:
63090931
Test: Slow motion recording to exceed file size limit and check the recorded files.
Change-Id: Iae8f183de6159572b1012fde18fbca0bc3996dd1
TreeHugger Robot [Mon, 21 Aug 2017 05:29:06 +0000 (05:29 +0000)]
Merge "heif: add new format type" into oc-mr1-dev
TreeHugger Robot [Sat, 19 Aug 2017 03:08:08 +0000 (03:08 +0000)]
Merge "SoftVideoDecoderOMXComponent: max-size can be less than size" into oc-mr1-dev
Michael Lane [Fri, 18 Aug 2017 14:56:44 +0000 (14:56 +0000)]
Merge "stagefright: allow secure audio input buffer" into oc-mr1-dev
TreeHugger Robot [Fri, 18 Aug 2017 12:12:05 +0000 (12:12 +0000)]
Merge "Fix the calculation of the number of frames" into oc-mr1-dev
Pawin Vongmasa [Wed, 16 Aug 2017 10:47:16 +0000 (03:47 -0700)]
Fix the calculation of the number of frames
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug:
64730503
Change-Id: Ie858a52cf7267b3783f67ca378a8c5efb726495c
Evgenii Stepanov [Wed, 2 Aug 2017 23:36:56 +0000 (16:36 -0700)]
[cfi] Adjust RLIMIT_AS by CFI shadow size.
CFI (control flow integrity) implementation is using a MAP_NORESERVE
allocation of up to 2GB is size. Only a tiny portion of it is backed
by physical memory. Take this into account when setting RLIMIT_AS for
media services.
Test: no immediate effect; CFI shadow increase for 48-bit aarch64 can
be reapplied w/o breaking android boot.
Bug:
64293803
See https://android-review.googlesource.com/#/c/platform/bionic/+/424903/.
(cherry picked from commit
f1b0523625ed27266bee8fcc64a3867e02b9a187)
Change-Id: I3fe72edcdaf908f42a1ffdfde645e34263564990
Wonsik Kim [Wed, 19 Jul 2017 18:41:23 +0000 (11:41 -0700)]
stagefright: allow secure audio input buffer
Bug:
63343701
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I64cae10d17ec7421ffdc60dd0aa202f6c74f83bf
(cherry picked from commit
f7005138e0d63c79131923ebcab1f9dd9074878b)
Phil Burk [Thu, 17 Aug 2017 15:52:14 +0000 (15:52 +0000)]
Merge "aaudio: prevent memory leak from double configure" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 22:44:09 +0000 (22:44 +0000)]
Merge "soundtrigger: require RECORD_AUDIO permission for DSP hotword" into oc-mr1-dev
Edwin Wong [Wed, 16 Aug 2017 22:22:39 +0000 (22:22 +0000)]
Merge "Support both Clear key plugin UUIDs." into oc-mr1-dev
Dongwon Kang [Wed, 16 Aug 2017 19:44:28 +0000 (19:44 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8 am:
9c9386918a am:
924b20fa49 am:
654bf4f8e9
am:
2e183b62fe
Change-Id: I1a47c087e9ac373eeac653310e9918eddaace8ab
Dongwon Kang [Wed, 16 Aug 2017 19:40:28 +0000 (19:40 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8 am:
9c9386918a am:
924b20fa49
am:
654bf4f8e9
Change-Id: I18a3052d9fc3c7dd78277ff239e54ca616ceae0f
Dongwon Kang [Wed, 16 Aug 2017 19:37:26 +0000 (19:37 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8 am:
9c9386918a
am:
924b20fa49
Change-Id: I2ea0e0a01595908ecc85c06d3cdd5ff82cd03346
Dongwon Kang [Wed, 16 Aug 2017 19:33:25 +0000 (19:33 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8 am:
d1c36259d8
am:
9c9386918a
Change-Id: I71801ac3e19e71f6f93800754bd07752af976292
Dongwon Kang [Wed, 16 Aug 2017 19:28:56 +0000 (19:28 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce am:
29ac52e4e8
am:
d1c36259d8
Change-Id: Ia8c09dfc98c5970b5ee8f67873e0ffd2035c9418
Dongwon Kang [Wed, 16 Aug 2017 19:20:29 +0000 (19:20 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4 am:
3775c0c2ce
am:
29ac52e4e8
Change-Id: I3bea1b6ec413cb65b49b5318c64ce0979453db5f
Dongwon Kang [Wed, 16 Aug 2017 19:14:53 +0000 (19:14 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8 am:
68f3d037b4
am:
3775c0c2ce
Change-Id: I9a2a3028bc8d2623d269fc6ac4dec1611361d9f5
Dongwon Kang [Wed, 16 Aug 2017 19:11:23 +0000 (19:11 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570 am:
c0fc9412f8
am:
68f3d037b4
Change-Id: Ife2921f9fe3c14f13b7a13377b8f54249979f939
Dongwon Kang [Wed, 16 Aug 2017 19:08:23 +0000 (19:08 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7 am:
b7d875f570
am:
c0fc9412f8
Change-Id: I4decd70a4b16e0afc8b2177d955280107c5f01aa
Dongwon Kang [Wed, 16 Aug 2017 19:04:23 +0000 (19:04 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d am:
395c7417a7
am:
b7d875f570
Change-Id: Idd819bf765bf0da09c1995f99072822b8127ccc8
Dongwon Kang [Wed, 16 Aug 2017 19:00:51 +0000 (19:00 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d am:
49903e4e0d
am:
395c7417a7
Change-Id: I6c6f140b5d164ce5e7e0fa7206016e0ce80a8396
Dongwon Kang [Wed, 16 Aug 2017 18:57:53 +0000 (18:57 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e am:
5b89f4af6d
am:
49903e4e0d
Change-Id: I4896ddcb270fe1c07e2f70e70eea99946e5c2ac1
Dongwon Kang [Wed, 16 Aug 2017 18:54:54 +0000 (18:54 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169 am:
0d7d0ab16e
am:
5b89f4af6d
Change-Id: Iaf9973226c72e46e7bf976e7917c102e737516b2
Dongwon Kang [Wed, 16 Aug 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169
am:
0d7d0ab16e
Change-Id: If958b023d571cabf9b180daaa6f7049e148cbe35
Dongwon Kang [Wed, 16 Aug 2017 18:43:50 +0000 (18:43 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f
am:
f84e9b9169
Change-Id: Ic4b40082b3a42c470e4cea5d7efb19c32ba47030
Lajos Molnar [Wed, 16 Aug 2017 18:40:53 +0000 (18:40 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
79220ea724 am:
9c65df568a
am:
69d44851ee
Change-Id: I5ef010226fcf5784e9979a754d1fe996c3425d7e
Dongwon Kang [Wed, 16 Aug 2017 18:40:50 +0000 (18:40 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c
am:
5dfd2b5d9f
Change-Id: I353d7057154a79d1ef44614450e75d123885be27
Lajos Molnar [Wed, 16 Aug 2017 18:37:22 +0000 (18:37 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
79220ea724
am:
9c65df568a
Change-Id: I26f78990d18738d800397531b9bbef810c7d125d
Dongwon Kang [Wed, 16 Aug 2017 18:32:19 +0000 (18:32 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev
am:
c65287a08c
Change-Id: I4b97f1df29bc3a2be401542be525c85880987b9b
Android Build Merger (Role) [Wed, 16 Aug 2017 18:31:42 +0000 (18:31 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
79220ea724
Change-Id: Ic000a7d1436b22416496a57a337827be4fe62523
Lajos Molnar [Wed, 16 Aug 2017 18:30:23 +0000 (18:30 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
0868c86c78
am:
61a0addea2
Change-Id: I8b86ade94fa2ed09063f67565916aebf506c3817
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:32 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
0868c86c78
Change-Id: I0d3d98b5431db0a3bda7e1f3e9bdd41ef655227b
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:28 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am: 91144 am:
1fdf6d7aed
Change-Id: Idc9e6f02e5577c6ef504cb6ccf892cff71d04049
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:23 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c am:
91144e452f
Change-Id: I88bdd26f00c3a85b19eb5708d946a3d280191eac
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:18 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee am:
e4e741c79c
Change-Id: Ib61e6205a19fd587ed006245d490b1a83b95adcf
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:14 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704 am:
d3929710ee
Change-Id: Ifb3a880e644220deb0049317f56bb6946fbad256
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:10 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb am:
6fc85a6704
Change-Id: Id8f2a4db1283fdd1fac8376c4e52566347ab6fa9
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:05 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82 am:
dc3b1f6afb
Change-Id: I9e8e351a90cebbe87a755fc9ddcd5d06d7b37add
Android Build Merger (Role) [Wed, 16 Aug 2017 18:20:00 +0000 (18:20 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae am:
35a1e90c82
Change-Id: I3042941f91290fdca070bcaa5cd00de36deb5d16
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:56 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0 am:
94b2e04aae
Change-Id: I3bed8696d76f4d08d059fd74e5e85b3d361a4c77
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:51 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0
Change-Id: Iba67f3a765f9398b8ce0c2b90aa13be1a9669ba7
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:46 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec
Change-Id: I8523a6a7220d1b6022965cd7df1b736b06aeee02
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:42 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0
Change-Id: I203f15b2b318b43ef01ab2e741a2cec7a5a55e5c
Lajos Molnar [Wed, 16 Aug 2017 18:19:15 +0000 (18:19 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev
am:
9e41bec8d3 -s ours
Change-Id: I8e3a43273b89ae97ccba0715d99e9dc5286821ef
Dongwon Kang [Wed, 16 Aug 2017 18:14:29 +0000 (18:14 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev am:
7286ecc232 am:
7cc3a167fa
am:
687011c382
Change-Id: Id9fae283a2d4e4e3f7ae1f95a007a77ab869ba87
Dongwon Kang [Wed, 16 Aug 2017 18:13:47 +0000 (18:13 +0000)]
Merge changes from topic "am-
793ae1d1-008c-4cc0-9717-
ce9555544b26" into oc-dev am:
6df241a03e
am:
f0a734dbf0
Change-Id: I9b3600dcdd71169fd7d095f423b70cbdc57d2864
Dongwon Kang [Wed, 16 Aug 2017 18:11:52 +0000 (18:11 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev am:
7286ecc232
am:
7cc3a167fa
Change-Id: Ie8def259a635c2b080541f5402731ba1f02e88e7
Dongwon Kang [Wed, 16 Aug 2017 18:09:00 +0000 (18:09 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev
am:
7286ecc232
Change-Id: Ib53b5fb2056d318d79ffa52aafd1f50d3d9c5123
Dongwon Kang [Wed, 16 Aug 2017 18:08:24 +0000 (18:08 +0000)]
Merge changes from topic "am-
793ae1d1-008c-4cc0-9717-
ce9555544b26" into oc-dev
am:
6df241a03e
Change-Id: I86c0ecb695b09c77e06af66afee1ebc48a9453e7
TreeHugger Robot [Wed, 16 Aug 2017 17:52:07 +0000 (17:52 +0000)]
Merge "Check buffer size in useBuffer in software components" into nyc-mr2-dev
TreeHugger Robot [Wed, 16 Aug 2017 17:52:07 +0000 (17:52 +0000)]
Merge changes from topic "am-
793ae1d1-008c-4cc0-9717-
ce9555544b26" into oc-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
00209af1ec
Check buffer size in useBuffer in software components
Phil Burk [Mon, 14 Aug 2017 19:38:58 +0000 (12:38 -0700)]
aaudio: prevent memory leak from double configure
Prevent AudioEndpoint from being configure()d twice.
Check return value of AudioEndpoint.configure().
Prevent AudioStreamInternal from being open()ed twice.
Bug:
64522125
Test: adb shell dumpsys media.audio_flinger --unreachable
Change-Id: I3ae07af5610fd1f9e539f884923f781eefcd645f
Lajos Molnar [Thu, 10 Aug 2017 14:04:14 +0000 (07:04 -0700)]
SoftVideoDecoderOMXComponent: max-size can be less than size
A component can be configured for size that is greater than the
max size. In such case, configure for the larger of these.
Bug:
37101765
Change-Id: I9bf3cd38e34cbedc00c54862d6782f2841ae2ee8
Eric Laurent [Wed, 16 Aug 2017 01:17:26 +0000 (18:17 -0700)]
soundtrigger: require RECORD_AUDIO permission for DSP hotword
Check android.permission.RECORD_AUDIO permission in addition to
android.permission.CAPTURE_AUDIO_HOTWORD for DSP hotword operations
as those require access to device microphone.
Bug:
62265680
Test: check "OK Google" detection with and without DSP
Change-Id: Icba2520331164bcd618e91916ca701e677d419b8
Dongwon Kang [Wed, 16 Aug 2017 02:22:52 +0000 (02:22 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
3ca83cf1b3 am:
6a53272e6f
am:
7709475e7a
Change-Id: I85a0eea9c430164faff23b342821bd04037d4f2a
Dongwon Kang [Wed, 16 Aug 2017 02:20:20 +0000 (02:20 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522 am:
d98bd836b8 am:
69e7eac88d am:
4ee00072f6 am:
e8dd7338f0 am:
a59539409f am: 886a1 am:
3ca83cf1b3
am:
6a53272e6f
Change-Id: I2daeea1b47b32953fb4ea3f4860bff6819df42ec
OSDN Git Service
