From patchwork Sat Feb 4 00:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 40240 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1617041pzk; Fri, 3 Feb 2023 16:42:30 -0800 (PST) X-Google-Smtp-Source: AK7set/XhvKW0wzzJ4H1vmqqiPc+9WiSfHP1RqDwzaV51P/esTjCkuyp4v53P8HNAPPGQ5JmZcMI X-Received: by 2002:a17:906:8a5b:b0:7c0:efb9:bc0e with SMTP id gx27-20020a1709068a5b00b007c0efb9bc0emr12309583ejc.62.1675471350504; Fri, 03 Feb 2023 16:42:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675471350; cv=none; d=google.com; s=arc-20160816; b=I/Mr11cfxvAaJfuSmYRS7LUfy2wRWZU+qadfuX5aWz2Cfu4XHxQQG1FPphyvmsD1lJ N4cjM6ZDq/RTjRgkNp6pyq1/Fq+2ALiBZpdxX+j8f2KZE4uF47MSdw6+l8yMlEtKK7fj 5hoDC7V62Z9DKyNrLaS+rohV8lGhHN5QcNI/P8pzzIa256ptW0VYaGTBfH9+6/lW0gAY LeBidW4mojS8pZaZc7rkrW+660aX0+X1oQXZpUS4szdiRA+7oUfiIfscBtpNDdzDIiyC wB3ieZBgMfgIiz55dQH9TBL+g8kKkKse2IupFXbl7f7FxnCrlmBNdEP3T37T39mSuarZ GLTg== 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=Wos3Xse0rL0yn2IO6DRhn4ieRTu41k9Hy0KBQE93W5c=; b=BDST27G1Uo+oyjnDRAkQ6zlWXhefYEUP9IXs+qZpO4HgqJ/N7qBQKb0v6H4zXkEqmu BqPBXJ03aPM1gFlLypzsBV9yeNthGdTEh3BbUn4mMoGrlbWin6xpeMFcSmC91cWiDydi sXsNtWPA6p6Ndk7abcvyaKs1GnswM8UpcfU03G4GAcLz+NSnuDEU+IKJ2JDuCtFhswlU Il3+jVa8+OjF8OCOmcM6TeZ0gegnAPK8Z1jubIpzuiBulWYwZ4KgS+IemPj99BY5Wi/m z1Dt9nzxvn+NDKZ3QAVlkw9lzYTWTZ1Qg5I09abntNHAEdYxVS3bAtP0AkHJMdoo1RhX 7R/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fIKHg9s1; 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 su21-20020a17090703d500b0088458045d8fsi4000546ejb.639.2023.02.03.16.42.30; Fri, 03 Feb 2023 16:42:30 -0800 (PST) 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=fIKHg9s1; 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 13A4F68BEAA; Sat, 4 Feb 2023 02:42:08 +0200 (EET) 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 3CA4368B6C4 for ; Sat, 4 Feb 2023 02:42:00 +0200 (EET) Received: by mail-pg1-f176.google.com with SMTP id 78so4759286pgb.8 for ; Fri, 03 Feb 2023 16:42:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=kYWLa0Lt1EGmmEwqLeYWzotFAEn+MZ5WCTz/uSjUrSY=; b=fIKHg9s1LteZsL75wMP9WJG3BgEGOUg9GUn4VyxLuoaA4YYzUH2W1ZErX9N3lotVbe 3LkCtrYqCl0IOLrFwOZVyT6bUXzljcVHLZoeUiXARRFqoyB1k6viA6p7W2vu37ugxQ0X ujsQsu+og+SS4K5FknwVTN37blZHSezeQ2TxF8dDx5JELjU6iv4lAxvVKIl/bM0SiLKb mrrUyVzvl1BUkvLiMn5CXN37R+jvI2bl9i4Ihz8dBJfr+Ke+dR3VeFRSI+UeliEs27+p 7j4d0+rOIUVltkVkk96Z2O+M8LPVrG1bYaXGxDzYejNjWQ8oe4/5l99wxZEzOeahLLiQ cJqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=kYWLa0Lt1EGmmEwqLeYWzotFAEn+MZ5WCTz/uSjUrSY=; b=62acrfl3lmhqssEgV1SRPZagDMNzpsDyFb/3dJIuGyrGseyEKXl4hzUVTV7z5WZ7ca M+39mRcndXZa5iJwiPy1llVygOUe9/3cI6f6OSiTdk4D6O9TM3WwZuAIuuss300OU3JS 21LUX9I1/Y9kmrBcT20H0u7Y9xhH0rF1ikK0aiOx1Aja7kA1B/vtw57WywDbr9pfndHO 2/qHCLe3Rle4bBSIOSgCgFQpCycW6fgDWE3QSMYrfPtSP5z3CX4LLMji6/L9HwvKlHCD Rv6JCPgHuhZQkP0mwhPKmluzFoEOoF+JFCkq39JPVOBnr/Ug2M+wvsh5cimTGj3AX09z 4kTA== X-Gm-Message-State: AO0yUKWvDLhgudipL5Caic/OCiOWpY+ha81UPYMbFZAow2pq6bSjh6Se TD1sfDAZU4XAdx4CjFQjQHxbEY3bwQk= X-Received: by 2002:a05:6a00:4acc:b0:58b:b29c:50c2 with SMTP id ds12-20020a056a004acc00b0058bb29c50c2mr11657299pfb.26.1675471318318; Fri, 03 Feb 2023 16:41:58 -0800 (PST) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id z15-20020aa791cf000000b00590163e1762sm2400003pfa.200.2023.02.03.16.41.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Feb 2023 16:41:57 -0800 (PST) From: Eric Lindvall X-Google-Original-From: Eric Lindvall Message-Id: <8164f307e2a4c93dc7ad0dbcfb33d493bbede6b3.1675471315.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sat, 04 Feb 2023 00:41:52 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/5] cbs_sei: add ff_cbs_sei_delete_message helper 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: Eric Lindvall , Aman Gupta Karmani Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: D1aW0RG0Qq2L From: Eric Lindvall Signed-off-by: Aman Karmani --- libavcodec/cbs_sei.c | 25 +++++++++++++++++++++++++ libavcodec/cbs_sei.h | 7 +++++++ 2 files changed, 32 insertions(+) diff --git a/libavcodec/cbs_sei.c b/libavcodec/cbs_sei.c index 50a513f592..1ea2bbc109 100644 --- a/libavcodec/cbs_sei.c +++ b/libavcodec/cbs_sei.c @@ -347,6 +347,31 @@ static void cbs_sei_delete_message(SEIRawMessageList *list, } } +int ff_cbs_sei_delete_message(CodedBitstreamContext *ctx, + CodedBitstreamFragment *au, + SEIRawMessage *message) +{ + int err, i, j; + + for (i = 0; i < au->nb_units; i++) { + CodedBitstreamUnit *unit = &au->units[i]; + SEIRawMessageList *list; + + err = cbs_sei_get_message_list(ctx, unit, &list); + if (err < 0) + continue; + + for (j = 0; j < list->nb_messages; j++) { + if (message == &list->messages[j]) { + cbs_sei_delete_message(list, j); + return 0; + } + } + } + + return AVERROR(ENOENT); +} + void ff_cbs_sei_delete_message_type(CodedBitstreamContext *ctx, CodedBitstreamFragment *au, uint32_t payload_type) diff --git a/libavcodec/cbs_sei.h b/libavcodec/cbs_sei.h index 1c327a4689..96bd116a53 100644 --- a/libavcodec/cbs_sei.h +++ b/libavcodec/cbs_sei.h @@ -202,4 +202,11 @@ void ff_cbs_sei_delete_message_type(CodedBitstreamContext *ctx, CodedBitstreamFragment *au, uint32_t payload_type); +/** + * Delete a message from the access unit. + */ +int ff_cbs_sei_delete_message(CodedBitstreamContext *ctx, + CodedBitstreamFragment *au, + SEIRawMessage *message); + #endif /* AVCODEC_CBS_SEI_H */