diff --git a/gralloc/QtiGralloc.h b/gralloc/QtiGralloc.h index d25b264e..f43da3f1 100644 --- a/gralloc/QtiGralloc.h +++ b/gralloc/QtiGralloc.h @@ -29,7 +29,7 @@ * 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. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * SPDX-License-Identifier: BSD-3-Clause-Clear */ @@ -144,6 +144,8 @@ static const MetadataType MetadataType_MemHandle = {VENDOR_QTI, QTI_MEM_HANDLE}; static const MetadataType MetadataType_TimedRendering = {VENDOR_QTI, QTI_TIMED_RENDERING}; static const MetadataType MetadataType_CustomContentMetadata = {VENDOR_QTI, QTI_CUSTOM_CONTENT_METADATA}; +static const MetadataType MetadataType_BufferDequeueDuration = {VENDOR_QTI, + QTI_BUFFER_DEQUEUE_DURATION}; // 0 is also used as invalid value in standard metadata static const MetadataType MetadataType_Invalid = {VENDOR_QTI, 0}; diff --git a/gralloc/QtiGrallocMetadata.h b/gralloc/QtiGrallocMetadata.h index 6d139ddb..61a42210 100644 --- a/gralloc/QtiGrallocMetadata.h +++ b/gralloc/QtiGrallocMetadata.h @@ -29,7 +29,7 @@ * 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. + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. * SPDX-License-Identifier: BSD-3-Clause-Clear */ @@ -81,6 +81,7 @@ #define QTI_EARLYNOTIFY_LINECOUNT 10031 // Heap Name #define QTI_HEAP_NAME 10032 +#define QTI_BUFFER_DEQUEUE_DURATION 10033 // 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 41862e4e..b20be66b 100644 --- a/gralloc/QtiGrallocPriv.h +++ b/gralloc/QtiGrallocPriv.h @@ -30,41 +30,11 @@ */ /* -* 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. -*/ + * Changes from Qualcomm Innovation Center are provided under the following license: + * + * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * SPDX-License-Identifier: BSD-3-Clause-Clear + */ #ifndef __QTIGRALLOCPRIV_H__ #define __QTIGRALLOCPRIV_H__ @@ -147,6 +117,8 @@ struct MetaData_t { struct VideoTranscodeStatsMetadata video_transcode_stats; int32_t videoEarlyNotifyLineCount; char heapName[MAX_NAME_LEN]; + /* Last buffer dequeue duration used by SmoMo to detect blocking */ + int64_t bufferDequeueDuration; }; namespace qtigralloc {