From patchwork Thu Mar 30 02:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40914 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp949264pzb; Wed, 29 Mar 2023 19:05:54 -0700 (PDT) X-Google-Smtp-Source: AKy350ZD+P+IpxxsegS0FjHtfEWlVAgjslJCI+zrUHXn3oHUVTfswC55kIFgN3+SimEH37GS3VPG X-Received: by 2002:a17:906:d283:b0:925:b187:ce5f with SMTP id ay3-20020a170906d28300b00925b187ce5fmr19547795ejb.35.1680141954300; Wed, 29 Mar 2023 19:05:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680141954; cv=none; d=google.com; s=arc-20160816; b=fzOlXTM5/Axh81s14GevneNvR+R0ZldiUpTzJlQ/c0Eup4PR9YvVjWd5LrUBZcfPon GiWzCyrwXubwQqN/g/cYAr/h2hfbLtyl3V+9yXIem/35y0MURFQtoGh1iKGGjpuw9YFh WM15tXg9FOmJEGqZhyBu9sGafFii5xSKNzMrsHiDFYc2qpfXMVxec27utKdHY1ZLuREm CZOs04muZku04rUHsCRFYc5S/a5GqECOxmAEMFhos4+ISrcPB+Is0cnWcerwBFGvzw0x S+N9UI7SqzzKvxGn/W+z80LrJkaRXBYRMgF3NrOhBMt5SPoCVv78ZcdGTwxFd9/2OIoZ naCA== 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=tT13dOzUHyZkBWFJWReBWcYQfIhsG4Ix64DYZmrcuuo=; b=vaydQ3xHk8SFZXkAJK2jZanX8KULbk/grImO5DJ2GtQz/+Pl9FYctft4Gir/CV5ZXF /o18fZTzjG15H+HpUqhheeeT5JAmBYlVeAa0u1v6nH2s2RbelNdnrAjue437zoR27sXW 2mIN9HmRqlOhjucJT7grd7VH5BQj15d31ueLcLySfeYH2BbcJcAC1nTdugTw0fWbrvzJ ym/m8zjZsllEKm8MT0ZlFjc8utMSyn8vK0Kl5PAK+1onQEvcoJEcKEFt9U15PlYzVn7q cWvaGukUbokyALAaWjxU39Q2CgSiCpMETu+pTX6ic9thha8F72UwfyQ5qQsO4jYB+m9T QEhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="AiXI+ai/"; 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 lr25-20020a170906fb9900b008c0f93e4de3si29067168ejb.99.2023.03.29.19.05.54; Wed, 29 Mar 2023 19:05:54 -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="AiXI+ai/"; 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 6E92A68C41F; Thu, 30 Mar 2023 05:05:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5661868C376 for ; Thu, 30 Mar 2023 05:05:23 +0300 (EEST) Received: by mail-ot1-f54.google.com with SMTP id f19-20020a9d5f13000000b00693ce5a2f3eso9279437oti.8 for ; Wed, 29 Mar 2023 19:05:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680141921; 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=QcvysifUfFXoR0tWo2QiyDwTdz5p9fZZ3MTh5qm4Nl8=; b=AiXI+ai/Z1M7nYED9Q0/F8SQFIAdsVkOArz8iLRQIDt9rC+6ZHOH4gQm7B3MmQeaCv dikD4cb9PvSJ6kM3zak7EyE1ui2vZQ/ihW/AmQgJKnvX4co6Vj3YPPrJI2FXVW1BEeb9 HGGkqfZG1jJrwTLT0ih92JkgmARR1jEB5aNBqC6HdR2FX+rzfcvfH2UBWaWBALXaKGqZ QQcCwH+PvJoup9CDYXijc1XTOesUq36sgZeqyCtL100OiW1BeriEaBNmNy3oSGvnKYMB kH46boXn2hdu33SWU/nKhHzxFF+5WpD56bPaNma3NxmJOIEhh/vssXst9x7QqijRWUn+ QzcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680141921; 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=QcvysifUfFXoR0tWo2QiyDwTdz5p9fZZ3MTh5qm4Nl8=; b=QNDb1ufXRmVoh1IRaPJki3U6XnUHlN0vCUYv1xuJVMZsNyfT+RGbuA9JqX9sSL32Rl p0jydVskwzIZn+fmDbH9W2DS2WM2EBrO4eYpERxFtW3ZAsku2oEH8q37H0swhijPFghp 3ji4ISF2KdbHoJAfVhM7lhafOBovpNYFWSEAkNATYZ1LijSY+FmlDnhSrGZ+gsXOpXEe NgJffDyCWE7PAJ4zwLFRjQ3tZRt7jV4ykw6jRqc0Qj91khjGV0+Fj4SAaUGbKXzGZsQA DvIrrquLqxiWwI2YqGqgX7b8wfVtL4dTeL3FPjrv/aaMkXerpLKAU64ip2Tu7aNHazcd KwLw== X-Gm-Message-State: AO0yUKVS9x3iYTNmt9TkGU0uqsvhhg+7Assa4UyZi2rJVEEqZwDkMLHS VlIgeEdaWwKbrX+nxr4Ree8tu+7hQns= X-Received: by 2002:a05:6830:1155:b0:68b:ba4d:1c94 with SMTP id x21-20020a056830115500b0068bba4d1c94mr12173718otq.4.1680141921552; Wed, 29 Mar 2023 19:05:21 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f23-20020a9d5e97000000b00684152e9ff2sm14221540otl.0.2023.03.29.19.05.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 19:05:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Mar 2023 23:04:45 -0300 Message-Id: <20230330020448.9146-4-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230330020448.9146-1-jamrial@gmail.com> References: <20230330020448.9146-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: Q5OcMZIvxXL1 Signed-off-by: James Almer --- Changes since v2: Renamed an enum and define to make it shorter, and added informative comments to others. libavformat/matroska.h | 4 ++++ libavformat/matroskadec.c | 6 +++--- libavformat/matroskaenc.c | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index b39517709c..ead7c085b9 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -360,9 +360,13 @@ typedef enum { typedef enum { MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT = 0, + MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE = 1, MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35 = 4, + MATROSKA_BLOCK_ADD_ID_TYPE_DVCC = 0x64766343, // MKBETAG('d','v','c','C') + MATROSKA_BLOCK_ADD_ID_TYPE_DVVC = 0x64767643, // MKBETAG('d','v','v','C') } MatroskaBlockAddIDType; +#define MATROSKA_BLOCK_ADD_ID_OPAQUE 1 #define MATROSKA_BLOCK_ADD_ID_ITU_T_T35 4 /* diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 32907f413a..3c7c2b7c70 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -767,7 +767,7 @@ static EbmlSyntax matroska_segments[] = { }; static EbmlSyntax matroska_blockmore[] = { - { MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, 0, offsetof(MatroskaBlockMore,additional_id), { .u = 1 } }, + { MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, 0, offsetof(MatroskaBlockMore,additional_id), { .u = MATROSKA_BLOCK_ADD_ID_OPAQUE } }, { MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN, 0, 0, offsetof(MatroskaBlockMore,additional) }, CHILD_OF(matroska_blockadditions) }; @@ -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..6b24d26d59 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); @@ -2657,7 +2657,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, &side_data_size); if (side_data && side_data_size >= 8 && // Only the Codec-specific BlockMore (id == 1) is currently supported. - (additional_id = AV_RB64(side_data)) == 1) { + (additional_id = AV_RB64(side_data)) == MATROSKA_BLOCK_ADD_ID_TYPE_OPAQUE) { ebml_writer_open_master(&writer, MATROSKA_ID_BLOCKADDITIONS); ebml_writer_open_master(&writer, MATROSKA_ID_BLOCKMORE); /* Until dbc50f8a our demuxer used a wrong default value