frameworks-av

Fork

ACodec: query grid config from component even if grid is disabled

bug: 138397508
test: cts HeifWriterTest on devices that can enable OMX HEIC encoder.

Change-Id: I6e8437c0b8cc4901e943f2ed7cb23cb16ed096fe
(cherry picked from commit 7b0ff1953ddeee2e83c8f8871cdf69db3ac32c85)

Increase max dequeue buffer count only for non-secure decoders

Since secure buffers are limited resources, use less buffers for secure
output display.

Bug: 138295327
Bug: 140087403
Change-Id: If763bed99cecc0acdd88d0111d30aa4ab98bce71

Merge "bufferpool2: fix native handle race condition" 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: I4ebdb2f02409fdf045a77132bf7a1b24249ad948
Merged-In: Ib33f5b592185a67204997213bab1ac2594d90d37

Merge "Add more tests for battery checker code" into qt-qpr1-dev

Merge "Add sub-elements for "Variant" type" into qt-dev am: 2322d0f769
am: 0a5f121870

Change-Id: I68267f21d090a7bf791af374e1fab29ca6193af7

Merge "Add sub-elements for "Variant" type" into qt-dev
am: 2322d0f769

Change-Id: Ic34e6c7e131344b4efba00342ba1d73de7f82ecd

Merge "Add sub-elements for "Variant" type" into qt-dev

clearkey hidl CryptoPlugin: misc & security fixes

* propagate decrypt error message
* reject native handle output
* validate subsample sizes

Bug: 137283376
Test: cryptopoc
Change-Id: Ic4267fdc0e391bdecc1caab3b8fd4aa34ad76541

[RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes

* reject native handle output
* validate subsample sizes

Bug: 137283376
Test: cryptopoc
Change-Id: Ic4267fdc0e391bdecc1caab3b8fd4aa34ad76541

Add more tests for battery checker code

There is no change on functionality, only refactoring
to allow unit testing.

bug: 138381810
bug: 139440234

Change-Id: Id927c091607d9ea5ea84b6e292d53154ef5171a6

Merge "Add more testing for ResourceManagerService" into qt-qpr1-dev

Add more testing for ResourceManagerService

Refactor the calls to other system services to an interface
to allow more testing.

Add test for callbacks to BatteryStatsService and
SchedulingPolicyService.

bug: 138381810
bug: 139440234
test: presubmit
Change-Id: I04408ad5a126e9f4083b5806b228449cb432acf6

Codec2 VTS: Move device resource files to data/local/tmp am: f08d61d30e
am: 3cd2149e94

Change-Id: Ife96387038863cae76768eb3469143f5601b953e

Codec2 VTS: Move device resource files to data/local/tmp
am: f08d61d30e

Change-Id: I8515c53d9b0e4a5375359aca877102d2e5758b09

Merge changes from topic "gav1_to_qpr1" into qt-qpr1-dev

* changes:
Switch av1 implementations from aom to gav1
stagefright: Use libgav1 for AV1 decoding
codec2: Add log message for the AV1 decoder
codec2: Implement gav1 decoder component
codec2: libgav1 integration part 1

Add sub-elements for "Variant" type

The Quirk, Attribute, Alias, Limit and Feature elements are added to
"Variant" type for fixing VTS error.

Bug: 139506623
Test: m -j40 vts && vts-tradefed run vts -m VtsValidateMediaCodecs
Change-Id: I55066cc1de8b820c24faccdfb469377c897e9808

Switch av1 implementations from aom to gav1

Deprecate the aom implementation in favor of the faster/smaller gav1
implementation.

Bug: 130249450
Bug: 131989882
Test: playback multiple av1 clips
Change-Id: I04a3507376e32b1f7a037809cbb7848e65a404e5

Codec2 VTS: Move device resource files to data/local/tmp

Some devices make /sdcard a symbolic link to a non-constant target. The
target changes between the setup and the execution, so files pushed to
/sdcard during the setup cannot be found when the test runs.

Test: vts-tradefed run vts -m VtsHalMediaC2V1_0Host

Bug: 138388013
Change-Id: Ia27bd9eedfc6f97225abb553c4b8efbb8957966e

bufferpool2: handle transfer to closed connection
am: ccc32cb955

Change-Id: I5b15b8980cb728fa3b24af689088f4f89067b62d

stagefright: Use libgav1 for AV1 decoding

Use the c2.android.gav1.decoder component instead of
c2.android.av1.decoder component.

All the AV1 related CTS tests still pass.

Bug: 131989882
Bug: 130249450
Test: cts-tradefed run commandAndExit cts-dev --include-filter CtsMediaTestCases --module-arg "CtsMediaTestCases:include-filter:android.media.cts.DecoderTest#testAV1*" --module-arg "CtsMediaTestCases:include-filter:android.media.cts.AdaptivePlaybackTest#testAV1*"
Merged-In: I519040c7a7974058d1d2a4f210bb93f1c8f50ea1
Change-Id: I519040c7a7974058d1d2a4f210bb93f1c8f50ea1

codec2: Add log message for the AV1 decoder

Add a log message about which AV1 decoder is being used.

Also remove the TODO for renaming the gav1 component.

Bug: 131989882
Bug: 130249450
Test: cts-tradefed run commandAndExit cts-dev --include-filter CtsMediaTestCases --module-arg "CtsMediaTestCases:include-filter:android.media.cts.DecoderTest#testAV1*" --module-arg "CtsMediaTestCases:include-filter:android.media.cts.AdaptivePlaybackTest#testAV1*"

Merged-In: I3eec15cc74d8ab8f9e6d4539a25407cf93d4efeb
Change-Id: I3eec15cc74d8ab8f9e6d4539a25407cf93d4efeb

codec2: Implement gav1 decoder component

Note that this CL does not switch the default AV1 decoder to gav1
yet. That will be done in a follow-up.

Test: CTS media tests related to AV1 still pass.
Bug: 131989882
Bug: 130249450
Merged-In: Ifb88d0f51d85e59fa37d5cead8a5d4757067fedd
Change-Id: Ifb88d0f51d85e59fa37d5cead8a5d4757067fedd

codec2: libgav1 integration part 1

This CL contains stuff that are pretty much copied over from the
libaom component. It makes it easier to review the series of CLs.

All the libgav1 specific functions will follow in a subsequent CL.

Test: all AV1 CTS tests still pass.
Bug: 131989882
Bug: 130249450
Merged-In: Iaafbf5379577bd42c7de64c7ec96d5b0fbb45b18
Change-Id: Iaafbf5379577bd42c7de64c7ec96d5b0fbb45b18

bufferpool2: handle transfer to closed connection

Handle transfer to closed connection properly. Also avoid spinlocking
during invalidation.

Bug: 139506073
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Merged-In: I9037ab0bde48a51b2b97158ecd0086dac84f8b26
Change-Id: I9037ab0bde48a51b2b97158ecd0086dac84f8b26

Merge "Add ResourceManager unit tests to presubmit" into qt-qpr1-dev

Add ResourceManager unit tests to presubmit

bug: 138381810
bug: 139440234
Change-Id: Id6a447ca070322b21d1b07457c16a6a5e2a8a1fe

Change video battery stats to better track actual use

Reporting video on upon first queue/dequeue buffer activity,
off after a period of inactivity (3 sec currently).

bug: 138381810
test:

Manual testing for now; unit tests will come after.
With BatteryStatService instrumented to print out noteVideo*:

Test case #1: Camera recording (using GCA):

Camera creates encoder immediately when Video tab is entered, but
recording won't start until button is pressed. After recording is
stopped, a new encoder is again created to prepare for next session.
So under old scheme, video is on as soon as we're in Video tab, and
off/on even pairs are seen when video is stopped. Video stats is
basically always On when we're in video tab.

With this CL one should see:

- There shouldn't be videoOn when Video tab is first entered
- Start recording and there should be a videoOn.
- Stop recording and there should be a videoOff, AND videoOn shouldn't
immediately follow.
- Kill camera app during active recording, video should be restored
to Off.

Test case #2: Playback of video clips in Photos with pause

With old scheme pausing state will be videoOn because codec instance
is still there. With new scheme, videoOff should come after video
is paused for 3 sec, and video On should come again when video is
resumed.

Change-Id: Ifa8aa5d8c2c95fa25393fcb936e6e54578716783

Add support for combining and remove individual resource

- Fix ResourceManagerSerivce handling of adding same-type
resource in multiple calls, combine entries with the same
<type, subtype>. This is not required in existing usage,
bug could be required if we allow same type to be added
incrementally (eg. memory usage).

- Add api for removing some resources. Currently we can
add resources in multiple calls, but removeResource always
remove all resources of that client. We need this to toggle
battery stat On/Off based on actual usage of the codec.

- Add unit tests for the above.

bug: 138381810
test: ResourceManagerService_test; CTS ResourceManangerTest.

Change-Id: Icdba6c6b4c517755291668c52764169aac3071ea

Merge "Report video battery on/off from mediaserver" into qt-qpr1-dev