From patchwork Tue Mar 21 17:06:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2759084pzb; Tue, 21 Mar 2023 10:07:36 -0700 (PDT) X-Google-Smtp-Source: AK7set8zcjlM1SUQt4sOXNwFxxXC54BdasEiIr801u+a4b2nFDD63Svmbq14H/70KBhZWw+RNmSD X-Received: by 2002:a17:906:71da:b0:933:c474:420b with SMTP id i26-20020a17090671da00b00933c474420bmr3851558ejk.19.1679418455780; Tue, 21 Mar 2023 10:07:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679418455; cv=none; d=google.com; s=arc-20160816; b=j1fzDBG1c9eufRa8N5oIBzRwhgohUuCQWvVlHVbq3HC4pipMzYfcrNgHjCaZbA1J/V jlJULKBNTSmC5y8lvLzt+RwchLRt4P2thcqztMTeFOrx/4NmJ7n2BJgM9ahisc5LfYUL OOg3EhsRGdz+X6Qm72QsC9jwmKZNY0iS9AfYQxNL/yQVV6awjBsvao5WrDMUdLOmVzvN dJrnguOreYYifmNKlxEezYacmO5QUq23Gx1hi16VTQxuVgJXxsxdnTI1EdD4k/t6SeW4 Yeytt9sgdXUxsG7LwF7p3gN1rY61cH5EwUvue8REveWt8UyHOoYIfyuy3E6FS4x0F8iK HXKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=x9EMAark/JxaKrFUOCS8SYdpLWD9ictf2Ab6kj1gpmw=; b=jhUEGK1myS6Z9NfHW0Qu1zBdcK8yKnzbDp8641ZKOaPNzFWO1gOBP9YMj/brJW94FZ GE11Qs75+iS3jnNIu0GVKXdRe0GsVRRmUtwn/AbQHnhQov8NfWJkbe1yBnX7TZ/X3A0x OK6d7jbkz692qwt0bBaJ+tnV8cwQ67h53VSo5wC6reOb3W3Gvs8U3/VyciGq5foUY8A0 2wRIKySCChvBPKfDoEdk4hNV7gZz+cWn6aatBuO3Q0o0vXCi5gpcWZDL8u+6x8Qj0jv6 EDpTAZgdhNfxce+hEQNiBIeshjaSx3xU+UCLjFMVj2EwbUxxSfSRGo9MHcUS7q2BLv4U 4vfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=BoSTULvB; 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 v27-20020a1709060b5b00b0092fb3c3b260si11659915ejg.334.2023.03.21.10.07.35; Tue, 21 Mar 2023 10:07:35 -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=BoSTULvB; 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 98D8C68BE68; Tue, 21 Mar 2023 19:07:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA31068BF8D for ; Tue, 21 Mar 2023 19:06:56 +0200 (EET) Received: by mail-oi1-f173.google.com with SMTP id bk5so2331456oib.6 for ; Tue, 21 Mar 2023 10:06:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679418415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=r2PbORDhiCMRqUKJdksDP5cOeo2q5JAzyXDhVZZ4X6o=; b=BoSTULvBmvXJqKRCeg0RS+zu9uzxCTCiFuoiknfmUBDJkC5kaqo5p4jkWoRHK3MMKq nMwhvn0w7Pt5KgGZCL/tfP1RkZT1gvBaNkKnnWFbC8yndh1/PobZNEewezM2bgnZj2xF 9NExOdBJijdXCqgxgi4ghE5T1Svx9z7T6NREARUKi1bKpxPYOhdOc8uqUfxtqz8bkIlb N9jHODBP3KXM3RKsx4u+i96s2KTTJqvfDgEO2R+huFFRJ+SeJtViIJOkDP2JbTHIj4Vj 1NLuEYhzZ5VS5LRn+yJ2P3f+82TteP5zuQrLms8U9b6pd0NnM5IovWgxvnAw9pev1skh 3lHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679418415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r2PbORDhiCMRqUKJdksDP5cOeo2q5JAzyXDhVZZ4X6o=; b=IpRS4xZtcom2MjvC5Ooi7gvznlIBZ0YwmF8/BsHeN/ugrpua74iFJEzh0C021j94oN ZpSaY4MFhXGOpxo5nDxKTWZmPugioYWOk6d2wxuJ3lqBsoQ3IsV4gRa6JyzJ/qY9ZTnv +p3kMQWSFCi5+KBOHzepzZv4FNBFmdLTl8uzuvxKHm1LuHc6SDDUcJ7xfdQhNMwMGEc9 qR+YUTqXiInEjzqTSkEOij3WW3Bx5XOS9KBV1SzCsrIQoHihxEipeqpK3PjU2t2644FT dl1YrXwhnTWajvrc2VobYuvvOSKlwxjvPHB18YLX9aJEqjRaexBHQECIjwMjul7MpdoX RncA== X-Gm-Message-State: AO0yUKXslrsmX1fyTXZtcHAGr4Yv9Eb4eObScJCp2QdcMTRoDh7gYy6v Z2tjlI0XhR5TajFVY46U3Xmc0AltWq4= X-Received: by 2002:a05:6808:1820:b0:386:eedc:a5cd with SMTP id bh32-20020a056808182000b00386eedca5cdmr1631407oib.43.1679418415043; Tue, 21 Mar 2023 10:06:55 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id b11-20020aca1b0b000000b003872148d322sm845876oib.22.2023.03.21.10.06.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 10:06:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Mar 2023 14:06:34 -0300 Message-Id: <20230321170637.10907-4-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230321170637.10907-1-jamrial@gmail.com> References: <20230321170637.10907-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] avformat/matroska: add a few more Block Addition ID Type enum values 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: XTrpAuf+/hPO Signed-off-by: James Almer --- libavformat/matroska.h | 3 +++ libavformat/matroskadec.c | 4 ++-- libavformat/matroskaenc.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 8a9c1b5119..04719f1d06 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -360,7 +360,10 @@ typedef enum { typedef enum { MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT = 0, + MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE_DATA = 1, MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35 = 4, + MATROSKA_BLOCK_ADD_ID_TYPE_DVCC = 0x64766343, + MATROSKA_BLOCK_ADD_ID_TYPE_DVVC = 0x64767643, } MatroskaBlockAddIDType; /* diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b1d2391840..68f9271e73 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2404,8 +2404,8 @@ static int mkv_parse_block_addition_mappings(AVFormatContext *s, AVStream *st, M } track->blockaddid_itu_t_t35 = 1; break; - case MKBETAG('d','v','c','C'): - case MKBETAG('d','v','v','C'): + case MATROSKA_BLOCK_ADD_ID_TYPE_DVCC: + case MATROSKA_BLOCK_ADD_ID_TYPE_DVVC: if ((ret = mkv_parse_dvcc_dvvc(s, st, track, &mapping->extradata)) < 0) return ret; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 954b7d828f..46f4331a18 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1612,9 +1612,9 @@ static void mkv_write_dovi(AVFormatContext *s, AVIOContext *pb, AVStream *st) + (2 + 1 + 4) + (2 + 1 + ISOM_DVCC_DVVC_SIZE); if (dovi->dv_profile > 7) { - type = MKBETAG('d', 'v', 'v', 'C'); + type = MATROSKA_BLOCK_ADD_ID_TYPE_DVVC; } else { - type = MKBETAG('d', 'v', 'c', 'C'); + type = MATROSKA_BLOCK_ADD_ID_TYPE_DVCC; } ff_isom_put_dvcc_dvvc(s, buf, dovi);