From patchwork Mon May 30 07:49:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35979 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2120056pzj; Mon, 30 May 2022 00:49:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNYjNuV+VQIounMrJ9keh1IjED066MKOD5Qh6iV8jSvwARDDnDnnmQRt/OEPZ3CzXC8DoW X-Received: by 2002:aa7:d582:0:b0:42d:ce84:7e07 with SMTP id r2-20020aa7d582000000b0042dce847e07mr5396565edq.297.1653896992171; Mon, 30 May 2022 00:49:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653896992; cv=none; d=google.com; s=arc-20160816; b=x0HCByfS28scF7I7p7zHIiIYd05+7elYGTvM4AV0XbDuE89X3AX+5YBYy6uztrnzyK vchC0MBTmqmsFMk3TcVJRGUXVImmo44hKHq2Mm1oPot3jot9NzIjhCVMEC7VFn9dkMTa otQU0F+nNctgXGeGcCQIIXoEOoAv2jj1hcMnC1S0mEebJgJ7GOzTXTlGMAtBiIgNG6+q oOrDWcs3h5J/cUTzvqUZjcYUMeSjEg/5/OqKqnIUD03sEz9Xd9z+d/8ZMkEu8oxThI+3 uZpt2+A3hwVHmN4ZVeLGPYjDfCRXugjR/GcTBI/8Rm2dyhnm+1ZIkZgn47828Z2qrmfm RPQg== 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:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=Dr8i6otaKdRxnred7yIyFGLGeZs8V6UWLXTnpFMHkdQ=; b=ygWUoYbXMWtmazgp26JQAGFt0x+iCJE8p4gkhENgQ4d9EvyZ4uIzkecD+bFskMnw+j 9hbNl02ILu4crezv4vH4XlQNEhMX7ebjBvmJZ7tA/i1XExzkANR6jt6AuthJ0OiyqJP0 EsRb/fV3csh3gaMW1+BSpBSb0/Yz+DKAwWj4BHe//SVcQn5cjY8afWefjsEuSnHOdzmW /8DEe/ZCyJUWceddlRiCM0prOj6ZWmI6VN3XQgdwiyL37fbKt2/OAMsoDV5b8ySOUunL n6jGTYmYFg2qQgw1qTSs7gbLidL4+3m6NmSoG8OOh6Z/d/A073AdkLiwX7l79ivYk5du 6pSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ULR3G38V; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b5-20020a056402084500b0042ab49ea917si14169331edz.85.2022.05.30.00.49.51; Mon, 30 May 2022 00:49:52 -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=@foxmail.com header.s=s201512 header.b=ULR3G38V; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE72D68B5F8; Mon, 30 May 2022 10:49:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE73E68B3A4 for ; Mon, 30 May 2022 10:49:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1653896965; bh=rLdZ77WZNS0yZYIqi8rkjj1UZZV0338e7gTZV8PbwKM=; h=From:To:Cc:Subject:Date; b=ULR3G38VWQ9DTe41RfJo1BhxTOycIkSEBIAmiP8ZCDczNMAdfjdiTl1Q0zEHRKB0S HF5rF+7/601/iSRvuIkvr8ghX5qgFq448kICakphpTqLXc27dVbSn3Z2t/jAW+2X7D NhcoEV2eM1IZ7cDItKElnNF5L13tD6SKOKslhzn0= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.56]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id C582FEE6; Mon, 30 May 2022 15:49:24 +0800 X-QQ-mid: xmsmtpt1653896964t9bjsihns Message-ID: X-QQ-XMAILINFO: N1woPqWMJ6QLrCRJRY6Xl2MqLRsVSRsX8+JJosVKOMwdYbtp8X8s0nLv/JvAoA fC98ckH20Kt2eU8vk6Mtk/S6otaXqkc9M22Nx44NgN5/4b8yNXOez4J3kvLHIfXEtdMr+TbciC8k DtCzZ8dGsdyi1WVunLQPKGENUpqiQ9CSGLrlXnuBMEsrClv5X/oQzWUpwF45d1KNb9oe07vkqBdk 3SdkCMcNHJhGheuNmK6/KwnxnJabOCHVRKkwHmLVvjiQv2W5JE80HlwZELw/BQ/tq4AE1gWlwg+y cnTRaO5hRo6kaIFHOR+jh9QwQIXtYj6VM8n18mKuf0QMqkLt0oquG7jW/dYVnw4xS3xtQWBwihtd Z28apD7k5vt8KZ87o+ZiTFMDMd98TOeVQxeeQt9L+oGE+tPEUkkORhP/OaRvRTTlwZkrlszhfx2S DrMnYFLCS/lr16SanCYmCbBBZtDyjJplFweljMLObgD2bjJ02w8cydlQjO+m+bdQn8MzTe5qpIwn te91LSYRaN2EBpMqn47YU5dkatYcJuoukCYBsXTvfDPQI4mJ1m/dty8ca+KhmyM6XKGPggevSFPj KYgCRAKj7uo0Uygvyef4SgjAj6Wzm8sXtAlEPa4KagptXiU9udG/B+9z8vAgR6fi71JVwJlefWnG dTmp13+2KS/mSiC6W4zeLnwSZPR/bS3Q8BycKq/qJB+031sfp4527GhgqiISg540JWPlAUcQJQg0 o1Od5kmz/WWPXn6uMMs11QWs1qbkf2Skdrp/+decpu2wK/32Ape3RJO20dXm39k0B5Z0NHqTuq7f aLgeFl+EIqBRw8unRapzdadX6xdOpPziPbDSx9NkgcOV1RwTL0vqHzFtHdFMPwufpwcw26plIZyB Uv/6TFJldvXl7c2CcHWdEApkNQz+EQbWxLujM0+D6VIJqH0KfyFTls2hw3JFKJf72u5Vu+fBAO From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 May 2022 15:49:22 +0800 X-OQ-MSGID: <20220530074923.29089-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/movenc: enable compressorname for mp4 mode 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bGJAdTdp+1jS Signed-off-by: Zhao Zhili --- libavformat/movenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index de971f94e8..c2dc354ed3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2121,7 +2121,9 @@ static void find_compressor(char * compressor_name, int len, MOVTrack *track) || (track->par->width == 1440 && track->par->height == 1080) || (track->par->width == 1920 && track->par->height == 1080); - if ((track->mode == MODE_AVIF || track->mode == MODE_MOV) && + if ((track->mode == MODE_AVIF || + track->mode == MODE_MOV || + track->mode == MODE_MP4) && (encoder = av_dict_get(track->st->metadata, "encoder", NULL, 0))) { av_strlcpy(compressor_name, encoder->value, 32); } else if (track->par->codec_id == AV_CODEC_ID_MPEG2VIDEO && xdcam_res) { @@ -2210,7 +2212,6 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex avio_wb32(pb, 0); /* Data size (= 0) */ avio_wb16(pb, 1); /* Frame count (= 1) */ - /* FIXME not sure, ISO 14496-1 draft where it shall be set to 0 */ find_compressor(compressor_name, 32, track); avio_w8(pb, strlen(compressor_name)); avio_write(pb, compressor_name, 31); From patchwork Mon May 30 07:49:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35978 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2120014pzj; Mon, 30 May 2022 00:49:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbYDR7uMpbct6XZCV4zFwjLofT6Vq8u3HC54Re/eNhraD2tYUCY2lm0cKFcjnjDG8e7pEc X-Received: by 2002:a17:907:3f9f:b0:6fe:f9e2:9c6a with SMTP id hr31-20020a1709073f9f00b006fef9e29c6amr30223136ejc.479.1653896982492; Mon, 30 May 2022 00:49:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653896982; cv=none; d=google.com; s=arc-20160816; b=K2UemsO2ApbwRykL6du4pHI/o0yBSdfMg7RJXqI3Y+vdJw0BtEvutRjLJ35dyCoicP IZIO0C/Eprvum/IpmjJzVoI4ZSOyEtWWPJbOxI4j2uYFYLic/R9L+GnqQUSjodJl8eAD skMcSPPif4tflvVgq1do6DEISi0K2BC8QL2Nr9z4YNiqwAlvn4/kqwrTIZGL1qyVty00 9O9KP5+EWerA0DkauPAVUqWLoodC9I40p1QdM4bi2dDEq1WFnGa2seQ4r4duHJKhfCwn 1E1ncWYvlKBoHIYhNUQjbul/To9U7VAekMx98Tf135ts6Pylcmqt2SNP7Ix1w669VGwM Ki1g== 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:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=MJszDu5K+EadGO8sppWntojG0BPEqLz3gk4My6p/7cs=; b=bOMTwZSMGdC3y3pCSptCEfRrScv4qLysqwaLz5SJdwvdj/WDn9McV/Ur2VilS9WkJR lkZ+hR1aHttF6KU6bV3U1Hl9H4wk69CNenSrGSG9c8+luyNdA4WzqlHvqI8yBuWPc3x2 SOphKaEWDmCU5QBxtLeWDX2PcYQWA72cvqhpsTVnaAfx0gF4adI65YKx0yYIYSBEvTtY zYkatwD4NrVO8N71thi8bG+PxMrK2fASc/ALXRyFlYCEC9FsMUrqElu9NWEL/0wHRYPc lsOGgdZ7b4mKelQYru5FhyQWuhsr6dCnOOZy6S1nQEh1zErUem0mtyjaQwCNSkZbezY/ qPWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=fT1pFvSb; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dm4-20020a170907948400b006f4adc54180si11503319ejc.611.2022.05.30.00.49.42; Mon, 30 May 2022 00:49:42 -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=@foxmail.com header.s=s201512 header.b=fT1pFvSb; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF00268B098; Mon, 30 May 2022 10:49:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-235.mail.qq.com (out203-205-221-235.mail.qq.com [203.205.221.235]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59EE768B098 for ; Mon, 30 May 2022 10:49:31 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1653896966; bh=pbDckLPFTG7iZfKOjSxr8IU/QzQpKg0liCdrVdvkDOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fT1pFvSbtsGJHC8hxiYpcCeIAk3hmX3fdZa5RT72VLhjAgPrNISKtzms9ofLKt6Yx HBsLFQoJX2X+XjKegCeb6CgTZlVsOYUF3wZawFnZAmjkSHgMckkV8pvkVraLnATHqe D7edreZq0KK4I7g6149Xjhfhib+//7Vwm+JJt408= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.56]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id C582FEE6; Mon, 30 May 2022 15:49:24 +0800 X-QQ-mid: xmsmtpt1653896965tz67mjpa8 Message-ID: X-QQ-XMAILINFO: MyirvGjpKb1jR4v/gYDHUjc0s3xsB2jPihY3Ueny/1o3MBZeS79GIRvILuhOej 5pLDL4hhQTCMDNsBfrCYPhRXXsByk8aghI1ZP335zy1ZROVmFJXs436Ma9gGh/rYJoPeZRi0WBe1 WGdR2uebPjDZee9qRVZedNee7hBkHr4lyKWLJ2tP1PrwAbFe/c7LOnDIAJTzdFMk1VRa7UFzE5Cb ygMILsXSjLKWf9eT9a4N/fZIhjLNdnR/lqqlnTiC7c01AFYckWoVnF40nXZiztDQfi26D793gYuN zlz78M3oCgAN3Wm9mF1J+5Wgtxhe+0ZQl7cCc9xRw6xge5CiL5S4Gm3q+kI3oXU16sUInbXJPZIs jERLUYBxAXjdJUVdijvTFDJFV+6gIUxpQQyyAksilN/8Ys2i7rJxbHHde9d/ohh6/4PURLWYmAH8 MESG94+CkM7dMrg6S2bYglKB1jLZ8TwU0tQhJXPAMimXbhmk3ek4U4PWem4/wnC1KRfYgrXSyQH+ c+OdeItaeRo09F3L5+iGBuo/e32rdP51brH0may9LwpnDjrqNdw1hve6DJ9VE6xfBPhmapn02ymr aeQEleqvI4RnTltyqN8tvAijzgvUJozL8v24TQ1sK2l+87fLHP0Jld6ORtfpMAwJcc+7L3ynOcbg pddcv0Q5FgZSPV4bb34uP9yiFd8SZPV+Nn1QMn7CxHc7yenb4CUdbltuJUwiG37egubNKF3yqRHc wni6a0qSeSaN8eSzWCi0yB/stx5g/xMmBNgYG1M3TkgTwZEvae1cHdsZOF19Uu3IOewri0aehohg IJgwIizM1+qTXLqq9yxhn5pz0AftuXfoe11/F5aF8Fdzi/DM/7kZYmSRqYfDX/jKuh3YiBi8dvpD LubedaF+yFApxI7T1htMtqVKLe/2G/INrkFLkULMNaEl6z02+OHwGRoe7Kx6foQQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 May 2022 15:49:23 +0800 X-OQ-MSGID: <20220530074923.29089-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220530074923.29089-1-quinkblack@foxmail.com> References: <20220530074923.29089-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/movenc: enable btrt for mov mode 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: je4nfBEbBc2H Signed-off-by: Zhao Zhili --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index c2dc354ed3..69726d93e3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6897,7 +6897,7 @@ static int mov_init(AVFormatContext *s) } if (mov->write_btrt < 0) { - mov->write_btrt = mov->mode == MODE_MP4; + mov->write_btrt = mov->mode == MODE_MP4 || mov->mode == MODE_MOV; } if ( mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode == MODE_MP4)