frameworks-av

Fork

force g711 test to match 1-channel sample data
am: ae55cbf717

Change-Id: I27cd320ad4a6ec7eb67842eebce37cfba4cb0274

Make a copy of output format in onOutputFormatChanged

Make a copy of output format in NDK and camera's heic encoder.
(MediaCodec.java JNI is already making a copy, so copy out of
MediaCodec.cpp to avoid unnecessary dup)

bug:141140020
Change-Id: I8afb1e48b73f0fb2fa584bdee2b93985b48a5e91
(cherry picked from commit 860eff192e00df5977be5ff8a6fbf3efa6f1f8d5)

ACodec: read max pts gap and max fps keys for image encoders

These keys are needed to disable backward frame drops for image
encoders. They should be read for both video and image types.

bug: 141169323
Change-Id: I12bea9b25a9902a50ba0e7f7d3f8aa5a497c581c
(cherry picked from commit 226cedd0ccd3c17c917c951952e278eacd26d7c8)

Camera: Delay pingCameraServiceProxy to end of onFirstRef

The cameraservice is only registered to service manager after onFirstRef
is returned. To reduce the probability of getBinderService() call
returning null, move pingCameraServiceProxy to end of onFirstRef().

Also add debug messages in onFirstRef and main() for better diagnoses.

Test: Camera CTS
Bug: 140414594
Change-Id: I52defd1c138ade57ebc5181c42aff30921fbeaeb

Do not include hidden secure cameras in camera1: getNumberOfCameras

Apps cannot connect to hidden secure cameras. Do not include them in the
number of cameras reported by camera1 api.

Bug: 141247926

Test: Without CL -> mark all cameras as hidden secure cameras;
atest FastBasicsTest.java#testCamera1 fails
With CL -> mark all cameras as hidden secure cameras;
atest FastBasicsTest.java#testCamera1 passes

Test: camera CTS

Merged-In: I9d1721fd5e94fa7f692c3da52aa667ae9247d368
Change-Id: I229a336bed6b2695e16c1457cb8f74c26b07f7e8
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

[RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes

* reject native handle output
* validate subsample sizes

Bug: 137283376
Test: cryptopoc
Change-Id: Ic4267fdc0e391bdecc1caab3b8fd4aa34ad76541
(cherry picked from commit 5dd7590c6c6fcedd77ac5ec2dd97c8badfb9eb36)

Merge "ServiceUtilities: don't do RECORD_AUDIO check for system server" into qt-qpr1-dev

Merge "MediaCodec: recognize KEY_CAPTURE_RATE" into qt-qpr1-dev

ServiceUtilities: don't do RECORD_AUDIO check for system server

Only one system server seems to exist across multiple-users; however,
when the primary user is backgrounded, system server loses its
RECORD_AUDIO permission. Through a number of steps this prevents the
secondary user from starting any services that use the SoundTrigger HAL;
specifically, this was found because it prevents Oslo from functioning
when a secondary user is active.

Bug: 139839188
Test: Oslo use cases pass
Change-Id: Ia0dd5fd3b6992cb18279b81146b35ed040771245
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>

Merge "NdkMediaDrm: properly check null listeners" into qt-qpr1-dev

AudioFlinger: enforce OP_RECORD_AUDIO during recording

Fix issue where RecordTrack silencing didn't silence the
full buffer: the memset to 0 was using the RecordThread frame
size, not the RecordTrack frame size.
OP_RECORD_AUDIO was only enforced at the start of a recording
which would fail if not granted. This patch silences the recording
(i.e. silence is recorded instead) when it is lost, and undoes that
when granted again. This requires:
- propagating the package name of the client to the RecordTrack class
- registering an appOp callback in RecordTrack (through a new
OpRecordAudioMonitor class) to (un)silence the recording
- update the isSilenced() method to take into account the appOp.

Bug: 138968594
Bug: 138636979
Test: run app that records audio, then "adb shell appops __pack_name__ 27 2"
and verify recording is silent after that.

Change-Id: Ib33f5b592185a67204997213bab1ac2594d90d37
(cherry picked from commit ddf87effa4d80f413a80fde861f73877ccd80599)
Merged-In: Ib33f5b592185a67204997213bab1ac2594d90d37

Merge "Allow codec2/g711 codec to handle 6 channels" into qt-qpr1-dev

force g711 test to match 1-channel sample data

special case the g711 test to know that it is a 1-channel input.
Test case itself can't infer the channel count from the g711 stream
since there is no header/control info within the g711 stream.

Bug: 140773833
Test: vts-tradefed run vts --module VtsHalMediaC2V1_0Host
Change-Id: I9ac1f4d3ee0ccc42ffc8c199fcb88dc5c7122c0e
(cherry picked from commit 72b55c5e31a3835a15349dffe24d8acd49adadc3)

MediaCodec: recognize KEY_CAPTURE_RATE

Bug: 140363871
Test: manual
Change-Id: Idc25d048f792ad214497baf60950a73821f14148

Merge "codec2: Add support for updating output delay in avc and hevc decoders" into qt-qpr1-dev

Merge "Increase max dequeue buffer count only for non-secure decoders" into qt-qpr1-dev

Allow codec2/g711 codec to handle 6 channels

OMX allowed 6, but codec2 was restricting to 1 channel.

Bug: 140469404
Test: playback clip from bug
(cherry picked from commit edba5005d9012e809cb08f8864e073c57f392421)

Change-Id: I9d86c40741f1442ca8147e2802a9ce54df31bbd1

codec2: Add support for updating output delay in avc and hevc decoders

OUTPUT_DELAY was set as 8 for avc and hevc c2 decoder plugins.
It is now set based on the value present in SPS

Bug: 138627015
Test: poc in bug
Test: atest android.media.cts.DecoderTest
Test: atest android.media.cts.AdaptivePlaybackTest

Change-Id: I50f7b3e8bd08c9d3b19e84c3c25acaa4eb767226

Merge "Codec2: Retry interface creation until successful" into qt-qpr1-dev

Merge "Codec2: Retain compatibility with old HAL" into qt-qpr1-dev

NdkMediaDrm: properly check null listeners

Bug: 140456613
Test: NativeMediaDrmClearkeyTest
Change-Id: Id3bfaa3da4a73d1607f191d2ad44dce47ae7f4a0

Codec2: Retain compatibility with old HAL

Make the vndk module "libstagefright_bufferpool@2.0" work with existing
Codec2 HALs, and create a new vendor (non-vndk) module
"libstagefright_bufferpool@2.0.1" that new Codec2 HALs can use.

Test: atest CtsMediaTestCases -- \
--module-arg CtsMediaTestCases:size:small

Bug: 138171841
Bug: 140471279
Change-Id: I2886432afef86ef66fbd48ee744e5fd8de2d1e21

[automerger skipped] [RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes am: 5dd7590c6c -s ours am: 15437f1e00
am: ef6506d2c5

Change-Id: Ib859d8f7c3c29393a5908f8d56257259be5e8fe6

Merge "clearkey hidl CryptoPlugin: misc & security fixes" into qt-dev am: e0ed98533c
am: 893d1ccbc4

Change-Id: I701eb716f1d4fd6b92a8a695c42ccd3c6645b0c9

[automerger skipped] [RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes am: 5dd7590c6c -s ours
am: 15437f1e00

Change-Id: Idff44a95b289f89725d271969216977f93c327d4

Merge "clearkey hidl CryptoPlugin: misc & security fixes" into qt-dev
am: e0ed98533c

Change-Id: Ic332eaed415a10d43332a2bd25cb7cbbade7b6ac

[automerger skipped] [RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes
am: 5dd7590c6c -s ours
am skip reason: subject contains skip directive

Change-Id: I4a61813e541e06fa67ca60379e09f1337880dc62

Merge "clearkey hidl CryptoPlugin: misc & security fixes" into qt-dev

Allow --user parameter for audio service commands.

This allows testing on secondary users.

Change similar to ag/7022195 and ag/6936694.

Fixes: 139301368
Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioRecordTest#testRecordNoDataForIdleUids

and ...
$ adb install testcases/CtsMediaTestCases.apk
Success
$ adb shell cmd media.audio_policy set-uid-state android.media.cts active
$ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 0
active
$ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 10
idle
$ adb shell cmd media.audio_policy set-uid-state android.media.cts --user 10 active
$ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 10
idle
$ adb shell cmd media.audio_policy set-uid-state android.media.cts active --user 10
$ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 10
active
$ adb shell cmd media.audio_policy set-uid-state android.media.cts idle --user 0
$ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 0
idle
$ adb shell cmd media.audio_policy reset-uid-state android.media.cts --user 10
$ adb shell cmd media.audio_policy get-uid-state android.media.cts --user 10
idle

Change-Id: I17774efa6aca7c9b9d0af9bf9c1e75474e90d990
(cherry picked from commit be066e1a9aa613f4e7e56fbd16b35d8ad377b68f)

Codec2: Retry interface creation until successful

Test: atest CtsMediaTestCases -- \
--module-arg CtsMediaTestCases:size:small

Bug: 139466364
Change-Id: I6e552cb90af517f2c0f8c14dd679d6d60abee6fc