From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4950B45B94 for ; Fri, 24 Mar 2023 15:53:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1381968C85B; Fri, 24 Mar 2023 17:52:48 +0200 (EET) Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5815B68C841 for ; Fri, 24 Mar 2023 17:52:41 +0200 (EET) Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-17aa62d0a4aso2153669fac.4 for ; Fri, 24 Mar 2023 08:52:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679673160; 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=S+Wg2P0mqv1tI/cULEb3FZdvUlnuke1Ns3ZAPA+HQVY=; b=LQAfoYrnfN0IzR0oyqWLWgDp6qJKCPYJaBBjzLQArsUCejRhSrK4uCjmnnc1Hlbn4m TwIiCsHZgl5Kl3hcE9Dz9OkExDaAGCuIr6P3c/G+QEpUcf+kmq3qL86EJX5Rdk2L4Ntf o1EOkJGNBXdt3vh8HEOtOZrDjFc1Hx0tLTV7f9CX+tcUS4zLtpvwEvOALYarL9duKtmg xpKWWhlRuu4RmD1UvpU2nO5yF7dA8fTa5KJ42ScicSag+bzbTCrkxkz2Z/9+Ugpwrylw fJBgv6TeDCs9PsH1i8FkoFLI46cQQIyLiuBHCCMVvXm0bvRN/FxkLUTk74wpLexovZqh r3kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679673160; 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=S+Wg2P0mqv1tI/cULEb3FZdvUlnuke1Ns3ZAPA+HQVY=; b=FZ/lRdyQHRgt+feLg8ZIv4gX3KdJILvc4d/sLZIOXVXj8NGGqyikh1Xr50IYG/WuuU LcjAhLyT16KO9s1+BDCyqTOWPZkw5GcEwQ0KtN8I2ha3y3/9gVs57wogEn9yJ16yl2bW L65hkzfeiUr0GHEgglnMBPfXIdBGgis6XNzg4GnaIsAyo9suFTQ/Dvmu4DC3RWNArhWD JPFeRwJ10gUTRuD5eOsGaUrLfqoSD/uTgTdUo+S+qKo6jRoY12APgR4eCGbNaCedPOQQ dD5l+bDSYCl5ukNiSkV/kW/V43eshARP8SXpKswCTpnCpzP105aZzPza58eRCyBcqBS/ oZKA== X-Gm-Message-State: AAQBX9dJoJ4KQCtN/ZUagV4ILSng9cziXF9GLtJecE/NPXoEADiz+fKk 5AOCpgwCwTq4yJ+QV7Rl8fpjIh8Y0ss= X-Google-Smtp-Source: AKy350Z9u2pYxPjK1DCbG4ETexzg4oRxI7FE2Bt4Ia32fMXOCBYbOPkRdaQaIwsQTMBNt4a05Bw0Pg== X-Received: by 2002:a05:6870:598:b0:177:9c93:efa4 with SMTP id m24-20020a056870059800b001779c93efa4mr2449106oap.0.1679673159708; Fri, 24 Mar 2023 08:52:39 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id yx24-20020a056871251800b0017eb6cc4609sm1475940oab.39.2023.03.24.08.52.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Mar 2023 08:52:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Mar 2023 12:52:10 -0300 Message-Id: <20230324155213.3493-4-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230324155213.3493-1-jamrial@gmail.com> References: <20230324155213.3493-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- 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..3827675777 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_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; +#define MATROSKA_BLOCK_ADD_ID_OPAQUE_DATA 1 #define MATROSKA_BLOCK_ADD_ID_ITU_T_T35 4 /* diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index ad8b352f31..b18c9e31dc 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_DATA } }, { 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..c083f55319 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_DATA) { 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 -- 2.40.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".