frameworks-av

Fork

Merge cherrypicks of [10101230, 10101593, 10101594, 10101595, 10101362, 10101479, 10101363, 10101110, 10101480, 10102031, 10102032, 10101596, 10101364] into qt-qpr2-release

Change-Id: I0140f120d6df40e623aaf81b7314334691b62e28

Revert "DO NOT MERGE Set module versions to 299900000 Dev branch..."

Revert "DO NOT MERGE ANYWHERE Set module versions to 299900000 D..."

Revert "DO NOT MERGE Set module versions to 299900000 Dev branch..."

Revert "DO NOT MERGE Set module versions to 299900000 Dev branch..."

Revert "DO NOT MERGE Set module versions to 299900000 Dev branch..."

Revert submission 618813-1573140820154-3a63801

Reverted Changes:
I03dd46c2d: DO NOT MERGE Set module versions to 299900000 Dev ...
Id4339413c: DO NOT MERGE Set module versions to 299900000 Dev ...
I9c0cec312: DO NOT MERGE ANYWHERE Set module versions to 29990...
I0580a3d45: DO NOT MERGE Set module versions to 299900000 Dev ...
I5b61aded4: DO NOT MERGE Set module versions to 299900000 Dev ...

Bug: b/144902035
Change-Id: Ie6971a25dc89d5ce4ac038c87791fb212cdea9f4
(cherry picked from commit 20946ff19fcd6363e3b933e5b98578de1d70a636)

Snap for 6091187 from 8f72d008d0c51da507fc3c447e68e02b9e2d8535 to qt-qpr2-release

Change-Id: I33e175ef2035398744d91a23ddea7a41f9ad607c

Merge "Check actual read bytes for TS packets" into qt-qpr1-dev

Merge "AudioFlinger: Clear effect_uuid_t in case of short read" into qt-qpr1-dev

AudioFlinger: Clear effect_uuid_t in case of short read

Bug: 139417189
Test: native test, see bug
Merged-In: I9ef0e58e2e73089eb9a347d5357e040ac69bbdd1
Change-Id: I9ef0e58e2e73089eb9a347d5357e040ac69bbdd1

Check actual read bytes for TS packets

Check actual bytes read when feeding the data to TS parser.

Bug: 140177694
Test: poc in bug; StreamingMediaPlayerTest

Merged-In: I4b498fe375af657e17838e5839e6348e1463d559
Change-Id: I4b498fe375af657e17838e5839e6348e1463d559

RESTRICT AUTOMERGE
Harden Clearkey releaseSecureStops implementation.

Perform more checking for invalid input.

Test: CTS tests
android.media.cts.MediaDrmClearkeyTest#testSecureStop
android.media.cts.MediaDrmClearkeyTest

Test: run drmpoc
no signal 6 on clearkey service after the fix

Test: adb shell ps | grep clearkey
pid ID does not change after running drmpoc

bug: 137284652
Change-Id: I971bb33eec6d37ef86fa1a53501c1e6bda50fa3b

RESTRICT AUTOMERGE
Fix Heap buffer overflow in clearkey releaseSecureStops

Security Vulnerability fix: Heap buffer overflow in clearkey
releaseSecureStops - android.hardware.drm@1.1-service.clearkey

Fix provided by researcher.

Test: CTS tests
android.media.cts.MediaDrmClearkeyTest#testSecureStop
android.media.cts.MediaDrmClearkeyTest

Test: run drmpoc
no signal 6 on clearkey service after the fix

Test: adb shell ps | grep clearkey
pid ID does not change after running drmpoc

bug: 137284652
Change-Id: Id085945943aa6b85c597dc8b7c32a3b990c54a2b

Snap for 6083172 from 9ed54cdf4d8970bdeb88e4488dabb56e1d6c79b7 to qt-qpr2-release

Change-Id: I5f2251854333b6a5f1a373e85c9220d0a79a6f6d

Merge "camera2 ndk: Allow nullptr for ACameraCaptureSession_captureCallbacks.onClosed." into qt-qpr1-dev

camera2 ndk: Allow nullptr for ACameraCaptureSession_captureCallbacks.onClosed.

Bug: 134680093
Bug: 146357162

Test: AImageReaderVendorTest

Merged-In: I8d365b434c257e949496d9495d0fa31a18a2e068
Change-Id: I8d365b434c257e949496d9495d0fa31a18a2e068
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 9da975d887ef8d63970e4b11dc9f2c0e0da92705)

Snap for 6073796 from a1caf58b779056e0e9993ee0bf2f52dbe18fa347 to qt-qpr2-release

Change-Id: I2edf148e431ff89f728011e2b3d59846aa297de5

Merge "camera2ndk: ~ACameraCaptureSession shouldn't hold device lock in ACameraDevice_close()." into qt-qpr1-dev

Snap for 6069307 from 6a971a6aec6b5b950017dbc90beaad0fd806240b to qt-qpr2-release

Change-Id: I49f4e212791c1c681d7be9d57de43ca8a8916279

Merge "Camera: Handle onBuffersDiscarded callback" into qt-qpr1-dev

Snap for 6066307 from 9fb726888dda17b68fd924b963d34e6ce9454ba1 to qt-qpr2-release

Change-Id: I91624502382ca4bfa64454ee057193903e074f6d

Added usage to init call for audiostream registration.

Player type AAudio are always initialized with AUDIO_USAGE_MEDIA. Added
fix to initialize with assigned usage.

Bug: 143578354
Test: ran native application with usage of AUDIO_USAGE_NOTIFICATION
Test: atest CtsNativeMediaAAudioTestCases
Change-Id: I170e0b55d7f90b59d9b5129b22f4a9080957994b

Camera: Handle onBuffersDiscarded callback

Use onBuffersDiscarded callback from buffer queue to invalidate the
buffer caches in cameraserver process.

Test: Run testDiscardFreeBuffers, and use trace to profile memory
Bug: 136677409
Bug: 145617243
Change-Id: Ifac5e852e2a1ac50f5c3f2e047966c59eeb5f1ba
Merged-In: Ifac5e852e2a1ac50f5c3f2e047966c59eeb5f1ba
(cherry picked from commit 0160ddd149893fd14c563ac9a124e49443b69fe4)

camera2ndk: ~ACameraCaptureSession shouldn't hold device lock in ACameraDevice_close().

We call disconnectLocked before stopping CameraDevice's looper, in order to avoid this situation:

1) Its possible that an OnResultReceived callback is received, and posts an
AMessage with sp<ACameraCaptureSession> on CameraDevice's looper.

2) Before the looper message is processsed, ACameraDevice_close() is
called by the client, which results in the looper being stopped and
cleared with device lock held.

3) When the looper is getting cleared, the AMessage containg the
ACameraCaptureSession pointer is destructed leading to
~ACameraCaptureSession running without knowing that the device is
being closed, as a result it tries to hold device lock, resulting in
a deadlock.

Bug: 141603005

Test: CTS native tests
Test: use camera2 vndk client for extended periods of time

Change-Id: Ia0d47fc2975981055cd1f2103c1cbe8d76642fe4
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit a8bf1c6e6d210833070152adf130f4d988fc255e)

Snap for 6029402 from 960bbfab7bd5f2fff6afdecb920f21b8eb3fee45 to qt-qpr2-release

Change-Id: Ide6b84afee82c862121b382b1426d10fa5e2b2c2

Snap for 6018910 from 9132522c7e3702227cf65756d11630d51d022f3f to qt-qpr2-release

Change-Id: Ieea93adc07313e867d7c45b429d5040b0ce55688

Camera: Check consumer interface before disconnecting

The internal buffer queue and respective 'mConsumer' may
never get initialized in case the connection and/or
configuration of client shared output surfaces fails.
To avoid possible instabilities check whether the
consumer interface is valid before trying to disconnect.

Bug: 143506890
Test: atest
cts/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java

Change-Id: Ia533233444fd548ddb52f4fde06212a21bc843bc
Merged-In: Ia533233444fd548ddb52f4fde06212a21bc843bc

Merge "do not send max pts gap to full-frame image encoders" into qt-qpr1-dev

Snap for 6016135 from 40f8906f4561b440cf56596d087b7493282d75e8 to qt-qpr2-release

Change-Id: Ie85cd5a9c06bd804567d37e3d002336f41a22c36

Merge changes Iba1c82b0,Ia498f6dd,I16fd11f5 into qt-qpr1-dev

* changes:
Camera: Heic: Wait for output TS before dequeuing output buffers
Camera: Heic: Handle out-of-order buffer outputs
Camera: Heic: Wait for first output tile callback before muxer start

do not send max pts gap to full-frame image encoders

Image encoders don't use pts for rate control and should take
backward pts just fine. Also OMXNodeInstance timestamp restore
assume one input buffer maps to one output.

bug: 141169323
test: vendor testing of Camera CTS
ReprocessCaptureTest-testMixedBurstReprocessing

Change-Id: I17db3b5fb363878c9daf33c914fd2e1e88029cfe
(cherry picked from commit d372bd43a6c70bd243f34465a5dda42629250fc7)

Snap for 6014051 from 03dad63123ccd1ac6aa65d657d85fff9527b66eb to qt-qpr2-release

Change-Id: I0b7cc2d62390a82a9e8b3ce5b26cdedee623a9e0

Merge "C2SoftMpeg4Enc: Handle yStride not equal to aligned width" into qt-qpr1-dev

Snap for 6013205 from d19313d81544c11f94e54c8211f979ce60214789 to qt-qpr2-release

Change-Id: I4b720dd753d971e4fda5ebd3334390f9d74a8771