From patchwork Mon Jun 17 14:21:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 49980 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1979460vqg; Mon, 17 Jun 2024 07:22:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX95HGkWrxJanUqWWfzKw0Fc4R6+IWEaVQnBPRq44Oe+VtZZMp1ggd60/ewgdqS8Qj1v1DhcMNg9pydR16k7yiYGJfTFgHiU1IeWw== X-Google-Smtp-Source: AGHT+IEXYOkHIbKvgtZu264jwqjZ6OQTuoCm87LR5BISl8MqS9zHJVtIalHhXOOw+9omgKjTaQ2G X-Received: by 2002:a05:6512:1589:b0:52c:8784:5b2c with SMTP id 2adb3069b0e04-52ca6e9a5e2mr7131734e87.3.1718634122918; Mon, 17 Jun 2024 07:22:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718634122; cv=none; d=google.com; s=arc-20160816; b=uX3aoV1xrGMX72ZJEtlDgrGYE6YPGZXnF9q8ccLiQKfJo1KQVqTqLSHD1sjK0qf4lA YFwTPh/WWQm+fbIWLAGPHTuPxPfjvMD/vThUN6G1q+voJ5a6Ciue/x26/NjRrqmxOAoI XKd8fQ7IZlLPILZ93Ob8uu/im2bzx9Z3xKXjtEXla+IUJeTXFmk2pMjdj17B7vxJJ1FH j7dX3QNqIPwshDHHZbprG36LPO5JFxP+luZ44yF/OmS7+9Gx5V0Qqsnd0spBDqwa7xqs YAGKQh0zSfsZK8rdX2aENBjcrl3r19JXtY65ACIpPlnR/MrP+eIUjNTZEtAsIfRmzmxA dGiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=fKsdddbYZPXOF2ZXId3enSf0ebzyUxoYtPDGuGzoSYU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Q1cqM+ySr9SNhFfB17IeYWaH0onCT8321FeGbRGCji/oT2657Mc1urgll0gsbot+CG x3meRNF/5OOca96w9CyYPW1c14mBTTHg7qBXASEtZ4mcO3AeB5PjbUlLCuznAtOAvcPJ 9W4j5V1Peiy28s3tOd4HgNhf6gzTQwOC616wDZs+hrplcTPJwrVesSwgLPCuCh+eCeAD NJwsYSEBm9Eu6P7QVDijLv8fwaU/fxQNtuyLUfj3kxFnoIAXjMTNQr/T7wdII+4F86g9 7Smu54kfpS0l0QqgCqySkl++4S9DVP5yqKdbuH/Z0wne9UQBicKEjAyeef69hZK1S2oJ hVEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=KRuD2qit; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52ca28724a3si2731927e87.312.2024.06.17.07.22.02; Mon, 17 Jun 2024 07:22:02 -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=@gmail.com header.s=20230601 header.b=KRuD2qit; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BE0C68D76D; Mon, 17 Jun 2024 17:21:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8EFD68D3CA for ; Mon, 17 Jun 2024 17:21:41 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1f44b441b08so32180635ad.0 for ; Mon, 17 Jun 2024 07:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718634099; x=1719238899; darn=ffmpeg.org; 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=LLVck2yHXaJhgt31zHfT2+eWCq6RLdxrYfJTdAcMmiw=; b=KRuD2qitf98SecmeCM/3zaoXX72SKLpG706SzFr5CzpGOJUwludZSJs9matM9GD4wT ZD2ag1af0nQOyhuMv3Ho5AEN5viL7ViGrmuenTTzGFARHK+o6b/GVZ+8z+I3kXVsFFNA WlAjCmx09GysOCwb+PzUMTHYOryPbm0GKvLBBtM4sxhNAaXgQEkR1/vq1zPH98xhNcKE g57sWJn3cjnf7QP5JLLGxu9fRg2Ln+0IH2gld0bcGQJYzPdoVyl/vAWrq6VLgqiER7wI NdcUEDJhcf2wTYQ/VUZKKMGQEXMcshWclUW1zd0Ddxh5iB0CJ89C1wD+y9gSG+a3OVX0 0iHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718634099; x=1719238899; 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=LLVck2yHXaJhgt31zHfT2+eWCq6RLdxrYfJTdAcMmiw=; b=AzVSqhz3xqKISgxe2ysfeDHhYaS6O71shJwGaYJPjy3ZK6CPkEhljhchi6TGLzcLq6 aNodIla0ZPmqiyKfpa5BUBuQ81vWrI3ApGauXgVB0hrOQc3Kxv0vicZJZF859ihX36gr f7KksnGKgk0F5ZcDJCIeI3w/AGS5NRfO7PIZ0ovMJkd6F5U2gClZPzyLuEjG+XME5SYQ dUb5x89HcAdxP9/DGwF0iJQK0hT2QTrThnUV1t9TCgqeQOWU0PwgIQlGl8epAB6NoAiH JuPDr5cBEAl75RIATDIviKQgvnbumiGJ3zuQejTq8Cpz3cUibSEqAabW470IZUOaLY3t hCyQ== X-Gm-Message-State: AOJu0YxYwoMvzujYSNpR/L9NMDugk7dKv0IrkKIRJZozN6X8U9Vkyjcl wAYIdIE/goyJuRqKEYgLyU1vZRlT98NtUFXkCDAb+H+MAtxssVNnXfpYJw== X-Received: by 2002:a17:903:40d1:b0:1f7:3501:375a with SMTP id d9443c01a7336-1f8626d0f49mr108835225ad.28.1718634099360; Mon, 17 Jun 2024 07:21:39 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855ee6eacsm79861425ad.179.2024.06.17.07.21.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jun 2024 07:21:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2024 11:21:20 -0300 Message-ID: <20240617142120.1476-2-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240617142120.1476-1-jamrial@gmail.com> References: <20240617142120.1476-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/evc: fix writing reserved bits 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YvcG1dIGZe51 They are all zeroes, no ones. Signed-off-by: James Almer --- libavformat/evc.c | 4 ++-- tests/ref/lavf-fate/evc.mp4 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/evc.c b/libavformat/evc.c index 928ae1ff65..ff350aad21 100644 --- a/libavformat/evc.c +++ b/libavformat/evc.c @@ -257,10 +257,10 @@ static int evcc_write(AVIOContext *pb, EVCDecoderConfigurationRecord *evcc) avio_wb16(pb, evcc->pic_height_in_luma_samples); /* - * bit(6) reserved = '111111'b; + * unsigned int(6) reserved = '000000'b; * unsigned int(2) chromaFormat; */ - avio_w8(pb, evcc->lengthSizeMinusOne | 0xfc); + avio_w8(pb, evcc->lengthSizeMinusOne); /* unsigned int(8) numOfArrays; */ avio_w8(pb, evcc->num_of_arrays); diff --git a/tests/ref/lavf-fate/evc.mp4 b/tests/ref/lavf-fate/evc.mp4 index 4b410b84f3..6ef7af4ddc 100644 --- a/tests/ref/lavf-fate/evc.mp4 +++ b/tests/ref/lavf-fate/evc.mp4 @@ -1,3 +1,3 @@ -885fb330b20632b88ef9d7fb03dfa2e9 *tests/data/lavf-fate/lavf.evc.mp4 +bebb66fc3e13ece081d1aa96802e3c1f *tests/data/lavf-fate/lavf.evc.mp4 37386 tests/data/lavf-fate/lavf.evc.mp4 tests/data/lavf-fate/lavf.evc.mp4 CRC=0x48063f85