From patchwork Tue Apr 2 13:32:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhupengfei via ffmpeg-devel X-Patchwork-Id: 12579 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A7614447FF3 for ; Tue, 2 Apr 2019 16:35:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 997C668ACDE; Tue, 2 Apr 2019 16:35:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 08F1868ACBF for ; Tue, 2 Apr 2019 16:35:14 +0300 (EEST) Received: by mail-wm1-f42.google.com with SMTP id n25so3743535wmk.4 for ; Tue, 02 Apr 2019 06:35:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I6w3b/fDHvqVpLgxfbtN580utfFTTEoo0Ill8lbTSkc=; b=KDlSBux14q81gmh9sOnNtrfdDPPNKnHIh5zaLPnF2+iZ6matu5EkOqeAdRqBnint7J 3nWHuA1ohADPM5sfjyMMDhZeXEmPw7n4mkCz0l2Y3/itLIdCfw2UsmSFZhwkThMFS6ei exZJF9wBcKb5ZmgzooJUumGN6rT49Up7nVQulUpkP17eJDL+ChicZGJ9u7pgRrvcP+ka vaAckvxI9wDYPqCJlta+o1bUdCZAUBEQ8VWDAvATVxaBKjs5AEzWhx6vpkiOh8pgi7zW WNEHfX9FZCGKe5S/BWKshfxJlDNWtyEHWHIY/qI5w7d2VhF8woo9WH8QJNEowukSU3j2 MLbQ== X-Gm-Message-State: APjAAAWbtJSYDR/yF/sn4gFtrc/EDqx4a3u1eNUDzmUOZhWHMy5l3iF/ BADkvuCOpBuf93nc8X9TGOgsdzmUVPU= X-Google-Smtp-Source: APXvYqyaZbHGUcnak0hp0xFLxP9sqXK5YJ1lKZnfaiF2j9dxIWn6SsckFw0rLmhdyIXn17NGlcVWIw== X-Received: by 2002:a05:600c:291:: with SMTP id 17mr2848981wmk.17.1554212113327; Tue, 02 Apr 2019 06:35:13 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id t24sm15566886wmi.10.2019.04.02.06.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Apr 2019 06:35:12 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2019 15:32:56 +0200 Message-Id: <20190402133305.3328-7-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> References: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/15] avformat/matroskaenc: Simplify check for writing CRCs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: zhupengfei via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Up until now, the check for whether to write CRC32 elements was always mkv->write_crc && mkv->mode != MODE_WEBM. This is equivalent to simply set write_crc to zero in WebM-mode. And this is what this commit does. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 7e2ded89bb..220d090a48 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -341,7 +341,7 @@ static int start_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, Matros if (pb->seekable & AVIO_SEEKABLE_NORMAL) { *master = start_ebml_master(pb, elementid, expectedsize); - if (mkv->write_crc && mkv->mode != MODE_WEBM) + if (mkv->write_crc) put_ebml_void(*dyn_cp, 6); /* Reserve space for CRC32 so position/size calculations using avio_tell() take it into account */ } else *master = start_ebml_master(*dyn_cp, elementid, expectedsize); @@ -357,7 +357,7 @@ static void end_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, Matrosk if (pb->seekable & AVIO_SEEKABLE_NORMAL) { size = avio_close_dyn_buf(*dyn_cp, &buf); - if (mkv->write_crc && mkv->mode != MODE_WEBM) { + if (mkv->write_crc) { skip = 6; /* Skip reserved 6-byte long void element from the dynamic buffer. */ AV_WL32(crc, av_crc(av_crc_get_table(AV_CRC_32_IEEE_LE), UINT32_MAX, buf + skip, size - skip) ^ UINT32_MAX); put_ebml_binary(pb, EBML_ID_CRC32, crc, sizeof(crc)); @@ -1865,9 +1865,10 @@ static int mkv_write_header(AVFormatContext *s) int ret, i, version = 2; int64_t creation_time; - if (!strcmp(s->oformat->name, "webm")) - mkv->mode = MODE_WEBM; - else + if (!strcmp(s->oformat->name, "webm")) { + mkv->mode = MODE_WEBM; + mkv->write_crc = 0; + } else mkv->mode = MODE_MATROSKAv2; if (mkv->mode != MODE_WEBM ||