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 D71B445C5D for ; Thu, 30 Mar 2023 00:49:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B80168C38E; Thu, 30 Mar 2023 03:49:01 +0300 (EEST) Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35C8368C317 for ; Thu, 30 Mar 2023 03:48:55 +0300 (EEST) Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-17786581fe1so18122911fac.10 for ; Wed, 29 Mar 2023 17:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680137333; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=sMnKPEqYNarJF+AD5bIy9M2qE10kfKNlLtbL9OWCYbs=; b=pBCxoSL6C/FTsiKL1KVIebdrPkLLwgAkdb868tazAwm1VkTD9DjW4MFpl/cuFp4Dla jpZ07I5eQqTEpKkpOxrhC8JyH8qCK3DtuWQx12ZQQ/TFRtSG/o8QC5n2CDoUMdTthObQ V3JLlo8Vy+tFaaHdkxIdN7eJAnIpNhjPuDjc1FSso18ip4mG/c+/uN1BeL2tOB3Z9TpN 5EwPkn8OtZl8FnTS2up3300LJdov2DeCbmMEfahsX4B7oZHK15Tcd8Cb2/2vVBSpe6Cx yIWKRRKRSmi5mCkt4X3+W3fRW1q2KAae0xWKwSY929qFc8hWoMdo7o6IBTNdo6pe8DUm zOBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680137333; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sMnKPEqYNarJF+AD5bIy9M2qE10kfKNlLtbL9OWCYbs=; b=NgjCs1d8f0QYywCU5EuIxQq8ZWYMSw/2oMjAoDHPcDAX0DXSH2hsiTpOtG23qxbFFZ te/EZamTlaujqQgMWwEKikq/JyXu9XsC3eD7aKggg8aH+EEHvml0myPcXyzctT+DmL2S XEHTK0tkrZKjZ+ZnUn+jO3oBpyvbw1d2C9if7gOh/nArSXyk59QzCRjkXJS4Fx+E4SYy o+NAjPoQ/oKsBi4iT3xnF8zQq0CoLot6uAoEtn8acgu3WVC3d9qpjZk4awC5hzAQlcyz tdnHnXJC1jheB4RrbqxW1czr9grbM3o3v4IbTKFhPPDEHPjPcSGZNtTwpAmMYjUWVN5t tFOw== X-Gm-Message-State: AAQBX9f/dzS/IRPcBE4zUKXyxaRuGJSVEEX+33STY0yu6S/jHFXQ3iKa 3y+FRtUXtGpgKIOTwrllcI9+N5X3FeM= X-Google-Smtp-Source: AKy350YKc19MJgw4bYcnWY7UmgFSypQ2KagTzKPQBA6WTWFJ5iZ4rkyemIBAcrjcStiK5vHdP4ddwA== X-Received: by 2002:a05:6870:d195:b0:17a:b214:f004 with SMTP id a21-20020a056870d19500b0017ab214f004mr14603033oac.6.1680137333290; Wed, 29 Mar 2023 17:48:53 -0700 (PDT) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id p16-20020a9d76d0000000b0068bd922a244sm14851647otl.20.2023.03.29.17.48.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 29 Mar 2023 17:48:52 -0700 (PDT) Message-ID: Date: Wed, 29 Mar 2023 21:48:50 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230324155213.3493-1-jamrial@gmail.com> <20230324155213.3493-4-jamrial@gmail.com> From: James Almer In-Reply-To: Subject: Re: [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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/29/2023 9:43 PM, Andreas Rheinhardt wrote: > James Almer: >> 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, > > I regard the MKBETAG version as more enlightening, even though this is > more in line with the spec. I can add the MKBETAG version as a comment next on each line. > >> } MatroskaBlockAddIDType; >> >> +#define MATROSKA_BLOCK_ADD_ID_OPAQUE_DATA 1 > > That's quite a lot to type. Will rename to MATROSKA_BLOCK_ADD_ID_OPAQUE. > >> #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 > > _______________________________________________ > 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". _______________________________________________ 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".