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 7A4CB42ADA for ; Sun, 12 Jun 2022 16:04:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DDAF368B42F; Sun, 12 Jun 2022 19:04:15 +0300 (EEST) Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E223D68AE81 for ; Sun, 12 Jun 2022 19:04:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1655049842; bh=+xZ7TaefR4xp6GS1GpJ6MkgD4/EVQOcg7svj9ltVKL4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jbv3qot+MwRfwROIdP5/HKJNh9euCy6De6irtfJOI1RzN+bXKCtRcJcpyzwe61c7k nOiwVbJoylYfkKQ6FYcUV8CCyIfCSPU4GE2WivW6LRQUmIurgg9X+8oBri2eDJ8/nX sJq1kslgHDawe5bvfIdLTZwHJpUPE82QzQahcnbY= Received: from ZHILIZHAO-MB2.tencent.com ([121.35.187.221]) by newxmesmtplogicsvrszb7.qq.com (NewEsmtp) with SMTP id 1011E21D; Mon, 13 Jun 2022 00:04:01 +0800 X-QQ-mid: xmsmtpt1655049841tap32m91m Message-ID: X-QQ-XMAILINFO: My/elTziho8NmFbksLuVfzf3/T19DBpX048uOrrmldt5abDt0oid1kqNI5nlMx AJhoOJZH065yRNJvs5veIwD77YMkU3NiW2MgpcsyFb8jOGzkn83HSEHEsgHqinlMwRRSJHA0Ql3f cXJ2wbl9jTbVFF8gpEuxul35tYKtYjHIoHEqk8gNn3O9jOtbsE1s26Ylheu9npKr3f2zZhO6Q2sY 48TlaxIzqs2ONrSgp+DL+b0Y0+Cc10fat/cEVxz86CZSlxJHEMsx7p9ARrpSRJ4RPOIihTEtvxNH +TyYkxYtYGP54uiildjSUpDUk8KckJVB/AT9SmmowWsPBtzQJ/iUQzJ0Ak3xqljPOEiIOotbe9oS aK+I1kdhHpv4NosS+TlbKtTJiiCWTHdkO9XZHYAk4ywGzbs6WYObXUHXTCYu49lP5EeQQfIQF2O0 o5BwNEViPk/xMiOHW71IHuJQC+YM7OtcRcNXWMfhrPmKcGlJjOBsqR3qDjLIUtjeF1fjGttZh+zc 0FiHxpZQsSUPltStM+jfsXJbrKXjLSL3ybkpOHP7COgG4GxU7y2K1oWtfogbfZHk27jrWeI8G9Jo EA06Dey8NhGb8iu5ROqtQqjFHAj3QV9gXGFk9gCHHcL+9GSeVY1bL84yMoF32M366hXm7MkG8vLf 6UO+Sc2+JHttFeFnH3/z2MSt1Y/gI1g49sE3RGcklVS7JAG/DaOpnk706V4JmcxGIvsuL7FRtZRn 8zggdrk/q/nSVlxwM0KeAJiF+GuPy2nnJYy0nS4gBeeym45ImYnfddX33dZNxoQjHXmsvOu9L4/M aMVcw1yBnbtydu45w29kx5tOEYGk1Nx+ZDEYgMmQI5niL3tsr6A7HHCu5Uu9Z/Ccm09npkeOeHeI ez0Y3YcC5tAQo0c6+1ymD22XNNU1P47YE1ObSRiWVrypsQL6F+lJaYNMuyG0NstA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jun 2022 00:03:59 +0800 X-OQ-MSGID: <20220612160359.54938-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 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: Zhao Zhili --- v2: update fate test libavformat/movenc.c | 5 +++-- tests/ref/lavf/mp4 | 6 +++--- tests/ref/vsynth/vsynth1-mpeg4 | 2 +- tests/ref/vsynth/vsynth2-mpeg4 | 2 +- tests/ref/vsynth/vsynth3-mpeg4 | 2 +- tests/ref/vsynth/vsynth_lena-mpeg4 | 2 +- 6 files changed, 10 insertions(+), 9 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); diff --git a/tests/ref/lavf/mp4 b/tests/ref/lavf/mp4 index 0becfd34f5..b05fa34d0b 100644 --- a/tests/ref/lavf/mp4 +++ b/tests/ref/lavf/mp4 @@ -1,9 +1,9 @@ -71c4ff2e747fe6f8169ff29244fe181d *tests/data/lavf/lavf.mp4 +a6e44724cab1c4b50c49b0fd227b87d3 *tests/data/lavf/lavf.mp4 312477 tests/data/lavf/lavf.mp4 tests/data/lavf/lavf.mp4 CRC=0x9d9a638a -3c5734ad6d05e4afc2ccefef1385e882 *tests/data/lavf/lavf.mp4 +19cbdb02f2f3e35bae779e2323be1b8e *tests/data/lavf/lavf.mp4 321363 tests/data/lavf/lavf.mp4 tests/data/lavf/lavf.mp4 CRC=0xe8130120 -07348e31d11d92396e1eedc48ea14802 *tests/data/lavf/lavf.mp4 +8ab9dd09f02b6d8146a40fc3c918d979 *tests/data/lavf/lavf.mp4 312021 tests/data/lavf/lavf.mp4 tests/data/lavf/lavf.mp4 CRC=0x9d9a638a diff --git a/tests/ref/vsynth/vsynth1-mpeg4 b/tests/ref/vsynth/vsynth1-mpeg4 index e5abc146bc..0926f3323e 100644 --- a/tests/ref/vsynth/vsynth1-mpeg4 +++ b/tests/ref/vsynth/vsynth1-mpeg4 @@ -1,4 +1,4 @@ -a7e57333c57e0f8a551374b063a41d9e *tests/data/fate/vsynth1-mpeg4.mp4 +7825630f9100ce18338dc598b56619ab *tests/data/fate/vsynth1-mpeg4.mp4 540105 tests/data/fate/vsynth1-mpeg4.mp4 f80ec173d37f2f91add031e95579a220 *tests/data/fate/vsynth1-mpeg4.out.rawvideo stddev: 7.97 PSNR: 30.10 MAXDIFF: 105 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpeg4 b/tests/ref/vsynth/vsynth2-mpeg4 index 7857d45803..47725e0007 100644 --- a/tests/ref/vsynth/vsynth2-mpeg4 +++ b/tests/ref/vsynth/vsynth2-mpeg4 @@ -1,4 +1,4 @@ -b751a2d3b4e693ca39d4fafa0175fc9d *tests/data/fate/vsynth2-mpeg4.mp4 +74ab83b391f9c90f7f00fe2c3dfb6b3d *tests/data/fate/vsynth2-mpeg4.mp4 159330 tests/data/fate/vsynth2-mpeg4.mp4 2645405bc5350acc85ad72f3352f5135 *tests/data/fate/vsynth2-mpeg4.out.rawvideo stddev: 6.02 PSNR: 32.53 MAXDIFF: 89 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-mpeg4 b/tests/ref/vsynth/vsynth3-mpeg4 index a241e929c6..e2489d0501 100644 --- a/tests/ref/vsynth/vsynth3-mpeg4 +++ b/tests/ref/vsynth/vsynth3-mpeg4 @@ -1,4 +1,4 @@ -7ca3bbb8bed55d558346d258f5bea440 *tests/data/fate/vsynth3-mpeg4.mp4 +963a2970c57e1c7d46e209d5392fbeec *tests/data/fate/vsynth3-mpeg4.mp4 26037 tests/data/fate/vsynth3-mpeg4.mp4 fc0d8c1e58d254031e6207dfcae8f867 *tests/data/fate/vsynth3-mpeg4.out.rawvideo stddev: 9.66 PSNR: 28.43 MAXDIFF: 79 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4 b/tests/ref/vsynth/vsynth_lena-mpeg4 index 375c3fc659..9b7984c68f 100644 --- a/tests/ref/vsynth/vsynth_lena-mpeg4 +++ b/tests/ref/vsynth/vsynth_lena-mpeg4 @@ -1,4 +1,4 @@ -a0d0edee19f6658d0e93d294e32a1a6f *tests/data/fate/vsynth_lena-mpeg4.mp4 +954162c34c24abe7a8fa6bfadcbb7dee *tests/data/fate/vsynth_lena-mpeg4.mp4 119742 tests/data/fate/vsynth_lena-mpeg4.mp4 9a1e085d9e488c5ead0c940c9612a37a *tests/data/fate/vsynth_lena-mpeg4.out.rawvideo stddev: 5.34 PSNR: 33.57 MAXDIFF: 83 bytes: 7603200/ 7603200 -- 2.35.3 _______________________________________________ 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".