frameworks-av

Fork

Setup FFMPEG audio/mpeg-L2 codec correctly

Now that Android supports audio mp2, one has to make sure the FFMPEG
variant is configured correctly when being used.

Add paths and system libraries for swcodec APEX

- libdrm.so, libhardware_legacy.so: required by drm_gralloc
- libashmemd_client.so: suppress recurring error messages in logcat,
maybe not required from functionality point of view
- /apex/com.android.media.swcodec/${LIB}: required for
android.hardware.graphics.mapper@2.0.so

Disable CFI

The presence of CFI sanitizer makes the corresponding libraries to be
missing from the com.android.media.swcodec APEX, when building for x86.

libstagefright: Extended media support via FFMPEG

* Original work by Michael Chen - https://github.com/omxcodec
* Original Kitkat port by Chih-Wei Huang / Android X86 project
* Additional work up to Nougat by:
- Steve Kondik
- Ricardo Cerqueira
- Keith Mok
- Scott Mertz
- Ethan Chen
- Diogo Ferreira
* Additional work up to Oreo/Pie/Q by:
- Michael Goffioul

Change-Id: Ie871b56f6f6d895a87de8c8920e9e8692382b420

stagefright: allow multiple custom OMXPlugins

* Separated by comma(,)
* Example: media.sf.omx-plugin=libffmpeg_omx.so,libsomxcore.so

Change-Id: I15556a48df282b01f54ca864317eafff5468e739
Signed-off-by: Jesse Chan <jc@lineageos.org>

stagefright: Add support for loading a custom OMXPlugin

* To facilitate moving the stagefright-plugins glue out of the
framework, support is added to OMXMaster to load multiple
external plugins besides internal/vendor versions.
* This is currently limited to one plugin, defined by the
"mm.sf.omx-plugin" system property. The code will allow any
number of libraries to be loaded, though.
* Should also be useful for nonstandard vendor implementations too.

Change-Id: I27d7e16ad56baa17754d8ea47a8c608a0d73d6f1

nuplayer: skip bad SAR values

Historically there are two definitions of SAR:

1. Storage Aspect Ratio
2. Sample Aspect Ratio

The first one is used in MPEG2 terminology, while the second is used
in MPEG4-AVC terminology.

The MPEG2 terminology actually means the real frame dimension (w:h),
while the MPEG4-AVC terminology means the shape of individual pixels.
It's called PAR (Pixel Aspect Ratio) in MPEG2 terminology.

Android apparently uses the second definition as comments in the code.
However, some video files include SAR tags in MPEG2 terminology sense.
For example,

08-14 18:13:45.212 2841 4769 I NuPlayer: int32_t width = 856
08-14 18:13:45.212 2841 4769 I NuPlayer: int32_t height = 480
08-14 18:13:45.212 2841 4769 I NuPlayer: int32_t sar-width = 852
08-14 18:13:45.212 2841 4769 I NuPlayer: int32_t sar-height = 480

That makes Android calculate the DAR (Display Aspect Ratio)
incorrectly, where DAR = FAR (Frame Aspect Ratio) x SAR.
As a result the video is stretched strangely.

To workaround it, skip the SAR tags if they look like the
Storage Aspect Ratio.

media: enable dithering for RGB565 conversion

This seems to improve video playback quality.

Inspired by a patch from WuZhen.

Allow screenrecord usage on Android-x86

Selects a supported color format for screenrecord (
OMX_COLOR_FormatYUV420Planar instead of OMX_COLOR_FormatAndroidOpaque)
and removes a check on SoftVideoEncoderOMXComponent.cpp
in order to make screenrecord work on Android-x86.

Don't use YV12 color format for video decoding

YV12 is not supported by Mesa yet. This has to be reverted
when we can enable h/w decoder.

CameraSource: set up right frame rate

If camera recorder uses HW codec, the capabilities of the codec
are from media_profile.xml; If using SW codec, it is invisible
to the applications, In other words, the applications won't be
able to use the codec or query the capabilities of the codec
at all, it only gives some ranges. StagefrightRecorder will
use default parameters to configure camera, as for framerate,
it should be from camera HAL feedback.

Issue:AXIA-1446
Change-Id: I77bf41239a19d26e2da1c28258288fdaa1c98297
Signed-off-by: Hua Wang <Hua.Wang@windriver.com>

FLACExtractor: Add more sample rates support

In FLACExtractor.cpp, it has function to check file's sample rate.
If the input sample rate is not in its list, it will return "unsupported
sample rate" issue. Modify code to make other sample rates (100,1k,42k,46k)
pass the check

Issue: AXIA-1441
Change-Id: I48f91119275560ec6d00feb0dedc70d10aa55262
Signed-off-by: Xiaobing Feng <xiaobing.feng@windriver.com>
Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>

Change max width and height supported by H.263 decoder.

Currently this is set to CIF PAL resolution (352x288) which
won't calculate the actual output buffer size for higher resolutions

The h.263 decoder needs the max width and height supported to be able
to decode

H.263 decoders supports: QCIF, CIF, D1 and 16CIF; all PAL.

Change-Id: If5e44c522cb3cb56bb6235ec2992e2544b1737e9
Original-Change-Id: I7f8d2ae4263925ac4cf9250404ef92fc819ca33a
Signed-off-by: Daniel Charles <daniel.charles@intel.com>

SW encode: Fix output buffer size

The output buffer size needs to be updated if the resolution is updated.
The output buffer was configured for QCIF resolution when the actual
resolution was VGA. Buffer overflow was resulting.

Change-Id: Ieca3943d8d67bfcfcf49fed95d17be712f4b14b5
Signed-off-by: Robert Crabtree <robertx.l.crabtree@intel.com>

Merge cherrypicks of [10301183, 10301340, 10301110, 10299537, 10300908, 10301450, 10300619, 10301451, 10301654, 10301341, 10301342, 10301343, 10301344, 10301508, 10301184, 10301185, 10301309, 10301290, 10301310, 10301345, 10301346, 10301464, 10301291, 10300931, 10301382, 10301383, 10301465, 10301384, 10301385, 10301408, 10301386, 10299538, 10301387, 10301388, 10301389, 10301390, 10301391, 10301292, 10301392, 10301393, 10301694, 10301695, 10301489, 10299807, 10299808, 10299809, 10300620, 10301491, 10301111, 10301348] into qt-qpr2-release

Change-Id: I2c74b6cf7b3287a6fc2686bcc9612816d58348ed

Revert "audiopolicy: align input and output devices for engine"

This reverts commit 4b8d5ce58d98d4a163f63e17735450a7cac4821c.

Bug: 132241823
Reason for revert: Breaks Screen Mirroring during Live caption

Change-Id: I4bf711e5c5e4233fcf58bda5477380b488fde2fa
(cherry picked from commit e0d004fe12fc2535d62d52bea0666b690ba057b0)
(cherry picked from commit 66d0e72c9da1d5af852556872262a1e928796389)

Merge cherrypicks of [10297641, 10298303, 10298494, 10298514, 10297196, 10298164, 10297642, 10297643, 10296046, 10296047, 10298245, 10298246, 10297197, 10297198, 10298495, 10298496] into qt-qpr2-release

Change-Id: I5ee541576fb58dfb37fb25b9c7982c941c3cf005

[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt

Fix destPtr was not pointing to destination raw pointer.

bug: 144506242

Test: sts
ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_12#testPocBug_144506242

Change-Id: Ia1b8f755daaada2f1411abeb3cb5b832a72b3c82
(cherry picked from commit 8464bfa975afe360bb8e3dd59c036ce4a4995fa8)

[DO NOT MERGE] Fix heap buffer overflow for releaseSecureStops.

If the input SecureStopRelease size is less than sizeof(uint32_t)
in releaseSecureStops(), an out of bound read will occur.

bug: 144766455
bug: 144746235
bug: 147281068

Test: sts
ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_11#testPocBug_144766455

Change-Id: Ieccdd86ad86966fbf1dde70d3b3fb73d6dd124a4
(cherry picked from commit fa237c4f76b7b9369d9c499bfdc81e5072ddde86)

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