frameworks-av

Fork

Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

mediaserver: Fix LOCAL_CFLAGS

* Don't override previous defined CFLAGS

Change-Id: I28ab1597e13e53fa9d41569b6bc8b6eb77cbb86d

stagefright: omx: Don't signal dataspace change on legacy QCOM

This isn't supported in legacy media HAL, and causes things like
screen recording to fail when setting up the encoder.

Change-Id: Icb3f7b7dfefcfd72939037241568f28c01fc11ed

libstagefright: Add support for NV21 color format

This adds the native color format 'OMX_SEC_COLOR_FormatNV21Linear' of
exynos5 which is NV21 and needed for the camera. You can turn it on
with:

BOARD_USE_SAMSUNG_COLORFORMAT_NV21 := true

It requires

const char CameraParameters::PIXEL_FORMAT_YUV420SP_NV21[] = "nv21";

to be specified in CameraExtraParameters.h.

Change-Id: I64ca86d074468b1e7a2958a73c3c0380e64a9fc0
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86

Android 7.0.0 Release 7 (NRD91D)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfzAGEACgkQ6K0/gZqxDnjeZgCeNijd6m4vsoXAasM2XdWqXlZg
bHUAnRUDPUgiZ3AV3HARZ2Pb8tsrtXZ7
=CcmN
-----END PGP SIGNATURE-----

Merge tag 'android-7.0.0_r7' into nougat-x86

Android 7.0.0 Release 7 (NRD91D)

Rename dump methods to dumpState

The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: I78136a4baf71630455010e884bc198314cecca7a

camera: Better fix for janky metadata issue

Change-Id: I4f6fa553b68361095d070ac759422383e31828ff

Android 7.0.0 Release 14 (NBD90Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz9FwACgkQ6K0/gZqxDnhmLwCfSHj/OX/a6w2HWDbim6oV3jfp
zcAAnR2IMQb5USQY4RH148QD/0QilxO9
=DJKR
-----END PGP SIGNATURE-----

Merge tag 'android-7.0.0_r14' of https://android.googlesource.com/platform/frameworks/av into cm-14.0

Android 7.0.0 Release 14 (NBD90Z)

Revert "Stagefright: update decoding times for recording with batch-input"

* Crashes sometimes when recording HFR/HSR. Will revisit.

This reverts commit 2c34b2368e4dbd83bc812906f981a2345b3f5a73.

Change-Id: I857ac3e78c3da056d12943b9d7b1905e40d0fce7

Remove incorrect forward declaration

ANativeWindow is a struct, not a class, and the incorrect forward
declaration causes a warning when -isystem is removed from
system/core/include.

Test: m -j native
Bug: 31492149
Change-Id: I3516aa98defe1944a9776c07f52f4ee580366988

IMediaSource: Pack alignment of ReadOption struct

int64_t aligns differently in x86 vs x64, which presents
problems when communicating across Binder.
Use packed struct to avoid problems.

Bug: 30472583
Change-Id: Iacdad792e19c19899cde5289238b5aa8981a9a7a

media: Fix graphic buffer leak.

Bug: 30882996
Test: build and boot
Change-Id: I673c06b225f55f0d9f15800edb8113abc237c4ce
Merged-In: I571a3a9d1705233029abb92f3752416d55ed1056

cameraservice: Resolve message vs start/stop preview races

Move the mutex in start/stopPreview to include the metadata message
management. Fast start/stop sequences could (and would) eventually
cause the messages to be enabled/disabled out of sequence (or while
the camera wasn't ready for it)

This is a port of I367bc45729ce2e858fea972f35e881a755c6021a from cm-11

Change-Id: I9a065f951f628d1c550acbac18493b9ad3853d03

Stagefright: update decoding times for recording with batch-input

(forward-port to CM14)

One buffer from CameraSource contains mutiple input frames
in batch-mode. Output, on the other hand, is generated for
each individual buffer. This will create an imbalance in
the timestamp queue maintained to calculate ctts offsets.
Hence, parse the batch and add individual frame-timestamps
to the decoding times list.

CRs-Fixed: 793989
Change-Id: I8244198db569c2b68fd6fb6c7fb1affbeaa701ff

stagefright: Setup B-frames for codecs

* Fill in required functionality for QCOM codecs.

Change-Id: Ib2b77a4e6a2d61865a0011a79b320daa1a4c55a7

camera: add ability for a device to specify MAX_CAMERAS

Change-Id: I3db99ea4eff63aab3448efe7b2eb51366c658c03

camera: Workaround for GCC-compiled HAL3 drivers

* When starting HAL3 using an older camera library (blob),
the internal structure is aligned differently when compiled
with GCC vs. LLVM. This could cause the "mLocked" field to
be overwritten unintentionally, resulting in all update()
calls from the HAL failing with "CameraMetadata is locked"
even though nothing actually locked it! This would cause
the service to kick out the HAL, and nobody gets a camera.
* Cheap fix is to add a padding byte between mBuffer and
mLocked, and we are back in business.

Change-Id: I3306e14867007a90885aca13e238dee5b49d8da2

omx: Improve debug messages for null buffers

* The log message printed here simply references a Google
bug number, and it's identical in a dozen places. Print the
line number in case we bump into this problem.

Change-Id: Ibb462656adf53cf773b4ddb946a8f1d21113c1e5

avextensions: Fix build for non QCOM

* Dodge unused argument warnings

Change-Id: Iafeae0dd11c6d4726eb4be67fc11f645fa151d8a

camera: Allow devices to load custom CameraParameter code

* Some devices need additional code to load their cameras. Add a hook
for extra classes and symbols to be included.

Change-Id: Ifbe79e25b7ab47c5d468f5179032a4283b3f0df5
(cherry picked from commit 38681625992c0029d32eec98fc7e89d71b855b0e)

Merge branch 'av-aosp.lnx.2.0.r5-rel' of git://codeaurora.org/platform/frameworks/av into cm-14.0

Change-Id: I89c8d6acd445d71abb3d54fb4b00023ed6fb41e9

avextensions: Fill in QC feature support (part 1)

* Add support for hardware AAC encoder
* Add support for FLAC offload
* Add support for ALAC (Apple Lossless) offload
* Set intraperiod for HEVC codec

Change-Id: I96be6a95689d1a69f358fe0840d615f01efb468f

stagefright: Trivial FFMPEG fixes

* Ensure our codecs are never touched for encoders
* Don't duplicate InitOMXParams, use utility class

Change-Id: Icde45b4d8b844fdb52b4f11a862ecb57059d17c0

ffmpeg: Avoid QCOM-specific identifier

Change-Id: I08cd6c05873a694e3f1b41e9d9217c334171fe55

camera: Disable extra HDR frame on QCOM_HARDWARE

Qualcomm camera HALs default to adding an extra zero-exposure frame
to HDR snapshots; this is breaking third-party apps, and we don't
use it in system-bundled apps, so disable it unless explicitly
requested by the client

Change-Id: Iecb868c5c344d972de7f36dc1bd9cc9fdbabaf4e

camera: Don't segfault if we get a NULL parameter

* Values end up NULL on some drivers, don't crash.

Change-Id: Ic897dbd4629cf3af98c85f93be202c382dde806b

audiopolicy: fix compiling for legacy audio

Change-Id: I3597e4c934addb920ddd356f4893ea77638c8cca
Signed-off-by: Xuefer <xuefer@gmail.com>

audiopolicy: Handle legacy startOutput on output command thread too

* Fixes the build for legacy audio policy
* Broken by: de3b1c01146d2103f6bf56e2659a9c650734945a

Change-Id: I990ce609b3da81c462b35c7dd3f7b11d189e2d2e
Signed-off-by: Xuefer <xuefer@gmail.com>
(cherry picked from commit c20f75882a9af6bd5c7e94c24647453a13cd1d41)

libstagefright: squash exynos4 support

commit 1d93faa3ba29cfdbe6d6f97d0f091958b93cfbff
Author: Caio Schnepper <caioschnepper@gmail.com>
Date: Wed Aug 5 16:17:14 2015 -0300

stagefright: Correct Exynos4 stride alignment

For the OMX_COLOR_FormatYUV420Planar color format case, Google's VP9
codec is used, in that case the colors were shifting 16 bytes per
horizontal line, causing green lines to appear on video playback.

Change-Id: I4cf0fd40b79e53882d99f1c3f263c8a98fff1f30

commit e41cc838b6212f8711c550522e8cefc95f003a67
Author: rINanDO <drjisakh@gmail.com>
Date: Mon Aug 10 13:56:56 2015 +0200

stagefright: Exynos4 MPEG4 decoder should set native color format.

Change-Id: I41bee77d48fc0b35691b94585de10269579ae789

commit a50263c53a1ecd0f75688f7042dd5e5d9badbc39
Author: Caio Schnepper <caioschnepper@gmail.com>
Date: Wed Jun 10 22:26:07 2015 -0300

libstagefright: back off exynos4_enhancements HWC_HWOVERLAY usage

The open source hwc doesn't support the
GRALLOC_USAGE_HW_FIMC1 | GRALLOC_USAGE_HWC_HWOVERLAY
combination. Removing HWC_HWOVERLAY allows FIMC1 to do
decode/color conversion.

Change-Id: Ibdfa9e5dd170e99e0d994540979e88e519931641

commit 63286a333bde1aa047de4e2fde8da1b59e42a16d
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Sun Nov 3 02:45:19 2013 +0000

exynos4: libstragefright: add support for samsung colorformat/omx/mfc

Source:
http://git.insignal.co.kr/samsung/exynos/android/platform/frameworks/av/commit/?h=exynos-jb&id=1614612f7ca2a00473d202dbedcb135fadc608ad

Conflicts:

media/libstagefright/ACodec.cpp
media/libstagefright/OMXCodec.cpp

cherry pick from 906eba9f

Change-Id: I1c174f8e9fa9bd3ed16a0399f070b6680f6a331c

Change-Id: I47f5b09b37ea5376a45c80c9dd91a7fbd0c3361a