OSDN Git Service
Phil Burk [Tue, 2 May 2017 22:55:23 +0000 (22:55 +0000)]
Merge "aaudio: fix mmap result checking" into oc-dev
Phil Burk [Mon, 1 May 2017 18:34:11 +0000 (11:34 -0700)]
aaudio: fix mmap result checking
Was checking for nullptr not MAP_FAILED
Bug:
33398120
Test: see mmap() docs
Change-Id: I02d178cb0188f8b0d6cd009699dccc7c97952e4b
Signed-off-by: Phil Burk <philburk@google.com>
Jiwen Cai [Tue, 2 May 2017 15:59:21 +0000 (15:59 +0000)]
Merge "SurfaceUtils: query CONSUMER_IS_PROTECTED" into oc-dev
Phil Burk [Tue, 2 May 2017 15:58:32 +0000 (15:58 +0000)]
Merge "aaudio: set errorCallback user data" into oc-dev
Jiwen 'Steve' Cai [Sat, 22 Apr 2017 02:00:58 +0000 (19:00 -0700)]
SurfaceUtils: query CONSUMER_IS_PROTECTED
Using NATIVE_WINDOW_CONSUMER_IS_PROTECTED to check whether a native
window can handle protected buffers instead of expecting
GRALLOC_USAGE_PROTECTED as a consumer usage flag.
Bug:
35726763
Test: videoplayer-nodrm-protected.apk and videoplayer-drm-protected.apk
both works.
Change-Id: I67a324161dff22e6efd949f2ab988c2349cd6bcc
Phil Burk [Tue, 2 May 2017 00:04:46 +0000 (17:04 -0700)]
aaudio: set errorCallback user data
Without this, a nullptr could be passed to the callback instead of
userData.
Bug:
37873111
Test: difficult to test because it requires an error to occur.
Change-Id: I3f262410e0465a8192da2494cadfdb4f8d2188a7
Signed-off-by: Phil Burk <philburk@google.com>
Eino-Ville Talvala [Thu, 27 Apr 2017 19:48:33 +0000 (12:48 -0700)]
Camera service: Don't crash if the camera HAL dies mid-use.
Check for transaction errors in all calls to the HIDL interface;
return DEAD_OBJECT consistently if a transaction error occurs.
Test: Camera CTS does not regress; killing camera HAL does not kill camera service.
Bug:
37748853
Change-Id: Iab3ad08376e164db340f8f29c3cfc7fdf261cc00
Andy Hung [Mon, 1 May 2017 20:30:25 +0000 (20:30 +0000)]
Merge "GenericSource: close unused file descriptor" into oc-dev
TreeHugger Robot [Mon, 1 May 2017 20:21:47 +0000 (20:21 +0000)]
Merge "aaudio: apply volume in the MMAP data path" into oc-dev
TreeHugger Robot [Mon, 1 May 2017 19:44:20 +0000 (19:44 +0000)]
Merge "Minor updates AHardware accessor in AImageReader" into oc-dev
Andy Hung [Mon, 1 May 2017 16:51:40 +0000 (09:51 -0700)]
GenericSource: close unused file descriptor
Test: dumpsys media.player with photos, ringtone
Bug:
37792834
Change-Id: I04e0f05ea642e3bfe5e6af12bfabea69838716b4
Phil Burk [Thu, 20 Apr 2017 20:03:19 +0000 (13:03 -0700)]
aaudio: apply volume in the MMAP data path
The volume scaling is in AudioStreamInternal and not the mixer
because we will need volume scaling in EXCLUSIVE mode too.
Bug:
37518243
Test: play a tone using NativeOboe app then press volume keys
Change-Id: Ibbac9770ea4493f8ade64681be86f109a92803cd
Signed-off-by: Phil Burk <philburk@google.com>
Jiwen 'Steve' Cai [Sat, 22 Apr 2017 00:13:18 +0000 (17:13 -0700)]
Minor updates AHardware accessor in AImageReader
1/ Be more explicit about what usage/format combination is supported.
2/ Get rid of usage1 following the same change in AHardwareBuffer.
3/ No more gralloc1 usage, so don't call android_convertGralloc1To0Usage
anymore.
Bug:
35114769
Bug:
37097572
Test: Ran AImageReaderCts
Change-Id: Ic712d0ac5bd86b2c4c68815125ba9037212dfd65
TreeHugger Robot [Sat, 29 Apr 2017 21:06:54 +0000 (21:06 +0000)]
Merge "audiohal: Always load A2DP module locally" into oc-dev
Hassan Shojania [Sat, 29 Apr 2017 00:45:46 +0000 (00:45 +0000)]
Merge "Reporting the player's data source type in media analytics" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 23:56:37 +0000 (23:56 +0000)]
Merge "Prefix ENABLE_MEDIADRM_64 with TARGET_" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 23:15:44 +0000 (23:15 +0000)]
Merge "IMediaExtractor: ensure users to check returned value by getTrack." into oc-dev
Mikhail Naganov [Fri, 28 Apr 2017 01:52:37 +0000 (18:52 -0700)]
audiohal: Always load A2DP module locally
This makes legitimate unix socket interaction between A2DP
module and the Bluetooth stack.
Implemented by allowing both "local" and "hidl" interface
wrappers to co-exist for devices and streams. A "hybrid" device
factory is introduced to create an appropriate implementation
of a device depending on the requested module name.
Bug:
37640821
Test: Play Music over BT headset
Change-Id: I5592961dd5b56840418fb122680979d11a261b6c
Hassan Shojania [Wed, 26 Apr 2017 22:10:42 +0000 (15:10 -0700)]
Reporting the player's data source type in media analytics
Bug:
37720861
Test: metrics dumpsys
Change-Id: I44eb7049f10aa4f89c9e7b0de6b47d169129d15d
Wei Jia [Fri, 28 Apr 2017 17:20:07 +0000 (10:20 -0700)]
IMediaExtractor: ensure users to check returned value by getTrack.
Test: fix the crash from the stream in the bug.
Bug:
37777357
Change-Id: Ia99907c396a2074a9419db9b8103a9325b290169
Mikhail Naganov [Fri, 28 Apr 2017 15:29:21 +0000 (15:29 +0000)]
Merge "audiohal: Support stateful downmixer effects" into oc-dev
John W. Bruce [Thu, 27 Apr 2017 19:06:44 +0000 (12:06 -0700)]
Prefix ENABLE_MEDIADRM_64 with TARGET_
This build-time flag should be prefixed.
Bug:
37039525
Test: Built OS
Change-Id: I09ab0a1ed672a88db5741102d87973eb9267efb3
Mathias Agopian [Fri, 28 Apr 2017 00:29:28 +0000 (00:29 +0000)]
Merge "Plumb gralloc producer/consumer bits correctly" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 22:28:04 +0000 (22:28 +0000)]
Merge changes from topic 'device_version_cleanup' into oc-dev
* changes:
Camera: Cleanup 'Camera2Client' device dependend code
Camera: Remove RAW boost value override logic
Camera: Remove AE pre-capture trigger cancel override
Camera: Make device related code version agnostic
Mathias Agopian [Mon, 24 Apr 2017 21:49:13 +0000 (14:49 -0700)]
Plumb gralloc producer/consumer bits correctly
Bug:
33350696
Test: compile, boot device, cts
Change-Id: Ie05bcac25557a7c570ccadc850adb7c9697e144d
Mikhail Naganov [Thu, 27 Apr 2017 00:22:00 +0000 (17:22 -0700)]
audiohal: Support stateful downmixer effects
Fraunhofer's downmixer has additional buffering, this is incompatible
with how DownmixerBufferProvider used to process incomplete buffers.
Now the effects HIDL wrapper delivers frameCount updates in
audiobuffers to the server side. This fixes playback of multichannel
sound streams.
Bug:
36181621
Test: play 5.1 track from Play Music
Change-Id: I3b2cd097d61873c6ba329f1a574235ac88b21cac
TreeHugger Robot [Thu, 27 Apr 2017 17:19:55 +0000 (17:19 +0000)]
Merge "audioflinger: improve mmap stream volume" into oc-dev
Andy Hung [Thu, 27 Apr 2017 16:19:39 +0000 (16:19 +0000)]
Merge "VolumeShaper: Improve restore" into oc-dev
Hassan Shojania [Thu, 27 Apr 2017 13:42:17 +0000 (13:42 +0000)]
Merge "Modular DRM for MediaPlayer/Removing mimes report" into oc-dev
Pawin Vongmasa [Thu, 27 Apr 2017 04:24:30 +0000 (21:24 -0700)]
Make IOmx registration independent of IOmxStore
This CL allows IOmx to attempt registration even when IOmxStore fails to
register.
Test: Manual use of Camera
Bug:
37657124
Bug:
37726880
Change-Id: I108c507326ee55c17acc524233e70afa5cb5a4f0
TreeHugger Robot [Thu, 27 Apr 2017 00:31:02 +0000 (00:31 +0000)]
Merge "stagefright: prevent component to be stuck on error" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 00:17:06 +0000 (00:17 +0000)]
Merge "GraphicBufferSource: remove free codec buffers only when submitted to codec" into oc-dev
Andy Hung [Wed, 26 Apr 2017 23:29:15 +0000 (23:29 +0000)]
Merge "AudioMixer: fix assertion for multichannel playback" into oc-dev
Wonsik Kim [Tue, 18 Apr 2017 18:56:31 +0000 (11:56 -0700)]
stagefright: prevent component to be stuck on error
Bug:
36818684
Bug:
34983882
Test: Run the command below on Nexus Player overnight:
while true ; do adb shell am instrument -e class 'android.platform.tv.tests.aupt.YouTubeTests' -w 'android.platform.tv.tests.aupt/android.support.test.aupt.AuptTestRunner' ; done
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I9663c3d62d97c3f5db0af6c30f39bb59cbc7e3e7
Pawin Vongmasa [Wed, 26 Apr 2017 22:58:29 +0000 (22:58 +0000)]
Merge "Stub implementation for IOmxStore." into oc-dev
Lajos Molnar [Wed, 26 Apr 2017 22:19:47 +0000 (15:19 -0700)]
GraphicBufferSource: remove free codec buffers only when submitted to codec
Bug:
37556535
Change-Id: I516c0a2fc6c78e937360a2a5c2a3dcdea1d07370
Hassan Shojania [Thu, 20 Apr 2017 22:25:39 +0000 (15:25 -0700)]
Modular DRM for MediaPlayer/Removing mimes report
Bug:
34559906
Test: GTS Tests
Change-Id: I6877b9ac4ffd36f0ed476c3b4bbb0770da5abaf6
Andy Hung [Fri, 21 Apr 2017 22:07:45 +0000 (15:07 -0700)]
VolumeShaper: Improve restore
Consider whether VolumeShaper has been started or not when
restoring (position). If the VolumeShaper hasn't been started
we restore in that state. If it has been started already,
we advance to the end assuming the duration has been played out.
Test: CTS and headset / kill audioserver
Bug:
37536598
Change-Id: I4b55dca6f6a859563fd20bad4c8f67d2c92321c0
Lajos Molnar [Wed, 26 Apr 2017 01:08:42 +0000 (18:08 -0700)]
stagefright: don't actually acquire graphic buffer when we don't want to
Bug:
37556535
Change-Id: Ic9d2bddd12c8a750c4d285a1915ac3f4455aceae
Andy Hung [Tue, 25 Apr 2017 23:47:52 +0000 (16:47 -0700)]
AudioMixer: fix assertion for multichannel playback
Reset mPostDownmixReformatBufferProvider before changing
downmixerBufferProvider.
Test: Play Music with multichannel files
Bug:
27526910
Change-Id: I5803e169cb9da4e7681bc8caf1452e79e5a4d1d5
TreeHugger Robot [Tue, 25 Apr 2017 19:42:26 +0000 (19:42 +0000)]
Merge "aaudio: change samplesPerFrame() to channelCount()" into oc-dev
Emilian Peev [Mon, 10 Apr 2017 13:45:09 +0000 (14:45 +0100)]
Camera: Cleanup 'Camera2Client' device dependend code
Bug:
34392075
Test: Manual using application.
Change-Id: I365b83c9cfbfe3ddbd9d41f2aa9788490b87b5cf
Emilian Peev [Mon, 10 Apr 2017 11:02:42 +0000 (12:02 +0100)]
Camera: Remove RAW boost value override logic
RAW boost value will be inserted by HIDL wrapper. The logic
needs to move there.
Bug:
34392075
Test: runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
Change-Id: I7d4321d728eba11b5ec1345536bb669d70f3cffc
Emilian Peev [Fri, 7 Apr 2017 14:48:49 +0000 (15:48 +0100)]
Camera: Remove AE pre-capture trigger cancel override
Bug:
34392075
Test: runtest -x
cts/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
-m testAePrecaptureTriggerCancelJpegCapture
Change-Id: I0e632c83fb3ae0e4df26fe35bf1ef8441c1f20fa
Emilian Peev [Thu, 6 Apr 2017 15:55:14 +0000 (16:55 +0100)]
Camera: Make device related code version agnostic
Camera device related code should be agnostic w.r.t.
device version as much as possible. Specifically the
following requirements must hold true:
- Since support for devices 3.0&3.1 is deprecated
"ANDROID_QUIRKS_USE_PARTIAL_RESULT" is no longer considered.
- "ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS" is always
used instead of the deprecated "ANDROID_SCALER_AVAILABLE_JPEG_SIZES".
- Buffer manager for camera streams is used for dynamic buffer
allocation.
- "flush" is always used instead of waiting for buffers to drain.
- Similar to "flush" stream "tearDown" is always available.
- Dead code handling buffer registration is removed.
Bug:
34392075
Test: Manual using camera application
Change-Id: If1b215f785ba61c6991fdf163d4eb18733690471
Phil Burk [Tue, 25 Apr 2017 00:04:01 +0000 (17:04 -0700)]
aaudio: change samplesPerFrame() to channelCount()
Both functions provided for now.
Will remove deprecated function in later CL.
Bug:
37646784
Test: write_sine.cpp and write_sine_callback.cpp
Change-Id: I1241aafa206112c526d6ca250ba5209489e1a46e
Signed-off-by: Phil Burk <philburk@google.com>
Andy Hung [Tue, 25 Apr 2017 17:03:14 +0000 (17:03 +0000)]
Merge "VolumeShaper: Clean up constructors" into oc-dev
Andy Hung [Tue, 25 Apr 2017 16:23:15 +0000 (16:23 +0000)]
Merge "VolumeShaper: improve logging and dumpsys" into oc-dev
Pawin Vongmasa [Tue, 25 Apr 2017 12:06:20 +0000 (05:06 -0700)]
Stub implementation for IOmxStore.
Test: Small CtsMediaTestCases
Bug:
37657124
Change-Id: I5728a12d000223231600ab3c3ab4eb044dd1847d
Ray Essick [Mon, 24 Apr 2017 22:52:54 +0000 (15:52 -0700)]
Suppress 'radio' processes to media.metrics
We suppress calls from radio processes (including the basic phone
process) to the media.metrics service. This had started happening
for a particular video telephony application that ran within phone
instead of as some separate app with its own user id.
We do this here to speed up when a radio process learns that it
can not log to media.metrics. The existing sepolicy restrictions
remain in place as a fallback. The use case that prompted this
was having issues with the 5-second timeout before we learned that
radio wasn't allowed access to the media.metrics process.
Bug:
37552329
Test: observe 'dumpsys media.metrics' and logcat
Change-Id: I1824aa35860bb91dd796856453c1897ec21b496c
TreeHugger Robot [Tue, 25 Apr 2017 00:24:00 +0000 (00:24 +0000)]
Merge "MediaPlayer: enable more logs for extractor failure." into oc-dev
TreeHugger Robot [Mon, 24 Apr 2017 22:36:50 +0000 (22:36 +0000)]
Merge "camera: Update for enableZsl values in template" into oc-dev
Wei Jia [Thu, 20 Apr 2017 23:40:06 +0000 (16:40 -0700)]
MediaPlayer: enable more logs for extractor failure.
Test: compiles
Bug:
37273297
Change-Id: I53c6393e0c306c64ec4aa81c45e5ff6e8de233d8
Andy Hung [Thu, 20 Apr 2017 21:23:41 +0000 (14:23 -0700)]
VolumeShaper: Clean up constructors
Explicit only for single argument constructors
Test: instrumented ducking, CTS
Bug:
37536598
Change-Id: I78776f500513a40c8daf7af78cbaec4b153e9ea2
Andy Hung [Thu, 20 Apr 2017 21:06:17 +0000 (14:06 -0700)]
VolumeShaper: improve logging and dumpsys
Test: CTS and dumpsys
Bug:
37536598
Change-Id: I9a838a8605defde3aaf42a872e48f01425df0f0e
TreeHugger Robot [Mon, 24 Apr 2017 21:15:21 +0000 (21:15 +0000)]
Merge "Allow fstatfs64 syscall for mediacodec/extractor" into oc-dev
Dimitry Ivanov [Mon, 24 Apr 2017 18:34:58 +0000 (11:34 -0700)]
Allow fstatfs64 syscall for mediacodec/extractor
This syscall is used by the linker to detect files located on tmpfs
Bug: http://b/
37245203
Bug: http://b/
37590327
Test: boot an angler and check that mediacodec does not crash
Change-Id: I7147063db7d6b8ec39a25d39b60e8e6882addf6e
TreeHugger Robot [Mon, 24 Apr 2017 11:38:28 +0000 (11:38 +0000)]
Merge "Camera: Clear available callback buffers during recording stop" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 23:00:47 +0000 (23:00 +0000)]
Merge "NuPlayerDecoder: check mCodec before dereferencing it." into oc-dev
Eric Laurent [Fri, 21 Apr 2017 22:29:38 +0000 (15:29 -0700)]
audioflinger: improve mmap stream volume
First try to use HW volume control and then fall back
to volume control in AAudio service.
Bug:
37518243
Test: play a sound and check AAudio volume callback is called
when pressing volume keys.
Change-Id: Ie18be9f553ae23c247974d8923e7dcddeb1047c8
TreeHugger Robot [Fri, 21 Apr 2017 18:50:55 +0000 (18:50 +0000)]
Merge "audioflinger: fix mmap stream volume" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
Wei Jia [Fri, 21 Apr 2017 18:24:45 +0000 (11:24 -0700)]
NuPlayerDecoder: check mCodec before dereferencing it.
Test: media cts tests
Bug:
37538141
Change-Id: Ib95fd4786242d6742f3bdc7aab28f79d43e8da81
Emilian Peev [Wed, 5 Apr 2017 10:20:09 +0000 (11:20 +0100)]
Camera: Clear available callback buffers during recording stop
Make sure we don't keep any stale available callback buffer
references after recording stops. This can lead to resource
leaks.
Bug:
36478361
Test: Complete Camera/Camera2 CTS tests
Change-Id: I9f72b784ba3ae1cf9f9b16064a13b7ba8a1d0394
TreeHugger Robot [Fri, 21 Apr 2017 15:15:49 +0000 (15:15 +0000)]
Merge "aaudio: fix SHARED MMAP mode in server plus other bugs" into oc-dev
Hassan Shojania [Fri, 21 Apr 2017 14:48:55 +0000 (14:48 +0000)]
Merge "Modular DRM for MediaPlayer/SampleAES" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 09:58:42 +0000 (09:58 +0000)]
Merge "Make IGraphicBufferSource::setTimeLapseConfig take fps" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 09:28:55 +0000 (09:28 +0000)]
Merge "Camera: Ignore buffer handle 'int' section" into oc-dev
Phil Burk [Thu, 13 Apr 2017 23:05:07 +0000 (16:05 -0700)]
aaudio: fix SHARED MMAP mode in server plus other bugs
Fixed some buffer miscalculations, and some NPEs in the close() code.
Added debugging and some general cleanup.
Fixed data conversion.
Fixed start/pause/flush in server.
Added reference counting in server for endpoints.
Programs can now be ran more than once.
General code cleanup.
Reconnect with service if server dies.
Move stop() logic into server for better synchronization.
Add sleep to prevent race condition when closing an MMAP stream.
Bug:
33398120
Test: two write_sine_callback.cpp can be run simultaneously
Change-Id: Ibb006215a498868c222228d675ff961d7e0bf514
Signed-off-by: Phil Burk <philburk@google.com>
Eric Laurent [Thu, 20 Apr 2017 01:10:41 +0000 (18:10 -0700)]
audioflinger: fix mmap stream volume
Fix bad casting from MmapPlaybackThread to VolumeInterface causing
volume commands to be lost by audio flinger for MMAP threads.
Bug:
37518243
Test: Verify volume is received by the audio HAL on MMAP streams
Verify no regression for other stream types.
Change-Id: I584ae868245358b2edefecc46a5249092f8be229
Pawin Vongmasa [Thu, 20 Apr 2017 12:12:55 +0000 (05:12 -0700)]
Make IGraphicBufferSource::setTimeLapseConfig take fps
Test: Manual use of Camera, Movies, Photos and YouTube apps.
Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Bug:
37302530
Change-Id: Id0d4f7fed57349a2f5484f6b6264981471e8f022
Pawin Vongmasa [Thu, 6 Apr 2017 22:56:34 +0000 (15:56 -0700)]
Add future support for IGraphicBufferSource::getStopTimeOffsetUs
Test: Compiles
Bug:
35925528
Change-Id: I31368939d2f13811b9e8b3e5911b91b14148c167
Hassan Shojania [Wed, 19 Apr 2017 21:29:42 +0000 (14:29 -0700)]
Modular DRM for MediaPlayer/SampleAES
Bug:
34559906
Test: CTS Tests + playback in Chrome
Change-Id: Iaa275c4cfe6d15f02774ff4cc8a2cb5e7d1012e1
Emilian Peev [Thu, 20 Apr 2017 09:58:51 +0000 (10:58 +0100)]
Camera: Ignore buffer handle 'int' section
Bufer handle hashing and comparison currently uses the buffer
'Int' section along with the Fd section. However the values there
can dynamically change after the buffer gets allocated which will
introduce side-effects in the buffer id map.
Bug:
37257356
Test: Complete Camera/Camera2 CTS
Change-Id: I2cf09ced69f155285dae67b3a2502e6b87f7d9cc
TreeHugger Robot [Thu, 20 Apr 2017 00:50:47 +0000 (00:50 +0000)]
Merge "Revise capture interval calculation in StagefrightRecorder" into oc-dev
Phil Burk [Thu, 20 Apr 2017 00:19:12 +0000 (00:19 +0000)]
Merge "aaudio: disable EXCLUSIVE mode" into oc-dev
Phil Burk [Thu, 20 Apr 2017 00:14:27 +0000 (17:14 -0700)]
aaudio: disable EXCLUSIVE mode
It does not work because of SELinux restrictions.
Bug:
37167970
Test: we are disabling a feature because it does not work
Change-Id: If97ae72bde50dbc7808eb0768de25e6fbb388429
Signed-off-by: Phil Burk <philburk@google.com>
Phil Burk [Wed, 19 Apr 2017 23:46:00 +0000 (23:46 +0000)]
Merge "aaudio: remove old createThread API" into oc-dev
Phil Burk [Wed, 19 Apr 2017 23:16:51 +0000 (23:16 +0000)]
Merge "aaudio: remove AAUDIO_FORMAT_PCM_I8_24 and I32" into oc-dev
Jesse Hall [Wed, 19 Apr 2017 22:50:05 +0000 (15:50 -0700)]
Match AHardwareBuffer format name change
Bug:
37515907
Test: make checkbuild
Change-Id: I1cb9ee3eefcb7594a875d64c0f90861ecc6d4626
Wonsik Kim [Fri, 14 Apr 2017 19:12:02 +0000 (12:12 -0700)]
Revise capture interval calculation in StagefrightRecorder
Bug:
37302530
Test: cts-tradefed run cts-dev --module CtsMediaTestCases --test android.media.cts.MediaRecorderTest
Change-Id: Idfb4aea475a40f928380835db9e6f304fe435377
Andy Hung [Wed, 19 Apr 2017 20:34:11 +0000 (20:34 +0000)]
Merge "Reduce memory usage by some extractors." into oc-dev
Chong Zhang [Wed, 19 Apr 2017 18:56:25 +0000 (18:56 +0000)]
Merge "MediaCas: move clear key plugin to /system/lib" into oc-dev
Yifan Hong [Wed, 19 Apr 2017 18:25:18 +0000 (18:25 +0000)]
Merge "Add libeffects to CleanSteps.mk" into oc-dev
Andy Hung [Wed, 19 Apr 2017 16:28:37 +0000 (16:28 +0000)]
Merge "MediaBufferGroup: Fix MediaBufferGroup signal" into oc-dev
Phil Burk [Wed, 19 Apr 2017 05:46:21 +0000 (22:46 -0700)]
aaudio: remove old createThread API
This was replaced by the callback API.
Bug:
36489240
Test: the code was removed and cannot be tested
Change-Id: Ieb5cee80d1123221d02146c8c9342c4e0d649575
Signed-off-by: Phil Burk <philburk@google.com>
Phil Burk [Wed, 19 Apr 2017 02:50:28 +0000 (19:50 -0700)]
aaudio: remove AAUDIO_FORMAT_PCM_I8_24 and I32
They were not supported and we may not support them.
Bug:
30210002
Test: test_aaudio.cpp
Change-Id: Ib8a5d416b93df87e4b73e03789eacf0fd3f77f8e
Signed-off-by: Phil Burk <philburk@google.com>
TreeHugger Robot [Wed, 19 Apr 2017 00:41:21 +0000 (00:41 +0000)]
Merge "stagefright: fix log spam" into oc-dev
Yin-Chia Yeh [Wed, 19 Apr 2017 00:12:23 +0000 (00:12 +0000)]
Merge "Camera: allow shifted camera metadata for some interface" into oc-dev
Yin-Chia Yeh [Wed, 19 Apr 2017 00:12:02 +0000 (00:12 +0000)]
Merge "Camera: use framework VideoNativeHandleMetadata header" into oc-dev
Chien-Yu Chen [Tue, 18 Apr 2017 22:22:02 +0000 (15:22 -0700)]
camera: Update for enableZsl values in template
For apps targeting SDK versions O and newer, the value of enableZsl
may be true in still capture template. the value of enableZsl is
always false for other templates.
For apps targeting SDK versions older than O, the value of enableZsl
is always flase.
Test: make
Bug:
34983527
Change-Id: I06b2a18254a78bd6505e9b6e6addc09ebf0f925f
Chong Zhang [Tue, 18 Apr 2017 22:01:37 +0000 (15:01 -0700)]
MediaCas: move clear key plugin to /system/lib
Non-treble process can no longer load .so from /vendor/lib.
Move the clear key plugin to /system/lib until MediaCas is converted
to treble.
bug:
37476803
Change-Id: I563b4576aeada5470355e7e168fa2c73997004d7
TreeHugger Robot [Tue, 18 Apr 2017 23:00:34 +0000 (23:00 +0000)]
Merge "audio policy: disable concurrent capture" into oc-dev
Yin-Chia Yeh [Tue, 18 Apr 2017 22:52:55 +0000 (15:52 -0700)]
stagefright: fix log spam
Bug:
37110143
Change-Id: I82d147c966980716df5eb5c05cf8cb71387f0862
Yifan Hong [Tue, 18 Apr 2017 22:05:15 +0000 (15:05 -0700)]
Add libeffects to CleanSteps.mk
Test: make
Bug:
33241851
Change-Id: Icf288506a166ead3e49ace9ba90e124ce4ede4ff
Yin-Chia Yeh [Tue, 18 Apr 2017 22:01:15 +0000 (15:01 -0700)]
Camera: allow shifted camera metadata for some interface
Allow shifted metadata when the buffer is allocated by
hwbinder (which might allocate buffers to 4 bytes boundary
on 32-bits CPU)
Test: compile, GCA working
Bug:
37095012
Change-Id: I404b73ac3b460f5ff03cb64001c24f7a05b91396
yuedl1 [Mon, 13 Mar 2017 10:07:26 +0000 (18:07 +0800)]
Reduce memory usage by some extractors.
Occurs for some extractors that use shared memory without MediaBufferObserver.
Check with high resolution MKV.
Play a mkv file continuously and check file descriptor count.
adb shell lsof | grep mediae | wc
adb shell lsof | grep medias | wc
Test: Photos with mkv.
Bug:
36359517
Change-Id: I8719b628406a838ee091499347b219a8a4736a25
Signed-off-by: yuedl1 <yuedl1@lenovo.com>
TreeHugger Robot [Tue, 18 Apr 2017 20:31:25 +0000 (20:31 +0000)]
Merge "Camera: Make finalizeOutputConfigurations more resilient" into oc-dev
Glenn Kasten [Tue, 18 Apr 2017 20:10:10 +0000 (20:10 +0000)]
Merge "Use option to flush the entire buffer on -EOVERFLOW" into oc-dev
Shuzhen Wang [Thu, 13 Apr 2017 22:18:36 +0000 (15:18 -0700)]
Camera: Make finalizeOutputConfigurations more resilient
There could be race in application where finalizeOutputconfigurations
doesn't include any new surface. Do not fail in this case.
Test: CameraStressTest#testBackCameraSwitchPreview
Bug:
36811459
Bug:
35137641
Change-Id: Ic185e6d8bfcb8af5b81a33fbbd2fd4e49cc647ce