From patchwork Wed Jun 1 09:06:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36020 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3309591pzj; Wed, 1 Jun 2022 02:06:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyh01ORp8e40lHCgdgqNhpdv9gPScBBhSjTx6OsIDSU3KrWsgWDdU6urRzV7YijSXwH4bq2 X-Received: by 2002:a05:6402:1151:b0:42a:be24:5529 with SMTP id g17-20020a056402115100b0042abe245529mr68759380edw.366.1654074415831; Wed, 01 Jun 2022 02:06:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654074415; cv=none; d=google.com; s=arc-20160816; b=ZjnXPtPe5TRTLRVyPno+3I+95DZtR8E8iEeGNLC+HFQXclBKJZXWbXk/euhzW7Lv29 MVplv5wiP7DudQhlxttucjZmilSVDy6hhp18tr6U7ApPP1ckJBIYF6oQPw0yEhfEOXgM gQjJzm6U6ghvRCL1DVfT4cPs49humFRr/d1SsPJxkAqMaQVFLjk9QgJW18kZqcuHBNcK pbh4wfIdB32wAArhd1hCPcUeRiavxmubVzqvAgUB7eLtRvUxxYPJdcWWo0hXEYDVOs8B ouc1Mo8FVV0W8IQ5xYE0Mh5uvmOvOlkb5sjB4rDxBQX6Vt7ukLNjl94Ba9TuWi7Ba6QC 7OeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=cWXSdwBO7skCaDoxVHb8Ak/AvFD2wsRo3Rr0IinjJ/E=; b=GeHQzByt08QRALRiVijyzUeIJKWxa5fGC4q6LqmG2/K5lh6auKf8bw6KtxbxgZICb6 0MpY3cKvX8WKZ1E6Gn+tpwQ/LWxzxPIw/AN2mfOc4SKhBy4I9JPg40zU0xYel8DCdYt1 YXezxLJT3B2dLzWdgw+X+dpz4Tl2V6KMyFM4VoYokwwoAusDyqGPRSEdCvIXBE7lNK3S JjqsA/4ZBbt97bde5Iqa745hF/wac/Xf6kYFWgTnOI/VQyCJPzT42FGMQKXyNLvA7uIz UstMZLnbmv4g/Etqwugc8o1bZDVoLIkgQIlYg+XfveNDtFh5hTBtW2xhqzv97eKs+R+q UaOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Ip4RgvTd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o17-20020a056402039100b0042d7c8e4ee2si1010156edv.624.2022.06.01.02.06.55; Wed, 01 Jun 2022 02:06:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Ip4RgvTd; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 447F268B721; Wed, 1 Jun 2022 12:06:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45CC968B6DA for ; Wed, 1 Jun 2022 12:06:10 +0300 (EEST) Received: by mail-pf1-f178.google.com with SMTP id 15so1407421pfy.3; Wed, 01 Jun 2022 02:06:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=t+Odd/Td7cc0cgkGbjJ84eE0biqvNbP5k3UqCjLvFig=; b=Ip4RgvTddeaykJ8Koa9QoXs6kxDH9qlpAydfxpy1KQuUNYHNgDKGjfP7u7aIqmlr8d pABPjuJUh172jNarAF8LMsz5UUsTRSb9nnMHRthUAiNaOzDauHCTzUTpqNe1goAyvnqu l+oSKv/ad4PLW2aBqJWmfdiKF1RbdoIq+dPCH12MMXzb4OO3WioMRtMnrcoSirPdZUOI xLGDbPT2LgVEGkR9T9A5hFnfhonA+UPEcR7uW8wMCWsMwQmfHM1SWNMrwDSVF5uXeIi2 qjcIsMrxmGhJfqp4FmIeAn0A0hMn5qhrRhco+fmIGjCcn3OwzrTlKj3PGUQvBpcJAAV5 QVcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=t+Odd/Td7cc0cgkGbjJ84eE0biqvNbP5k3UqCjLvFig=; b=FiSJ/3gJ5UmcWKZAS68QX21xVjiv8vea++w+7eQ5Y75rtKUVCF8X7h+yWF8VkWk/db lcFccAb8idZxJV//85dkR2xF6Adx9Xrs9sCAyXHjnpBdCCnKGvRRQDtYvh1v+fyIHyB6 svMogFkYKLa4/4vHuvSv+/n57XqSNClVcmWIwYA/Xc5DJXWlYvHayLoH3PKcl/bLRn82 2AeXWqWYTgHuGYv0JoSCQyOZ6j4I8XW265LyVW4c0KIFNWORhUueIMCHVpLWqnCWdvqk sJus2mPNPymEcHxB8N4Jz9eMQO3qLL+5O7rxvnd3pBVUX1/yaJimjqyHxtVB4NdBP7We tdLQ== X-Gm-Message-State: AOAM5302kx/+HTvZMofvuzrM9UgF2KPUMNIHaJVsBiZ2GHjExuIq4IcX kBpaGmTqqit5jWOUiAGzvGfyat1kBZM= X-Received: by 2002:a65:508c:0:b0:3fb:882c:85ef with SMTP id r12-20020a65508c000000b003fb882c85efmr23398223pgp.39.1654074368640; Wed, 01 Jun 2022 02:06:08 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id t10-20020a170902d14a00b0015e8d4eb1dbsm979919plt.37.2022.06.01.02.06.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 02:06:08 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <4ee6cb47db828e4a91f5e349fab2678c07a95f82.1654074366.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 01 Jun 2022 09:06:01 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 1/6] avutil/frame: Add av_frame_copy_side_data() and av_frame_remove_all_side_data() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: w6Ctq/CmN6fL From: softworkz Signed-off-by: softworkz Signed-off-by: Anton Khirnov --- doc/APIchanges | 4 +++ libavutil/frame.c | 67 +++++++++++++++++++++++++++------------------ libavutil/frame.h | 32 ++++++++++++++++++++++ libavutil/version.h | 2 +- 4 files changed, 78 insertions(+), 27 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 337f1466d8..e5dd6f1e83 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-05-26 - xxxxxxxxx - lavu 57.26.100 - frame.h + Add av_frame_remove_all_side_data(), av_frame_copy_side_data(), + AV_FRAME_TRANSFER_SD_COPY, and AV_FRAME_TRANSFER_SD_FILTER. + 2022-05-23 - xxxxxxxxx - lavu 57.25.100 - avutil.h Deprecate av_fopen_utf8() without replacement. diff --git a/libavutil/frame.c b/libavutil/frame.c index fbb869fffa..bfe575612d 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -271,9 +271,45 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } +void av_frame_remove_all_side_data(AVFrame *frame) +{ + wipe_side_data(frame); +} + +int av_frame_copy_side_data(AVFrame* dst, const AVFrame* src, int flags) +{ + for (unsigned i = 0; i < src->nb_side_data; i++) { + const AVFrameSideData *sd_src = src->side_data[i]; + AVFrameSideData *sd_dst; + if ((flags & AV_FRAME_TRANSFER_SD_FILTER) && + sd_src->type == AV_FRAME_DATA_PANSCAN && + (src->width != dst->width || src->height != dst->height)) + continue; + if (flags & AV_FRAME_TRANSFER_SD_COPY) { + sd_dst = av_frame_new_side_data(dst, sd_src->type, + sd_src->size); + if (!sd_dst) { + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + memcpy(sd_dst->data, sd_src->data, sd_src->size); + } else { + AVBufferRef *ref = av_buffer_ref(sd_src->buf); + sd_dst = av_frame_new_side_data_from_buf(dst, sd_src->type, ref); + if (!sd_dst) { + av_buffer_unref(&ref); + wipe_side_data(dst); + return AVERROR(ENOMEM); + } + } + av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); + } + return 0; +} + static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) { - int ret, i; + int ret; dst->key_frame = src->key_frame; dst->pict_type = src->pict_type; @@ -309,31 +345,10 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) av_dict_copy(&dst->metadata, src->metadata, 0); - for (i = 0; i < src->nb_side_data; i++) { - const AVFrameSideData *sd_src = src->side_data[i]; - AVFrameSideData *sd_dst; - if ( sd_src->type == AV_FRAME_DATA_PANSCAN - && (src->width != dst->width || src->height != dst->height)) - continue; - if (force_copy) { - sd_dst = av_frame_new_side_data(dst, sd_src->type, - sd_src->size); - if (!sd_dst) { - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - memcpy(sd_dst->data, sd_src->data, sd_src->size); - } else { - AVBufferRef *ref = av_buffer_ref(sd_src->buf); - sd_dst = av_frame_new_side_data_from_buf(dst, sd_src->type, ref); - if (!sd_dst) { - av_buffer_unref(&ref); - wipe_side_data(dst); - return AVERROR(ENOMEM); - } - } - av_dict_copy(&sd_dst->metadata, sd_src->metadata, 0); - } + if ((ret = av_frame_copy_side_data(dst, src, + (force_copy ? AV_FRAME_TRANSFER_SD_COPY : 0) | + AV_FRAME_TRANSFER_SD_FILTER) < 0)) + return ret; ret = av_buffer_replace(&dst->opaque_ref, src->opaque_ref); ret |= av_buffer_replace(&dst->private_ref, src->private_ref); diff --git a/libavutil/frame.h b/libavutil/frame.h index 33fac2054c..a868fa70d7 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -850,6 +850,30 @@ int av_frame_copy(AVFrame *dst, const AVFrame *src); */ int av_frame_copy_props(AVFrame *dst, const AVFrame *src); + +/** + * Copy side data, rather than creating new references. + */ +#define AV_FRAME_TRANSFER_SD_COPY (1 << 0) +/** + * Filter out side data that does not match dst properties. + */ +#define AV_FRAME_TRANSFER_SD_FILTER (1 << 1) + +/** + * Copy all side-data from src to dst. + * + * @param dst a frame to which the side data should be copied. + * @param src a frame from which to copy the side data. + * @param flags a combination of AV_FRAME_TRANSFER_SD_* + * + * @return >= 0 on success, a negative AVERROR on error. + * + * @note This function will create new references to side data buffers in src, + * unless the AV_FRAME_TRANSFER_SD_COPY flag is passed. + */ +int av_frame_copy_side_data(AVFrame* dst, const AVFrame* src, int flags); + /** * Get the buffer reference a given data plane is stored in. * @@ -901,6 +925,14 @@ AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, */ void av_frame_remove_side_data(AVFrame *frame, enum AVFrameSideDataType type); +/** + * Remove and free all side data instances. + * + * @param frame from which to remove all side data. + */ +void av_frame_remove_all_side_data(AVFrame *frame); + + /** * Flags for frame cropping. diff --git a/libavutil/version.h b/libavutil/version.h index 1b4b41d81f..2c7f4f6b37 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ From patchwork Wed Jun 1 09:06:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3309778pzj; Wed, 1 Jun 2022 02:07:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwj/GxEP1FOl7+8BMi7Pw8xmKg/fSIGkbD9GJ+yx1qKNTYLezUctIyxPEH4NOJUplKiBBKh X-Received: by 2002:aa7:cb4a:0:b0:42d:d232:34d7 with SMTP id w10-20020aa7cb4a000000b0042dd23234d7mr15574881edt.201.1654074440776; Wed, 01 Jun 2022 02:07:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654074440; cv=none; d=google.com; s=arc-20160816; b=pa1tLKmGuywcTsNWeT1saDRdMg0Ipz1ecWXOhSNPqUARtzz7mtNld9JoQ/ae21IkiW oDAV4tFqL21vQ35tUl8OjoY1dxJiSEqxPyBq4AB/24pgjPm1LXOaRoU+EMqMlDX0pqrS 92WWQYWXySsnxPjtjFs1g+yKwJ4fqVVOecROWpcvyvwXhf1k8ESgq+MbKrJV2cT/vhKg qJLQ0qXB2Lq/2+lqJK8FY/SOQOTVbAFwPYW1qRAGPibnwI+fppUfoAjcXyEMuIhiuVsR klAif86eE5e75vpsOcBx0LllN6gW4dGktxGGmGybwxV+VETXKHztiW/hRU5sxJ+DXEOP H4Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=8YW+9azwue3ZKcaWIJN3kh2U6xbrBMbjWFMO5cgVeug=; b=ADhNslgZc/X4OEU+v2p3suQcbFbzfEhOaY0SHRXllouaDn+8aG06LGg6wLjbpD3eRi 7iULmOB8iqknARw6bKZ2z2QvjmeP1ggMSSk9boae1m8WImkwWo8YudtwgVSfjRPxUipD ffXf5mwmw8IxRejKI7B3Uf+p9vQQqWPAvrd3PkVbwH3wmeMEagD+iBvq7tbTTUgFCViS RfXkv68a1Z3SrUolRy/yUhEpsc9qexJxLdTDq+JAahbINkPUzT6aiP01peB/DDa9lIza +TgfgcnWiT3talSo6Oz3jLFl4VAAS9PtFtABGHTIs9yBF9bVs5XX36bLBUtFxzgHHa67 08uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VKs6xp1a; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq22-20020a1709073f1600b0070759e38865si1342547ejc.424.2022.06.01.02.07.20; Wed, 01 Jun 2022 02:07:20 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VKs6xp1a; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45E5A68B6FB; Wed, 1 Jun 2022 12:06:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72A7668B630 for ; Wed, 1 Jun 2022 12:06:11 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id e11so1396833pfj.5; Wed, 01 Jun 2022 02:06:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=9KZTrJTRMHUr48e/zhnkR7L99y96lcu+jQEQiX6aAYE=; b=VKs6xp1anbv17cHfPufBXlYJLe7r4J1CKO46KaDbxl3V/Rinq4wo/dvQBJwpytzaPG 6H3w5Ko+B48Rj7b9R/KLRhLiG2gr6zcwqV0DBIdMnIn0Lb5cjGhusK1EeSzl8ok9agWF nWmf0Itp59xr+n4U38ECID3oJorx8LTcMRgPD9C04e8tLIQqhtJl0B25QsciFth3oFtq 6WcSOiX8ejleMO4zgL3axWPgmUz9v0yXg3aevs5KaMrUwpoWuLKQvx9OuFAetM+cRlRs BTBlNp37+V6+z3srEC4JOQdD+16t9h2g5qmZH7nfKfq3EsxCClueHcHuzCTnO5KaVxva on1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=9KZTrJTRMHUr48e/zhnkR7L99y96lcu+jQEQiX6aAYE=; b=tvDYXU8Vz55+fRqC/uEunMkLJUYdg9JB4pp80AVDV62uJYQaTdNY9k6YtPkljXp/6q sok4wKy9V2f6cIyKckTVKl9dYX1aXmPCdlB8GglV8O+E3Q1w0NWDlyftEGfvc7VIjUro XNPrShH0krWGs3S4MwZ3DvvbQwVmDPwvbmqW9UacURa9P+XHyhsoud7IGP/t2L5vIQ5r GP3l+r0qpZ+C5dfMJNfRyUucmAxIGsRxZBgCAWRPyF+mhjsciOccHNzjIWwrp/01zFro tdJJUp8vTlSdqlS8U52c2ua/5Fpi+N6cNBp1oqNFAmz9FzDnoyK0nicmKnE/LncwiToM jMlA== X-Gm-Message-State: AOAM5310VAwvYSKg7fs3dBB7IufccrtbfcI4hCB+Nqow1l92U8y1ZY/i TKsebB+bHv7EPFzqmNUWRoJLAogjkRc= X-Received: by 2002:a63:69c1:0:b0:3fa:e815:a761 with SMTP id e184-20020a6369c1000000b003fae815a761mr28749433pgc.268.1654074369693; Wed, 01 Jun 2022 02:06:09 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id z15-20020a63b90f000000b003fc95548840sm874859pge.36.2022.06.01.02.06.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 02:06:09 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <3152156c97733757ceca778a41cb42efb9d71c95.1654074366.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 01 Jun 2022 09:06:02 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 2/6] avcodec/vpp_qsv: Copy side data from input to output frame X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hNdU5o0LYmcS From: softworkz Signed-off-by: softworkz --- libavfilter/qsvvpp.c | 6 ++++++ libavfilter/vf_overlay_qsv.c | 19 +++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 954f882637..f4bf628073 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -843,6 +843,12 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr return AVERROR(EAGAIN); break; } + + av_frame_remove_all_side_data(out_frame->frame); + ret = av_frame_copy_side_data(out_frame->frame, in_frame->frame, 0); + if (ret < 0) + return ret; + out_frame->frame->pts = av_rescale_q(out_frame->surface.Data.TimeStamp, default_tb, outlink->time_base); diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c index 7e76b39aa9..e15214dbf2 100644 --- a/libavfilter/vf_overlay_qsv.c +++ b/libavfilter/vf_overlay_qsv.c @@ -231,13 +231,24 @@ static int process_frame(FFFrameSync *fs) { AVFilterContext *ctx = fs->parent; QSVOverlayContext *s = fs->opaque; + AVFrame *frame0 = NULL; AVFrame *frame = NULL; - int ret = 0, i; + int ret = 0; - for (i = 0; i < ctx->nb_inputs; i++) { + for (unsigned i = 0; i < ctx->nb_inputs; i++) { ret = ff_framesync_get_frame(fs, i, &frame, 0); - if (ret == 0) - ret = ff_qsvvpp_filter_frame(s->qsv, ctx->inputs[i], frame); + + if (ret == 0) { + if (i == 0) + frame0 = frame; + else { + av_frame_remove_all_side_data(frame); + ret = av_frame_copy_side_data(frame, frame0, 0); + } + + ret = ret < 0 ? ret : ff_qsvvpp_filter_frame(s->qsv, ctx->inputs[i], frame); + } + if (ret < 0 && ret != AVERROR(EAGAIN)) break; } From patchwork Wed Jun 1 09:06:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36023 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3309885pzj; Wed, 1 Jun 2022 02:07:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxXFL6jtXJ68PVrMOYgpA6LEhkuaFkIMx0+Sjnijc5QfuCFKOXf5IE93MCuOA7YQ0QaRH4 X-Received: by 2002:aa7:d682:0:b0:42a:cd8e:de41 with SMTP id d2-20020aa7d682000000b0042acd8ede41mr68514870edr.240.1654074452800; Wed, 01 Jun 2022 02:07:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654074452; cv=none; d=google.com; s=arc-20160816; b=knAK6oEfoYNOLfQAE8XP1qLOzivnLEW9oEHYQuKYIpPYszYDgHgdvrbVLwQIy0nyKR lcxVVPuQk1j6gCph/ez0uhenhZD5Zb7POeQNu7XPZJyn0HvZTdOrhyztlZ3rfIu/7uxr W5qRsoYVR1OhEs1cm2E+Io+lkTrQjTFkcsCurRWWt23yKGgJ6VFPevM5K2vslm1sM66j 1ZRpyR7gXjUNgeOEOk7go43W68ewFLli2TVPL8+ghsFGi/IrAeVsTrE4FV0ISLPLWaSL xlCJOJ7Bz70oCXCgXz6vmKn7mRh6Ok5udmxiXUMAUmx0xOY0fM9WJLIYvvIIN+mO0/Dp lyEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=kdR1YmSiFbbLGLSkWCpqyM48n5DrPBnChPgyJdhSDhQ=; b=Xyeeu6xiptHNg3dD2spa2NpAH8owkRq+zXyDUh9wg/aKjfwza2wASTDtOAbRDLVUGe A2RcS7ZLzZAb0B/NJoU9cLgb6gK8LnR+DsvqQ4rklPZkUB8g0Se/ILog2GX1fazERr8U DQ1enESQvB3JHgFpLnq+Xg6OnWEUmzWXJ8VuUslBZANSxF16rEyZz/16+oGVcXEe7rEA bTfB+mJ23SOdr/UCTlC9P5J5uVa4gdi8lh4VXmPI70hMdqUJXsm+BQrupMfO4cbM6adK 1dtvn7f3q5oIMbJD6rgkhWSfTaKjsSXy7F9oUczUbX5h+VG52poleaCSPwoo0VUfHUNt N7Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mUAAlC4g; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh8-20020a1709076e8800b00707dcb33dc8si672145ejc.402.2022.06.01.02.07.32; Wed, 01 Jun 2022 02:07:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=mUAAlC4g; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3509E68B72F; Wed, 1 Jun 2022 12:06:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E21F68B6F2 for ; Wed, 1 Jun 2022 12:06:12 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id 3-20020a17090a174300b001e426a02ac5so2424084pjm.2; Wed, 01 Jun 2022 02:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=98LpnvH/HD0Q8JInmZMfJz2v1DbVTAU2FPyI3+P0RhI=; b=mUAAlC4gizYw41mM01hoZrwLcIoPjcZScoAkaXT5TuYYaYl8qGhKS+wPDcAtHH7BRj DE3LEaNmG1xpxQe4dJduPj36CS86iiLIcnMc+X/JM0a8/Fjv/57+37hoWmD/gsNV3api 9P9yalxGoVsAjlv8udbEFJIylLfF54GpNMI01B3adhK7kxaRFtDPaA1j1bscaRrfgHMv zLPjepioYW4j9lcRZsOCRty5ZwHzEKT1j6UyqESzZgflPAIPNWoJoTZTzjjcvLOgEfqz Xj3KQ1Z31K8oYergK6EaDQY7cMud5Ou7lx6/CX/wyfVke2jx+eGYTnLMbySeqqNz1pnr OuwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=98LpnvH/HD0Q8JInmZMfJz2v1DbVTAU2FPyI3+P0RhI=; b=dUq6I09hSSkRV6fdrxpzy1EefkD+8kF8+Py/ThwshTWBHTa91OpOa1TPucLqo8bKIM apK6hz+5jiJDAGDjbLX5N00/6Cu3jOw5wSfcUi2ee3Yo22mbjxRvERjyIxadBAitDtCy X2ODCCtiKNnCRsq7T5Syv+hh6/SR3BcdULFpmA2cSmM4PZTv1DveElzR+Ti7lZV2yl2G HoVcug5ierfMM8BMBXwVeg/Q5+nHQWRgucP+9vqrUb/z1iqy2nOPCdho26FU0B7zeIY0 ksUwbcM1ko/deyPhqx6onwzFPkQ3UHbOAgcFLCn4fnJ3+Ijns95SrvaQGRRSwDwILQ6G ZrQA== X-Gm-Message-State: AOAM533AD6Q8S5Q0fnber4yhoZX8/eo/skBugNSHjwMcxv0Rd9J8Gauh qwRq7Cv6e6ufQxToCUyZ5Jdhn6b+Muc= X-Received: by 2002:a17:90a:6390:b0:1e0:a47b:a57a with SMTP id f16-20020a17090a639000b001e0a47ba57amr32806923pjj.115.1654074370903; Wed, 01 Jun 2022 02:06:10 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id l187-20020a6225c4000000b0051b97714703sm906319pfl.187.2022.06.01.02.06.10 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 02:06:10 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <8082c3ab84a30299f1b8e930a877cf65c3b48b00.1654074366.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 01 Jun 2022 09:06:03 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 3/6] avcodec/mpeg12dec: make mpeg_decode_user_data() accessible X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xGaMzWDP3Z+r From: softworkz Signed-off-by: softworkz --- libavcodec/mpeg12.h | 28 ++++++++++++++++++++++++++++ libavcodec/mpeg12dec.c | 40 +++++----------------------------------- 2 files changed, 33 insertions(+), 35 deletions(-) diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index e0406b32d9..84a829cdd3 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -23,6 +23,7 @@ #define AVCODEC_MPEG12_H #include "mpegvideo.h" +#include "libavutil/stereo3d.h" /* Start codes. */ #define SEQ_END_CODE 0x000001b7 @@ -34,6 +35,31 @@ #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 +typedef struct Mpeg1Context { + MpegEncContext mpeg_enc_ctx; + int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ + int repeat_field; /* true if we must repeat the field */ + AVPanScan pan_scan; /* some temporary storage for the panscan */ + AVStereo3D stereo3d; + int has_stereo3d; + AVBufferRef *a53_buf_ref; + uint8_t afd; + int has_afd; + int slice_count; + unsigned aspect_ratio_info; + AVRational save_aspect; + int save_width, save_height, save_progressive_seq; + int rc_buffer_size; + AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ + unsigned frame_rate_index; + int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ + int closed_gop; + int tmpgexs; + int first_slice; + int extradata_decoded; + int64_t timecode_frame_start; /*< GOP timecode frame start number, in non drop frame format */ +} Mpeg1Context; + void ff_mpeg12_common_init(MpegEncContext *s); void ff_mpeg1_clean_buffers(MpegEncContext *s); @@ -45,4 +71,6 @@ void ff_mpeg12_find_best_frame_rate(AVRational frame_rate, int *code, int *ext_n, int *ext_d, int nonstandard); +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size); + #endif /* AVCODEC_MPEG12_H */ diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e9bde48f7a..11d2b58185 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -58,31 +58,6 @@ #define A53_MAX_CC_COUNT 2000 -typedef struct Mpeg1Context { - MpegEncContext mpeg_enc_ctx; - int mpeg_enc_ctx_allocated; /* true if decoding context allocated */ - int repeat_field; /* true if we must repeat the field */ - AVPanScan pan_scan; /* some temporary storage for the panscan */ - AVStereo3D stereo3d; - int has_stereo3d; - AVBufferRef *a53_buf_ref; - uint8_t afd; - int has_afd; - int slice_count; - unsigned aspect_ratio_info; - AVRational save_aspect; - int save_width, save_height, save_progressive_seq; - int rc_buffer_size; - AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ - unsigned frame_rate_index; - int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ - int closed_gop; - int tmpgexs; - int first_slice; - int extradata_decoded; - int64_t timecode_frame_start; /*< GOP timecode frame start number, in non drop frame format */ -} Mpeg1Context; - #define MB_TYPE_ZERO_MV 0x20000000 static const uint32_t ptype2mb_type[7] = { @@ -2198,11 +2173,9 @@ static int vcr2_init_sequence(AVCodecContext *avctx) return 0; } -static int mpeg_decode_a53_cc(AVCodecContext *avctx, +static int mpeg_decode_a53_cc(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size) { - Mpeg1Context *s1 = avctx->priv_data; - if (buf_size >= 6 && p[0] == 'G' && p[1] == 'A' && p[2] == '9' && p[3] == '4' && p[4] == 3 && (p[5] & 0x40)) { @@ -2333,12 +2306,9 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx, return 0; } -static void mpeg_decode_user_data(AVCodecContext *avctx, - const uint8_t *p, int buf_size) +void ff_mpeg_decode_user_data(AVCodecContext *avctx, Mpeg1Context *s1, const uint8_t *p, int buf_size) { - Mpeg1Context *s = avctx->priv_data; const uint8_t *buf_end = p + buf_size; - Mpeg1Context *s1 = avctx->priv_data; #if 0 int i; @@ -2352,7 +2322,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, int i; for(i=0; i<20; i++) if (!memcmp(p+i, "\0TMPGEXS\0", 9)){ - s->tmpgexs= 1; + s1->tmpgexs= 1; } } /* we parse the DTG active format information */ @@ -2398,7 +2368,7 @@ static void mpeg_decode_user_data(AVCodecContext *avctx, break; } } - } else if (mpeg_decode_a53_cc(avctx, p, buf_size)) { + } else if (mpeg_decode_a53_cc(avctx, s1, p, buf_size)) { return; } } @@ -2590,7 +2560,7 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, } break; case USER_START_CODE: - mpeg_decode_user_data(avctx, buf_ptr, input_size); + ff_mpeg_decode_user_data(avctx, s, buf_ptr, input_size); break; case GOP_START_CODE: if (last_code == 0) { From patchwork Wed Jun 1 09:06:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3309313pzj; Wed, 1 Jun 2022 02:06:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyg74djFuO6WpGYVyCV6ZOnzUfFtqms8X8inXXvPk0vcJy9RQmMMhx3/74DoImxgKIijh5k X-Received: by 2002:a17:907:72d0:b0:6f5:108c:a34 with SMTP id du16-20020a17090772d000b006f5108c0a34mr56675754ejc.218.1654074385982; Wed, 01 Jun 2022 02:06:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654074385; cv=none; d=google.com; s=arc-20160816; b=MqoZyZtvZvwzSaSylV1xCVK1f1Ov5R3DBSg8Txub3nyBSiUPbWwZPdCfjF/sSMyBgd Ymq0FhY2X7d4m9nESx4jhuHd0uyxSoRB6xwlse6M5Aux7rPOcEQPV/PdiSjuGNYWWqqC ccEC3Iv3sPUfU14SGhYGQIV+rV/DDI2lFAAAPfODDVLcvTVTXF2FIM7Fwj957twpBH3g u4B+vdy8tRkMeRvB2v+8vHVJahrp86hgsDXtCao/gWTRXAwoQ86vH9lBhlDaXuPIbnMf PgJVHXXHabdoOtEc+pvRACgF7EDQn512jZxh4V9vwl96Q2xS8pudq7r17p0i7e9Jb1QI KCoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=Rx6EC6/F/ZAIEf/+oReprmoCdvezMm8ikjVB4wZGprk=; b=o6cF8pFYjAyFuYpl9bVkevr4qOXKGal92140IKTVAAWCaxZMqKFDsiZUqF8DDOI9qJ yHnhNv4NtAgTbSZJU9soqZh/fHTxpJ+XLTPRkyQXLcHWd+Us5ymtwujzPuSBURcu6S5N AIz05a/bTJOOxu0D7GmyKOU3SZusqrL51Heaceg/IfpDXJZyZs8/54oBc7LXfnyhDiHL hoVmCtWuedUAf02zOaI4fcY6aaXYA0LARkQ2dZDqAw4f7HMeXBS00kdT6b7nQb4tHpMe scCWoWO1uAlQT2AEv3fiuSKGhnCeF/2jbz2kQb084GM4rK6LMCaGXvK3rBXXSi/w3U3o N65A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RWTmHM4r; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l4-20020a170906794400b00703f4835d31si1352919ejo.913.2022.06.01.02.06.23; Wed, 01 Jun 2022 02:06:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=RWTmHM4r; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3ACC168B700; Wed, 1 Jun 2022 12:06:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B39A068B6F3 for ; Wed, 1 Jun 2022 12:06:13 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id 137so1328739pgb.5; Wed, 01 Jun 2022 02:06:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=d+Z96VQn265hj3Zkoztfab7kdst0csdJZygkLSPe+kM=; b=RWTmHM4rjvdFA3VE1TgAYX0JlyegYjSg0FfxSKabl12y0TyRUbYGhqTXPG2XxVdZEA rP93S1j+JCjgAk+QhWwI01NeSzhT97fB81D4lmzKBojBGqOvhrZ6rzUrO8lHOFH/4MwK 8zaQVaBxpXOD4erE8kL0T8Xh09YoGOVFCDrom7HI9+gwH015vZ+ijctFWm1EC/PnZHEa jiFZP2I4jXM4KUmsYLiSDAZVuIcjEEMWdKNnJYEYgDL+rgmpuyTBaiCPD3WDPtH9IuwO BLIoCxDNYJ73TvWJvkjCseGB2xcerVLOlCzF7laPqNyfQdiBZxsVu930iqQdVnu226oO w6BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=d+Z96VQn265hj3Zkoztfab7kdst0csdJZygkLSPe+kM=; b=LtZ+ZVEcqdhnceFVtCQxo5+GxeH/ULoCVmswPVWVuTNrdFWAhfrX4YVq4EzHoTatGK S1mz3bYNARFBabG0Wx5kEL8KcmEevdmdTQN++dOS53JTIpEodRzNFl+dgumlb+35Idal beaT65Ljj0ZQaX+rWI5Lu9w+OjnRPsqByg6WxSPVFUSBO1M6h8CskYBdH2h4VkYk/2hm A1VFmZhk/gknqq+hnP6RJcVH+GqZ4rDONXuwFww6gPHa4rz5gvWd5azd/RpDZcEIxXFg dNaUgOh7Sap6dlfbplyFYxW/pGP0kprwCnydwS4SLoOV9+0RgH8d74UoRtWFGEUL/+0a lubA== X-Gm-Message-State: AOAM532tJ3NoSG7Ghi9AVr7OYuFjnd345sJxCckN+4xtp2gR79xcWS0m VnuND8J94A26rQ/+OBE4XeAxODAaj6w= X-Received: by 2002:a63:5b04:0:b0:3fc:61a1:da0d with SMTP id p4-20020a635b04000000b003fc61a1da0dmr5785859pgb.177.1654074371969; Wed, 01 Jun 2022 02:06:11 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id h17-20020a62b411000000b004fa743ba3f9sm948871pfn.2.2022.06.01.02.06.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 02:06:11 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <306bdaa39c04dc97d5b7289cb77c2a4f2b7fb10d.1654074366.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 01 Jun 2022 09:06:04 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 4/6] avcodec/hevcdec: make set_side_data() accessible X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pQeuBKFSoIU5 From: softworkz Signed-off-by: softworkz --- libavcodec/hevcdec.c | 117 +++++++++++++++++++++---------------------- libavcodec/hevcdec.h | 9 ++++ 2 files changed, 67 insertions(+), 59 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f782ea6394..9e9bb48202 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2726,23 +2726,22 @@ error: return res; } -static int set_side_data(HEVCContext *s) +int ff_hevc_set_side_data(AVCodecContext *logctx, HEVCSEI *sei, HEVCContext *s, AVFrame *out) { - AVFrame *out = s->ref->frame; - int ret; + int ret = 0; - if (s->sei.frame_packing.present && - s->sei.frame_packing.arrangement_type >= 3 && - s->sei.frame_packing.arrangement_type <= 5 && - s->sei.frame_packing.content_interpretation_type > 0 && - s->sei.frame_packing.content_interpretation_type < 3) { + if (sei->frame_packing.present && + sei->frame_packing.arrangement_type >= 3 && + sei->frame_packing.arrangement_type <= 5 && + sei->frame_packing.content_interpretation_type > 0 && + sei->frame_packing.content_interpretation_type < 3) { AVStereo3D *stereo = av_stereo3d_create_side_data(out); if (!stereo) return AVERROR(ENOMEM); - switch (s->sei.frame_packing.arrangement_type) { + switch (sei->frame_packing.arrangement_type) { case 3: - if (s->sei.frame_packing.quincunx_subsampling) + if (sei->frame_packing.quincunx_subsampling) stereo->type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX; else stereo->type = AV_STEREO3D_SIDEBYSIDE; @@ -2755,21 +2754,21 @@ static int set_side_data(HEVCContext *s) break; } - if (s->sei.frame_packing.content_interpretation_type == 2) + if (sei->frame_packing.content_interpretation_type == 2) stereo->flags = AV_STEREO3D_FLAG_INVERT; - if (s->sei.frame_packing.arrangement_type == 5) { - if (s->sei.frame_packing.current_frame_is_frame0_flag) + if (sei->frame_packing.arrangement_type == 5) { + if (sei->frame_packing.current_frame_is_frame0_flag) stereo->view = AV_STEREO3D_VIEW_LEFT; else stereo->view = AV_STEREO3D_VIEW_RIGHT; } } - if (s->sei.display_orientation.present && - (s->sei.display_orientation.anticlockwise_rotation || - s->sei.display_orientation.hflip || s->sei.display_orientation.vflip)) { - double angle = s->sei.display_orientation.anticlockwise_rotation * 360 / (double) (1 << 16); + if (sei->display_orientation.present && + (sei->display_orientation.anticlockwise_rotation || + sei->display_orientation.hflip || sei->display_orientation.vflip)) { + double angle = sei->display_orientation.anticlockwise_rotation * 360 / (double) (1 << 16); AVFrameSideData *rotation = av_frame_new_side_data(out, AV_FRAME_DATA_DISPLAYMATRIX, sizeof(int32_t) * 9); @@ -2788,17 +2787,17 @@ static int set_side_data(HEVCContext *s) * (1 - 2 * !!s->sei.display_orientation.vflip); av_display_rotation_set((int32_t *)rotation->data, angle); av_display_matrix_flip((int32_t *)rotation->data, - s->sei.display_orientation.hflip, - s->sei.display_orientation.vflip); + sei->display_orientation.hflip, + sei->display_orientation.vflip); } // Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=1 // so the side data persists for the entire coded video sequence. - if (s->sei.mastering_display.present > 0 && + if (s && sei->mastering_display.present > 0 && IS_IRAP(s) && s->no_rasl_output_flag) { - s->sei.mastering_display.present--; + sei->mastering_display.present--; } - if (s->sei.mastering_display.present) { + if (sei->mastering_display.present) { // HEVC uses a g,b,r ordering, which we convert to a more natural r,g,b const int mapping[3] = {2, 0, 1}; const int chroma_den = 50000; @@ -2811,25 +2810,25 @@ static int set_side_data(HEVCContext *s) for (i = 0; i < 3; i++) { const int j = mapping[i]; - metadata->display_primaries[i][0].num = s->sei.mastering_display.display_primaries[j][0]; + metadata->display_primaries[i][0].num = sei->mastering_display.display_primaries[j][0]; metadata->display_primaries[i][0].den = chroma_den; - metadata->display_primaries[i][1].num = s->sei.mastering_display.display_primaries[j][1]; + metadata->display_primaries[i][1].num = sei->mastering_display.display_primaries[j][1]; metadata->display_primaries[i][1].den = chroma_den; } - metadata->white_point[0].num = s->sei.mastering_display.white_point[0]; + metadata->white_point[0].num = sei->mastering_display.white_point[0]; metadata->white_point[0].den = chroma_den; - metadata->white_point[1].num = s->sei.mastering_display.white_point[1]; + metadata->white_point[1].num = sei->mastering_display.white_point[1]; metadata->white_point[1].den = chroma_den; - metadata->max_luminance.num = s->sei.mastering_display.max_luminance; + metadata->max_luminance.num = sei->mastering_display.max_luminance; metadata->max_luminance.den = luma_den; - metadata->min_luminance.num = s->sei.mastering_display.min_luminance; + metadata->min_luminance.num = sei->mastering_display.min_luminance; metadata->min_luminance.den = luma_den; metadata->has_luminance = 1; metadata->has_primaries = 1; - av_log(s->avctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); - av_log(s->avctx, AV_LOG_DEBUG, + av_log(logctx, AV_LOG_DEBUG, "Mastering Display Metadata:\n"); + av_log(logctx, AV_LOG_DEBUG, "r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f)\n", av_q2d(metadata->display_primaries[0][0]), av_q2d(metadata->display_primaries[0][1]), @@ -2838,31 +2837,31 @@ static int set_side_data(HEVCContext *s) av_q2d(metadata->display_primaries[2][0]), av_q2d(metadata->display_primaries[2][1]), av_q2d(metadata->white_point[0]), av_q2d(metadata->white_point[1])); - av_log(s->avctx, AV_LOG_DEBUG, + av_log(logctx, AV_LOG_DEBUG, "min_luminance=%f, max_luminance=%f\n", av_q2d(metadata->min_luminance), av_q2d(metadata->max_luminance)); } // Decrement the mastering display flag when IRAP frame has no_rasl_output_flag=1 // so the side data persists for the entire coded video sequence. - if (s->sei.content_light.present > 0 && + if (s && sei->content_light.present > 0 && IS_IRAP(s) && s->no_rasl_output_flag) { - s->sei.content_light.present--; + sei->content_light.present--; } - if (s->sei.content_light.present) { + if (sei->content_light.present) { AVContentLightMetadata *metadata = av_content_light_metadata_create_side_data(out); if (!metadata) return AVERROR(ENOMEM); - metadata->MaxCLL = s->sei.content_light.max_content_light_level; - metadata->MaxFALL = s->sei.content_light.max_pic_average_light_level; + metadata->MaxCLL = sei->content_light.max_content_light_level; + metadata->MaxFALL = sei->content_light.max_pic_average_light_level; - av_log(s->avctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); - av_log(s->avctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", + av_log(logctx, AV_LOG_DEBUG, "Content Light Level Metadata:\n"); + av_log(logctx, AV_LOG_DEBUG, "MaxCLL=%d, MaxFALL=%d\n", metadata->MaxCLL, metadata->MaxFALL); } - if (s->sei.a53_caption.buf_ref) { - HEVCSEIA53Caption *a53 = &s->sei.a53_caption; + if (sei->a53_caption.buf_ref) { + HEVCSEIA53Caption *a53 = &sei->a53_caption; AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_A53_CC, a53->buf_ref); if (!sd) @@ -2870,8 +2869,8 @@ static int set_side_data(HEVCContext *s) a53->buf_ref = NULL; } - for (int i = 0; i < s->sei.unregistered.nb_buf_ref; i++) { - HEVCSEIUnregistered *unreg = &s->sei.unregistered; + for (int i = 0; i < sei->unregistered.nb_buf_ref; i++) { + HEVCSEIUnregistered *unreg = &sei->unregistered; if (unreg->buf_ref[i]) { AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, @@ -2882,9 +2881,9 @@ static int set_side_data(HEVCContext *s) unreg->buf_ref[i] = NULL; } } - s->sei.unregistered.nb_buf_ref = 0; + sei->unregistered.nb_buf_ref = 0; - if (s->sei.timecode.present) { + if (s && sei->timecode.present) { uint32_t *tc_sd; char tcbuf[AV_TIMECODE_STR_SIZE]; AVFrameSideData *tcside = av_frame_new_side_data(out, AV_FRAME_DATA_S12M_TIMECODE, @@ -2893,25 +2892,25 @@ static int set_side_data(HEVCContext *s) return AVERROR(ENOMEM); tc_sd = (uint32_t*)tcside->data; - tc_sd[0] = s->sei.timecode.num_clock_ts; + tc_sd[0] = sei->timecode.num_clock_ts; for (int i = 0; i < tc_sd[0]; i++) { - int drop = s->sei.timecode.cnt_dropped_flag[i]; - int hh = s->sei.timecode.hours_value[i]; - int mm = s->sei.timecode.minutes_value[i]; - int ss = s->sei.timecode.seconds_value[i]; - int ff = s->sei.timecode.n_frames[i]; + int drop = sei->timecode.cnt_dropped_flag[i]; + int hh = sei->timecode.hours_value[i]; + int mm = sei->timecode.minutes_value[i]; + int ss = sei->timecode.seconds_value[i]; + int ff = sei->timecode.n_frames[i]; tc_sd[i + 1] = av_timecode_get_smpte(s->avctx->framerate, drop, hh, mm, ss, ff); av_timecode_make_smpte_tc_string2(tcbuf, s->avctx->framerate, tc_sd[i + 1], 0, 0); av_dict_set(&out->metadata, "timecode", tcbuf, 0); } - s->sei.timecode.num_clock_ts = 0; + sei->timecode.num_clock_ts = 0; } - if (s->sei.film_grain_characteristics.present) { - HEVCSEIFilmGrainCharacteristics *fgc = &s->sei.film_grain_characteristics; + if (s && sei->film_grain_characteristics.present) { + HEVCSEIFilmGrainCharacteristics *fgc = &sei->film_grain_characteristics; AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(out); if (!fgp) return AVERROR(ENOMEM); @@ -2965,8 +2964,8 @@ static int set_side_data(HEVCContext *s) fgc->present = fgc->persistence_flag; } - if (s->sei.dynamic_hdr_plus.info) { - AVBufferRef *info_ref = av_buffer_ref(s->sei.dynamic_hdr_plus.info); + if (sei->dynamic_hdr_plus.info) { + AVBufferRef *info_ref = av_buffer_ref(sei->dynamic_hdr_plus.info); if (!info_ref) return AVERROR(ENOMEM); @@ -2976,7 +2975,7 @@ static int set_side_data(HEVCContext *s) } } - if (s->rpu_buf) { + if (s && s->rpu_buf) { AVFrameSideData *rpu = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DOVI_RPU_BUFFER, s->rpu_buf); if (!rpu) return AVERROR(ENOMEM); @@ -2984,10 +2983,10 @@ static int set_side_data(HEVCContext *s) s->rpu_buf = NULL; } - if ((ret = ff_dovi_attach_side_data(&s->dovi_ctx, out)) < 0) + if (s && (ret = ff_dovi_attach_side_data(&s->dovi_ctx, out)) < 0) return ret; - if (s->sei.dynamic_hdr_vivid.info) { + if (s && s->sei.dynamic_hdr_vivid.info) { AVBufferRef *info_ref = av_buffer_ref(s->sei.dynamic_hdr_vivid.info); if (!info_ref) return AVERROR(ENOMEM); @@ -3046,7 +3045,7 @@ static int hevc_frame_start(HEVCContext *s) goto fail; } - ret = set_side_data(s); + ret = ff_hevc_set_side_data(s->avctx, &s->sei, s, s->ref->frame); if (ret < 0) goto fail; diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index de861b88b3..cd8cd40da0 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -690,6 +690,15 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size); +/** + * Set the decodec side data to an AVFrame. + * @logctx context for logging. + * @sei HEVCSEI decoding context, must not be NULL. + * @s HEVCContext, can be NULL. + * @return < 0 on error, 0 otherwise. + */ +int ff_hevc_set_side_data(AVCodecContext *logctx, HEVCSEI *sei, HEVCContext *s, AVFrame *out); + extern const uint8_t ff_hevc_qpel_extra_before[4]; extern const uint8_t ff_hevc_qpel_extra_after[4]; extern const uint8_t ff_hevc_qpel_extra[4]; From patchwork Wed Jun 1 09:06:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36019 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3309512pzj; Wed, 1 Jun 2022 02:06:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxf7AzzTc15fUHCeO0PDyZtoNZPbAXWtWwx01Unku5PxeUBeRz4uRHsVUJyheSwrpFSGIv7 X-Received: by 2002:a17:907:3e07:b0:6fe:fdf9:2c2e with SMTP id hp7-20020a1709073e0700b006fefdf92c2emr38134776ejc.378.1654074404123; Wed, 01 Jun 2022 02:06:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654074404; cv=none; d=google.com; s=arc-20160816; b=ZCCtonf8qNtCqiVpzV0RCRvJMZFMyAwxGPAG7+SK0IxFh+/QC2ZF+s/FF6pD17Qai6 a1uDoo+esRO69TBZNWc8HA9PWQWjgNzviM3Tpo3eIJzEujM8hJN7LcXvVgJpGZhA8gAp vo5AgPewYneUsNA2OHvJ+fMQxwd7J9YjKYzF34RiCzEm32aDIYe4wytA4BilvX5aR7jg mMmZLpkt+lagcKfk5tQ0Iv9zISO1j71irULhuB36CgP63SGiZzPdUqTyI/KUg6IbDxcj 2azPNiCyOM38h+llSkAe1YeXvBpQ9PZjg5w4+/KaxAZf/piQ4u1nVEEedje/rfekNKU0 l+zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=X9v33IOMlkj3SYealTptb6YXpC5vMBQlLLp6IKaus8M=; b=jn9vjNy6yEi9JB0luHSED7Aayle1PKhhp4zjXGQ2Zf2RcEwiEy4epZiHqf2isnPj/R PWAlupVfZvXZsgRQzQWedvzQdBX1dpJXp1XGsiGX666dlFKPwB0OEG03Fg53SdyXIdpt yG+c0iGuX9mSHR59Kk5tCnvJZPobF8dWLApl8a7y20L8f1T1wKLLXRcISVNRt7wF+u0z DBxdV22PQv5gUMidyblY7Zt045ZuRsd2PSWDoWjEcr3XC0UHQRkjJECtS5zh/t3UN+ra lq5CENXLJwiYjDjks3GQyECn1NpHVex5QFPbroRgrxWR5Kzyh0fIm5tIj9Kr3M1QXfzG VvqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TOcAe5us; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id pw12-20020a17090720ac00b006f8e9e2aff1si1158094ejb.200.2022.06.01.02.06.43; Wed, 01 Jun 2022 02:06:44 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=TOcAe5us; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4005068B630; Wed, 1 Jun 2022 12:06:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA78668B588 for ; Wed, 1 Jun 2022 12:06:14 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id y187so1340686pgd.3; Wed, 01 Jun 2022 02:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=woDLBsAm1baHrRCV48xAJlDmANE3EG0buKKKgOC6iEk=; b=TOcAe5us5IVAuf42Qw0AcIlc68sZeTQaFwpViPQeqKgPJHBJ1fnNWqgBblb6Ly6BEO BjxKuC3LnnZbOrVz/kV6vOHnsaARycwN3dfhkEErnZRX+nSYNkfSn5kRskYsTNGZV0Sx uIWIxdlNdRP+NvLu6sP86uQBUFBVdd2nNBBx3nWKxXBe3Eq/tyE6lERjq6f3nmS/0pvl geTbJTj2im3rYAPsg2xl3wJ4wtAB/pyGDIfxQfxa1CgVCfvYTPMRlkeBXPTPgbtCmXAo 9oWUDrFQo3akWErentMa4fnwMWHSG/tfeqvnBY4IWdqUN7hCSsAP7hw7l7QpkpnMjqOS jJrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=woDLBsAm1baHrRCV48xAJlDmANE3EG0buKKKgOC6iEk=; b=R/Xz/T8sN9QWQ3o78NqF56vTFt5eExAG6FFf5+Se4Ipihn3d/Te1T8Ktyiz81NxT8w 2JtQgWmp+gy/AdsU+MgM6BRNGB+WSJfYwzjNOyutx0BB6E1QjG/QcvJUSonMrxafRB/j bBtxO/lgcu4OP1YdDcBdzzujqXy/rjc660g+4igDlDIPJmopZ+x2eSC4iUN+/rr4Ckd+ OxALxr8rtUj4fsVxsYCgz4rBXDk8oZJ8HJCN/Qh7OQ+NnTpscLCsmX13mWeJV7wKsUqj psoYFaOurj29eAmjeX5IAU+8e1cnmF9Eiec05WV9/pFDYuvqZRErYQa/44I6y96B7BMG KNyQ== X-Gm-Message-State: AOAM532IfMAcskPJxfIy8kr7/iGbQa5mW1mhr0RrQS2vj46xpiXtHXrx pkvaGX5WvWGWo3omhsovaKi54cXnTxU= X-Received: by 2002:a65:6b94:0:b0:3fb:16f4:3620 with SMTP id d20-20020a656b94000000b003fb16f43620mr25925472pgw.464.1654074373192; Wed, 01 Jun 2022 02:06:13 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id x18-20020aa79ad2000000b0051bbbf14c6csm54244pfp.55.2022.06.01.02.06.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 02:06:12 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <16f5dfbfd1642f066e9a3f0a0313547f7398f9c2.1654074366.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 01 Jun 2022 09:06:05 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 5/6] avcodec/h264dec: make h264_export_frame_props() accessible X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: a0SymDQjxrv1 From: softworkz Signed-off-by: softworkz --- libavcodec/h264_slice.c | 98 +++++++++++++++++++++-------------------- libavcodec/h264dec.h | 2 + 2 files changed, 52 insertions(+), 48 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index d56722a5c2..f2a4c1c657 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1157,11 +1157,10 @@ static int h264_init_ps(H264Context *h, const H264SliceContext *sl, int first_sl return 0; } -static int h264_export_frame_props(H264Context *h) +int ff_h264_export_frame_props(AVCodecContext *logctx, H264SEIContext *sei, H264Context *h, AVFrame *out) { - const SPS *sps = h->ps.sps; - H264Picture *cur = h->cur_pic_ptr; - AVFrame *out = cur->f; + const SPS *sps = h ? h->ps.sps : NULL; + H264Picture *cur = h ? h->cur_pic_ptr : NULL; out->interlaced_frame = 0; out->repeat_pict = 0; @@ -1169,19 +1168,19 @@ static int h264_export_frame_props(H264Context *h) /* Signal interlacing information externally. */ /* Prioritize picture timing SEI information over used * decoding process if it exists. */ - if (h->sei.picture_timing.present) { - int ret = ff_h264_sei_process_picture_timing(&h->sei.picture_timing, sps, - h->avctx); + if (sps && sei->picture_timing.present) { + int ret = ff_h264_sei_process_picture_timing(&sei->picture_timing, sps, + logctx); if (ret < 0) { - av_log(h->avctx, AV_LOG_ERROR, "Error processing a picture timing SEI\n"); - if (h->avctx->err_recognition & AV_EF_EXPLODE) + av_log(logctx, AV_LOG_ERROR, "Error processing a picture timing SEI\n"); + if (logctx->err_recognition & AV_EF_EXPLODE) return ret; - h->sei.picture_timing.present = 0; + sei->picture_timing.present = 0; } } - if (sps->pic_struct_present_flag && h->sei.picture_timing.present) { - H264SEIPictureTiming *pt = &h->sei.picture_timing; + if (h && sps && sps->pic_struct_present_flag && sei->picture_timing.present) { + H264SEIPictureTiming *pt = &sei->picture_timing; switch (pt->pic_struct) { case H264_SEI_PIC_STRUCT_FRAME: break; @@ -1215,21 +1214,23 @@ static int h264_export_frame_props(H264Context *h) if ((pt->ct_type & 3) && pt->pic_struct <= H264_SEI_PIC_STRUCT_BOTTOM_TOP) out->interlaced_frame = (pt->ct_type & (1 << 1)) != 0; - } else { + } else if (h) { /* Derive interlacing flag from used decoding process. */ out->interlaced_frame = FIELD_OR_MBAFF_PICTURE(h); } - h->prev_interlaced_frame = out->interlaced_frame; - if (cur->field_poc[0] != cur->field_poc[1]) { + if (h) + h->prev_interlaced_frame = out->interlaced_frame; + + if (sps && cur->field_poc[0] != cur->field_poc[1]) { /* Derive top_field_first from field pocs. */ out->top_field_first = cur->field_poc[0] < cur->field_poc[1]; - } else { - if (sps->pic_struct_present_flag && h->sei.picture_timing.present) { + } else if (sps) { + if (sps->pic_struct_present_flag && sei->picture_timing.present) { /* Use picture timing SEI information. Even if it is a * information of a past frame, better than nothing. */ - if (h->sei.picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM || - h->sei.picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP) + if (sei->picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM || + sei->picture_timing.pic_struct == H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP) out->top_field_first = 1; else out->top_field_first = 0; @@ -1243,11 +1244,11 @@ static int h264_export_frame_props(H264Context *h) } } - if (h->sei.frame_packing.present && - h->sei.frame_packing.arrangement_type <= 6 && - h->sei.frame_packing.content_interpretation_type > 0 && - h->sei.frame_packing.content_interpretation_type < 3) { - H264SEIFramePacking *fp = &h->sei.frame_packing; + if (sei->frame_packing.present && + sei->frame_packing.arrangement_type <= 6 && + sei->frame_packing.content_interpretation_type > 0 && + sei->frame_packing.content_interpretation_type < 3) { + H264SEIFramePacking *fp = &sei->frame_packing; AVStereo3D *stereo = av_stereo3d_create_side_data(out); if (stereo) { switch (fp->arrangement_type) { @@ -1289,11 +1290,11 @@ static int h264_export_frame_props(H264Context *h) } } - if (h->sei.display_orientation.present && - (h->sei.display_orientation.anticlockwise_rotation || - h->sei.display_orientation.hflip || - h->sei.display_orientation.vflip)) { - H264SEIDisplayOrientation *o = &h->sei.display_orientation; + if (sei->display_orientation.present && + (sei->display_orientation.anticlockwise_rotation || + sei->display_orientation.hflip || + sei->display_orientation.vflip)) { + H264SEIDisplayOrientation *o = &sei->display_orientation; double angle = o->anticlockwise_rotation * 360 / (double) (1 << 16); AVFrameSideData *rotation = av_frame_new_side_data(out, AV_FRAME_DATA_DISPLAYMATRIX, @@ -1314,29 +1315,30 @@ static int h264_export_frame_props(H264Context *h) } } - if (h->sei.afd.present) { + if (sei->afd.present) { AVFrameSideData *sd = av_frame_new_side_data(out, AV_FRAME_DATA_AFD, sizeof(uint8_t)); if (sd) { - *sd->data = h->sei.afd.active_format_description; - h->sei.afd.present = 0; + *sd->data = sei->afd.active_format_description; + sei->afd.present = 0; } } - if (h->sei.a53_caption.buf_ref) { - H264SEIA53Caption *a53 = &h->sei.a53_caption; + if (sei->a53_caption.buf_ref) { + H264SEIA53Caption *a53 = &sei->a53_caption; AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_A53_CC, a53->buf_ref); if (!sd) av_buffer_unref(&a53->buf_ref); a53->buf_ref = NULL; - h->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; + if (h) + h->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; } - for (int i = 0; i < h->sei.unregistered.nb_buf_ref; i++) { - H264SEIUnregistered *unreg = &h->sei.unregistered; + for (int i = 0; i < sei->unregistered.nb_buf_ref; i++) { + H264SEIUnregistered *unreg = &sei->unregistered; if (unreg->buf_ref[i]) { AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, @@ -1347,10 +1349,10 @@ static int h264_export_frame_props(H264Context *h) unreg->buf_ref[i] = NULL; } } - h->sei.unregistered.nb_buf_ref = 0; + sei->unregistered.nb_buf_ref = 0; - if (h->sei.film_grain_characteristics.present) { - H264SEIFilmGrainCharacteristics *fgc = &h->sei.film_grain_characteristics; + if (h && sps && sei->film_grain_characteristics.present) { + H264SEIFilmGrainCharacteristics *fgc = &sei->film_grain_characteristics; AVFilmGrainParams *fgp = av_film_grain_params_create_side_data(out); if (!fgp) return AVERROR(ENOMEM); @@ -1404,7 +1406,7 @@ static int h264_export_frame_props(H264Context *h) h->avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; } - if (h->sei.picture_timing.timecode_cnt > 0) { + if (h && sei->picture_timing.timecode_cnt > 0) { uint32_t *tc_sd; char tcbuf[AV_TIMECODE_STR_SIZE]; @@ -1415,14 +1417,14 @@ static int h264_export_frame_props(H264Context *h) return AVERROR(ENOMEM); tc_sd = (uint32_t*)tcside->data; - tc_sd[0] = h->sei.picture_timing.timecode_cnt; + tc_sd[0] = sei->picture_timing.timecode_cnt; for (int i = 0; i < tc_sd[0]; i++) { - int drop = h->sei.picture_timing.timecode[i].dropframe; - int hh = h->sei.picture_timing.timecode[i].hours; - int mm = h->sei.picture_timing.timecode[i].minutes; - int ss = h->sei.picture_timing.timecode[i].seconds; - int ff = h->sei.picture_timing.timecode[i].frame; + int drop = sei->picture_timing.timecode[i].dropframe; + int hh = sei->picture_timing.timecode[i].hours; + int mm = sei->picture_timing.timecode[i].minutes; + int ss = sei->picture_timing.timecode[i].seconds; + int ff = sei->picture_timing.timecode[i].frame; tc_sd[i + 1] = av_timecode_get_smpte(h->avctx->framerate, drop, hh, mm, ss, ff); av_timecode_make_smpte_tc_string2(tcbuf, h->avctx->framerate, tc_sd[i + 1], 0, 0); @@ -1817,7 +1819,7 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl, * field coded frames, since some SEI information is present for each field * and is merged by the SEI parsing code. */ if (!FIELD_PICTURE(h) || !h->first_field || h->missing_fields > 1) { - ret = h264_export_frame_props(h); + ret = ff_h264_export_frame_props(h->avctx, &h->sei, h, h->cur_pic_ptr->f); if (ret < 0) return ret; diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 9a1ec1bace..38930da4ca 100644 --- a/libavcodec/h264dec.h +++ b/libavcodec/h264dec.h @@ -808,4 +808,6 @@ void ff_h264_free_tables(H264Context *h); void ff_h264_set_erpic(ERPicture *dst, H264Picture *src); +int ff_h264_export_frame_props(AVCodecContext *logctx, H264SEIContext *sei, H264Context *h, AVFrame *out); + #endif /* AVCODEC_H264DEC_H */ From patchwork Wed Jun 1 09:06:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 36021 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp3309688pzj; Wed, 1 Jun 2022 02:07:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnIuiPMpTrPe8TvepRypuEAY9ZaYLbqNhJ7Kd3GyU7ImQBcj7LqPWYuzBNGfa3tn8peTSf X-Received: by 2002:a05:6402:510e:b0:42d:f887:b142 with SMTP id m14-20020a056402510e00b0042df887b142mr2098345edd.291.1654074427768; Wed, 01 Jun 2022 02:07:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654074427; cv=none; d=google.com; s=arc-20160816; b=AH+T+OaEbn/7H5FjN6LblLssZqk+7wvnDe8TtZVlieSW+xwQ4POOMMQoxXiDBL8fHp iy5c1ljRsZxMAHXrwultYu3leLiV2nyBFkx+A7yFe8CDXU4hjrlIch947q48ezpZlv3l pk5HAYrM+EVOSLIrn0M1WA96lYlH9dFAtIZ2aOmUAFMN2ifDrffeWpHNYiPiCTsVwzIz m5PmsTwN937IcZYf5E+q+8gywalZC5+zD49D2qV9DRj8NIhyQD8kktIHdr2tFjlvQUvS 3njmaAEq9EXAL5LLneaqeWjNqXCZhAfrwZTwSTiq+YNHlUeqJQIH1JUNkZSbVmgbhmDW sidQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=AKqFLfGbFiiNMLs/0UHjucKe9z09SiAlloWvLuFvpjQ=; b=qJ+axiwbFy5mLtk7PYZuBhK1L9uRsT3I+jYTJt7l7H69NUpoqvqMuy4BAkz6WtNK1V UYgqt4C+5UBt0+Ty9mXg0v30oSyQm1+JNBbMmh20C8HpZGAplWeldXEzCLSW/AxCPP4M hsqLR/kSK2JoV42d1xKHZypLvLbGrp3rH3caUy0AjbaGUJ9p++46wzcSMoXB1Lter3/p yNsQ2olr/Q2o9LLQCifiixhdfokz6wHv3vZG8LRBv/8/sbSJ8HIthLfFn5S04G7WGK1g WQLjVlCHqgQhMcMcqvdyQdN/KhanMS3JIvOESp+Ay9Kdm2Zg5A/OlUnFnDljkcewgaAN OjiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BLTmFUWT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j19-20020a05640211d300b0042bd9d36e02si1465489edw.584.2022.06.01.02.07.07; Wed, 01 Jun 2022 02:07:07 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BLTmFUWT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CFEB68B725; Wed, 1 Jun 2022 12:06:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F134368B70C for ; Wed, 1 Jun 2022 12:06:15 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id l20-20020a17090a409400b001dd2a9d555bso1502344pjg.0; Wed, 01 Jun 2022 02:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=UnF+L05a7CCxhP98U9z8CfP16Z3ORnGkkTos/3ktp5Q=; b=BLTmFUWTFtEvoW0Px16sceRm8vo02AUM4NTcv3qwlzTfVQRjGWcm/S48c14uATrmAl ryZeRnPR21KlCZmVDrdKjMflO3xozEpVqPkq9N7j0WC2U1kOQ0Mj5nNaV8dY940ONj0d V8cE+rkZADPYh0moZyKohRnoXPKtyACJ625kKruwpi4L9iHftDS5KYl2Yi+yeKMZ2n3k 8nphPeroc8NLDnOFV/MgByn+UQ7Aia6d0qExvHX3wjsotNyKvC6KUMdwSaT983DR26hW nTuYFktUzG7qAaTuq7U78rSvKd0dpsH13O5BkFuOZGRfB2J86pW4O3OfPFkbJF7QadFN QVvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=UnF+L05a7CCxhP98U9z8CfP16Z3ORnGkkTos/3ktp5Q=; b=gdxLEHhIZxLc0wTsNzRZWD4pZb1zjIKChQVyi5yE/dfbUyaG+q7P0br7miM8dodSBR kVFPa88Ofgm9NDBA0cFWjALHoFUfNMndttzB6I5Ou5y7GaKYdxKopixH6pV3Pdx8PL3T wacRTc39Havrw8aBiTGalSh9CLbPweBbuMekXwhJ5MXav78mpBzxh8VkCH4PzTHbAvVD gsyj5PBsVBwn02o4gArKpxqOF56R2/mg5RltuGWcmXlNdlWRq8H9hRKKTDNQX9bl1Ocf GFk47Gi0nhHRTnvXEMUgnvwAhFcLg57IklU1vjbBY/cuwnmdV+iG6sYzd4/xcZ4O87WZ aGvg== X-Gm-Message-State: AOAM530jO/aQBInCipOKvqA/YjcvXQ5OKXHIAJNhaSKn+SRCYw/H5GE0 UFtPOWda5vqOFepM4KCTm490YP1Ip/k= X-Received: by 2002:a17:903:22c4:b0:163:6700:d27b with SMTP id y4-20020a17090322c400b001636700d27bmr33152090plg.37.1654074374341; Wed, 01 Jun 2022 02:06:14 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id b62-20020a621b41000000b0051844a64d3dsm896012pfb.25.2022.06.01.02.06.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2022 02:06:13 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: <23de6d2774741423dbd981b33afa67975d28749e.1654074366.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Wed, 01 Jun 2022 09:06:06 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2 6/6] avcodec/qsvdec: Implement SEI parsing for QSV decoders X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: softworkz , "Xiang, Haihao" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Xl7VXYFForxj From: softworkz Signed-off-by: softworkz --- libavcodec/qsvdec.c | 234 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 5fc5bed4c8..3fc5dc3f20 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -49,6 +49,12 @@ #include "hwconfig.h" #include "qsv.h" #include "qsv_internal.h" +#include "h264dec.h" +#include "h264_sei.h" +#include "hevcdec.h" +#include "hevc_ps.h" +#include "hevc_sei.h" +#include "mpeg12.h" static const AVRational mfx_tb = { 1, 90000 }; @@ -60,6 +66,8 @@ static const AVRational mfx_tb = { 1, 90000 }; AV_NOPTS_VALUE : pts_tb.num ? \ av_rescale_q(mfx_pts, mfx_tb, pts_tb) : mfx_pts) +#define PAYLOAD_BUFFER_SIZE 65535 + typedef struct QSVAsyncFrame { mfxSyncPoint *sync; QSVFrame *frame; @@ -101,6 +109,9 @@ typedef struct QSVContext { mfxExtBuffer **ext_buffers; int nb_ext_buffers; + + mfxU8 payload_buffer[PAYLOAD_BUFFER_SIZE]; + Mpeg1Context mpeg_ctx; } QSVContext; static const AVCodecHWConfigInternal *const qsv_hw_configs[] = { @@ -599,6 +610,210 @@ static int qsv_export_film_grain(AVCodecContext *avctx, mfxExtAV1FilmGrainParam return 0; } #endif +static int find_start_offset(mfxU8 data[4]) +{ + if (data[0] == 0 && data[1] == 0 && data[2] == 1) + return 3; + + if (data[0] == 0 && data[1] == 0 && data[2] == 0 && data[3] == 1) + return 4; + + return 0; +} + +static int parse_sei_h264(AVCodecContext* avctx, QSVContext* q, AVFrame* out) +{ + H264SEIContext sei = { 0 }; + GetBitContext gb = { 0 }; + mfxPayload payload = { 0, .Data = &q->payload_buffer[0], .BufSize = sizeof(q->payload_buffer) }; + mfxU64 ts; + int ret; + + while (1) { + int start; + memset(payload.Data, 0, payload.BufSize); + + ret = MFXVideoDECODE_GetPayload(q->session, &ts, &payload); + if (ret == MFX_ERR_NOT_ENOUGH_BUFFER) { + av_log(avctx, AV_LOG_WARNING, "Warning: Insufficient buffer on GetPayload(). Size: %"PRIu64" Needed: %d\n", sizeof(q->payload_buffer), payload.BufSize); + return 0; + } + if (ret != MFX_ERR_NONE) + return ret; + + if (payload.NumBit == 0 || payload.NumBit >= payload.BufSize * 8) + break; + + start = find_start_offset(payload.Data); + + switch (payload.Type) { + case SEI_TYPE_BUFFERING_PERIOD: + case SEI_TYPE_PIC_TIMING: + continue; + } + + if (init_get_bits(&gb, &payload.Data[start], payload.NumBit - start * 8) < 0) + av_log(avctx, AV_LOG_ERROR, "Error initializing bitstream reader SEI type: %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); + else { + ret = ff_h264_sei_decode(&sei, &gb, NULL, avctx); + + if (ret < 0) + av_log(avctx, AV_LOG_WARNING, "Failed to parse SEI type: %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); + else + av_log(avctx, AV_LOG_DEBUG, "mfxPayload Type: %d Numbits %d\n", payload.Type, payload.NumBit); + } + } + + if (out) + return ff_h264_export_frame_props(avctx, &sei, NULL, out); + + return 0; +} + +static int parse_sei_hevc(AVCodecContext* avctx, QSVContext* q, QSVFrame* out) +{ + HEVCSEI sei = { 0 }; + HEVCParamSets ps = { 0 }; + GetBitContext gb = { 0 }; + mfxPayload payload = { 0, .Data = &q->payload_buffer[0], .BufSize = sizeof(q->payload_buffer) }; + mfxFrameSurface1 *surface = &out->surface; + mfxU64 ts; + int ret, has_logged = 0; + + while (1) { + int start; + memset(payload.Data, 0, payload.BufSize); + + ret = MFXVideoDECODE_GetPayload(q->session, &ts, &payload); + if (ret == MFX_ERR_NOT_ENOUGH_BUFFER) { + av_log(avctx, AV_LOG_WARNING, "Warning: Insufficient buffer on GetPayload(). Size: %"PRIu64" Needed: %d\n", sizeof(q->payload_buffer), payload.BufSize); + return 0; + } + if (ret != MFX_ERR_NONE) + return ret; + + if (payload.NumBit == 0 || payload.NumBit >= payload.BufSize * 8) + break; + + if (!has_logged) { + has_logged = 1; + av_log(avctx, AV_LOG_VERBOSE, "-----------------------------------------\n"); + av_log(avctx, AV_LOG_VERBOSE, "Start reading SEI - payload timestamp: %llu - surface timestamp: %llu\n", ts, surface->Data.TimeStamp); + } + + if (ts != surface->Data.TimeStamp) { + av_log(avctx, AV_LOG_WARNING, "GetPayload timestamp (%llu) does not match surface timestamp: (%llu)\n", ts, surface->Data.TimeStamp); + } + + start = find_start_offset(payload.Data); + + av_log(avctx, AV_LOG_VERBOSE, "parsing SEI type: %3d Numbits %3d Start: %d\n", payload.Type, payload.NumBit, start); + + switch (payload.Type) { + case SEI_TYPE_BUFFERING_PERIOD: + case SEI_TYPE_PIC_TIMING: + continue; + case SEI_TYPE_MASTERING_DISPLAY_COLOUR_VOLUME: + // There seems to be a bug in MSDK + payload.NumBit -= 8; + + break; + case SEI_TYPE_CONTENT_LIGHT_LEVEL_INFO: + // There seems to be a bug in MSDK + payload.NumBit = 48; + + break; + case SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35: + // There seems to be a bug in MSDK + if (payload.NumBit == 552) + payload.NumBit = 528; + break; + } + + if (init_get_bits(&gb, &payload.Data[start], payload.NumBit - start * 8) < 0) + av_log(avctx, AV_LOG_ERROR, "Error initializing bitstream reader SEI type: %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); + else { + ret = ff_h264_sei_decode(&sei, &gb, NULL, avctx); + + if (ret < 0) + av_log(avctx, AV_LOG_WARNING, "Failed to parse SEI type: %d Numbits %d error: %d\n", payload.Type, payload.NumBit, ret); + else + av_log(avctx, AV_LOG_DEBUG, "mfxPayload Type: %d Numbits %d\n", payload.Type, payload.NumBit); + } + } + + if (has_logged) { + av_log(avctx, AV_LOG_VERBOSE, "End reading SEI\n"); + } + + if (out && out->frame) + return ff_hevc_set_side_data(avctx, &sei, NULL, out->frame); + + return 0; +} + +static int parse_sei_mpeg12(AVCodecContext* avctx, QSVContext* q, AVFrame* out) +{ + Mpeg1Context *mpeg_ctx = &q->mpeg_ctx; + mfxPayload payload = { 0, .Data = &q->payload_buffer[0], .BufSize = sizeof(q->payload_buffer) }; + mfxU64 ts; + int ret; + + while (1) { + int start; + + memset(payload.Data, 0, payload.BufSize); + ret = MFXVideoDECODE_GetPayload(q->session, &ts, &payload); + if (ret == MFX_ERR_NOT_ENOUGH_BUFFER) { + av_log(avctx, AV_LOG_WARNING, "Warning: Insufficient buffer on GetPayload(). Size: %"PRIu64" Needed: %d\n", sizeof(q->payload_buffer), payload.BufSize); + return 0; + } + if (ret != MFX_ERR_NONE) + return ret; + + if (payload.NumBit == 0 || payload.NumBit >= payload.BufSize * 8) + break; + + start = find_start_offset(payload.Data); + + start++; + + ff_mpeg_decode_user_data(avctx, mpeg_ctx, &payload.Data[start], (int)((payload.NumBit + 7) / 8) - start); + + av_log(avctx, AV_LOG_DEBUG, "mfxPayload Type: %d Numbits %d start %d -> %.s\n", payload.Type, payload.NumBit, start, (char *)(&payload.Data[start])); + } + + if (!out) + return 0; + + if (mpeg_ctx->a53_buf_ref) { + + AVFrameSideData *sd = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_A53_CC, mpeg_ctx->a53_buf_ref); + if (!sd) + av_buffer_unref(&mpeg_ctx->a53_buf_ref); + mpeg_ctx->a53_buf_ref = NULL; + } + + if (mpeg_ctx->has_stereo3d) { + AVStereo3D *stereo = av_stereo3d_create_side_data(out); + if (!stereo) + return AVERROR(ENOMEM); + + *stereo = mpeg_ctx->stereo3d; + mpeg_ctx->has_stereo3d = 0; + } + + if (mpeg_ctx->has_afd) { + AVFrameSideData *sd = av_frame_new_side_data(out, AV_FRAME_DATA_AFD, 1); + if (!sd) + return AVERROR(ENOMEM); + + *sd->data = mpeg_ctx->afd; + mpeg_ctx->has_afd = 0; + } + + return 0; +} static int qsv_decode(AVCodecContext *avctx, QSVContext *q, AVFrame *frame, int *got_frame, @@ -636,6 +851,8 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, insurf, &outsurf, sync); if (ret == MFX_WRN_DEVICE_BUSY) av_usleep(500); + else if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO) + parse_sei_mpeg12(avctx, q, NULL); } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_ERR_MORE_SURFACE); @@ -677,6 +894,23 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q, return AVERROR_BUG; } + switch (avctx->codec_id) { + case AV_CODEC_ID_MPEG2VIDEO: + ret = parse_sei_mpeg12(avctx, q, out_frame->frame); + break; + case AV_CODEC_ID_H264: + ret = parse_sei_h264(avctx, q, out_frame->frame); + break; + case AV_CODEC_ID_HEVC: + ret = parse_sei_hevc(avctx, q, out_frame); + break; + default: + ret = 0; + } + + if (ret < 0) + av_log(avctx, AV_LOG_ERROR, "Error parsing SEI data: %d\n", ret); + out_frame->queued += 1; aframe = (QSVAsyncFrame){ sync, out_frame };