diff options
| -rw-r--r-- | gralloc/QtiGralloc.h | 7 | ||||
| -rw-r--r-- | gralloc/QtiGrallocDefs.h | 8 | ||||
| -rw-r--r-- | gralloc/QtiGrallocMetadata.h | 6 | ||||
| -rw-r--r-- | gralloc/QtiGrallocPriv.h | 1 | ||||
| -rw-r--r-- | gralloc/gralloc_priv.h | 2 | ||||
| -rw-r--r-- | include/display_extn_intf.h | 37 |
6 files changed, 28 insertions, 33 deletions
diff --git a/gralloc/QtiGralloc.h b/gralloc/QtiGralloc.h index c8e4ef8c..f14821c5 100644 --- a/gralloc/QtiGralloc.h +++ b/gralloc/QtiGralloc.h @@ -27,6 +27,10 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Changes from Qualcomm Innovation Center are provided under the following license: + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear */ #ifndef __QTIGRALLOC_H__ @@ -101,6 +105,9 @@ static const MetadataType MetadataType_VideoTranscodeStats = {VENDOR_QTI, static const MetadataType MetadataType_VideoTimestampInfo = {VENDOR_QTI, QTI_VIDEO_TS_INFO}; +static const MetadataType MetadataType_VideoEarlyNotifyLineCount = {VENDOR_QTI, + QTI_EARLYNOTIFY_LINECOUNT}; + static const MetadataType MetadataType_FD = {VENDOR_QTI, QTI_FD}; static const MetadataType MetadataType_PrivateFlags = {VENDOR_QTI, QTI_PRIVATE_FLAGS}; diff --git a/gralloc/QtiGrallocDefs.h b/gralloc/QtiGrallocDefs.h index eeac4785..efac776c 100644 --- a/gralloc/QtiGrallocDefs.h +++ b/gralloc/QtiGrallocDefs.h @@ -29,6 +29,11 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear + */ + #ifndef __QTIGRALLOCDEFS_H__ #define __QTIGRALLOCDEFS_H__ @@ -128,6 +133,9 @@ #define HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_2_BATCH 0x128 #define HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_4_BATCH 0x129 #define HAL_PIXEL_FORMAT_NV12_UBWC_FLEX_8_BATCH 0x130 +#define HAL_PIXEL_FORMAT_NV12_FLEX_2_BATCH 0x140 +#define HAL_PIXEL_FORMAT_NV12_FLEX_4_BATCH 0x141 +#define HAL_PIXEL_FORMAT_NV12_FLEX_8_BATCH 0x142 // FSC Formats #define HAL_PIXEL_FORMAT_RGB888_UBWC_FSC 0x131 diff --git a/gralloc/QtiGrallocMetadata.h b/gralloc/QtiGrallocMetadata.h index 98a12c67..c3889b2c 100644 --- a/gralloc/QtiGrallocMetadata.h +++ b/gralloc/QtiGrallocMetadata.h @@ -27,6 +27,10 @@ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Changes from Qualcomm Innovation Center are provided under the following license: + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear */ #ifndef __QTIGRALLOCMETADATA_H__ @@ -73,6 +77,8 @@ #define QTI_CUSTOM_CONTENT_METADATA 10029 // Video transcode metadata stat #define QTI_VIDEO_TRANSCODE_STATS 10030 +// Early Notify line count +#define QTI_EARLYNOTIFY_LINECOUNT 10031 // Used to indicate to framework that internal definitions are used instead #define COMPRESSION_QTI_UBWC 20001 #define INTERLACED_QTI 20002 diff --git a/gralloc/QtiGrallocPriv.h b/gralloc/QtiGrallocPriv.h index 56e2b1bc..2214291f 100644 --- a/gralloc/QtiGrallocPriv.h +++ b/gralloc/QtiGrallocPriv.h @@ -145,6 +145,7 @@ struct MetaData_t { uint32_t timedRendering; /* Video transcode stat populated by video decoder */ struct VideoTranscodeStatsMetadata video_transcode_stats; + int32_t videoEarlyNotifyLineCount; }; namespace qtigralloc { diff --git a/gralloc/gralloc_priv.h b/gralloc/gralloc_priv.h index 8750c3ca..7d9019db 100644 --- a/gralloc/gralloc_priv.h +++ b/gralloc/gralloc_priv.h @@ -73,7 +73,7 @@ #define USE_SYSTEM_HEAP_FOR_SENSORS GRALLOC_PROP("use_system_heap_for_sensors") #define ROUND_UP_PAGESIZE(x) roundUpToPageSize(x) -inline int roundUpToPageSize(int x) { +inline size_t roundUpToPageSize(size_t x) { return (x + (getpagesize() - 1)) & ~(getpagesize() - 1); } diff --git a/include/display_extn_intf.h b/include/display_extn_intf.h index 9230917f..413ea471 100644 --- a/include/display_extn_intf.h +++ b/include/display_extn_intf.h @@ -30,37 +30,8 @@ /* * Changes from Qualcomm Innovation Center are provided under the following license: * - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted (subject to the limitations in the - * disclaimer below) provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE - * GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT - * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear */ #ifndef __DISP_EXTN_INTF_H__ @@ -95,12 +66,14 @@ struct FBTLayerInfo { int32_t dataspace = 0; int32_t max_buffer_count = 3; bool secure = false; + int32_t format = 0; bool operator != (FBTLayerInfo &f) { return (width != f.width || height != f.height || dataspace != f.dataspace || - secure != f.secure); + secure != f.secure || + format != f.format); } }; |