From patchwork Tue Mar 12 16:14:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 47002 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1970627pzb; Tue, 12 Mar 2024 09:14:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX24x17K/5t9n+CKrOH1VPIbYk7yezKAXORFTx3cSnBDmnziUgIFOlbztAqJUqEeI7dKWVjxx7CJpn1QWMohh43oBq8VW9ntE8GYw== X-Google-Smtp-Source: AGHT+IGo+69dMDpkV2+BACJg2qTy30GCeGDMk4pMEwBTxvbGEzTVEp6jPRQ3Yr9EUMSryvCX4jPF X-Received: by 2002:a17:906:4ec8:b0:a45:f89b:a918 with SMTP id i8-20020a1709064ec800b00a45f89ba918mr2885706ejv.10.1710260064921; Tue, 12 Mar 2024 09:14:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710260064; cv=none; d=google.com; s=arc-20160816; b=Wgv2WclnnE9w/2AiBbOTcEy7/sL0nxcCNHEptcIab35+KPwlHn3QDlZpR5we5nXPjR +Qd+BUzfwg9uf7HkEYT2y6ABMUdAwzU+LO8NCcA/n11REybXI1ObL5EODpVyVKOignj9 AkU744BtZM8q6qxDdw5sIn4JTrITsPdCmwrYIitmwzPnS3q+llhOSrG0On8A2eG53QXr fMy0K5Dn1p0tuECUaKpTgCri/TWXWTHTJMTSeAJCDoPRLw8mi8N/YMz+BqKlYDaupw01 ywqLuXd++wzFtmVyd3hkVVYnc03hjBCIxZvZX1HPDzgnGumxWN2aSwd51nrTS6R71+EG HRBg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=vHPAHu4TUrfpCG0NA5rFiTWfY2ovNVjc/ZztqX9u7s8=; fh=PlWMzmI9LD2qGS7ipLrQl8z0iaQTLQLHzoGuXcBzpCg=; b=qg/S2gkPaEOwi/g1eNwuLwQ7lv/RWqZ/uKWhMiixTucegx6vC96JMK/3azrGBebhCR tOl6OkJ3pu8C87wz7XvjcZMHWt5sLqDmOaEaYtizi78i61vKQ3LepK7zARaEJutNT/T1 mgDzfxbmIGWbA22nGrI7yBjwb4wa/zFzI3f1kmQecPw22nVmTHvG8itSt32jsqxoFi7/ 0VyPXk+KVvf2rn+vfg4fgADn9Z1lTyia/JUQ4RNdifa94Uj8S6zeA/tiMc2kb+Mz239E dsfC+uBdVny7B7iI+T40Rm+RrzJSs4OT7mOM9o5z70mOzE/57PIlc8GvBGULZdWv5ZvN a9fQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@proxyid.net header.s=google header.b=W9n8X8Bx; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h21-20020a170906591500b00a3ec1463a12si3506828ejq.348.2024.03.12.09.14.24; Tue, 12 Mar 2024 09:14:24 -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=@proxyid.net header.s=google header.b=W9n8X8Bx; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5527168D13B; Tue, 12 Mar 2024 18:14:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f225.google.com (mail-yb1-f225.google.com [209.85.219.225]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2BDB68CF9D for ; Tue, 12 Mar 2024 18:14:13 +0200 (EET) Received: by mail-yb1-f225.google.com with SMTP id 3f1490d57ef6-dcc7cdb3a98so14780276.2 for ; Tue, 12 Mar 2024 09:14:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proxyid.net; s=google; t=1710260052; x=1710864852; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VtKrj+mHWehIuNfzy02dIHLuhiC3mS9oBPYIF9IqRSM=; b=W9n8X8BxHMo+A2mJpDsOKRPBtGWeOWjv8ZtLCE88nwqQX+mj/4F4l3cP0bcGxSWDWI +MiFIE5uaA/lZT0OPt8umuVcG7zNMcIROFJeKilXLiTNeXEvDl3cpX0IJx2EhHZMhYcZ DH3IKi9jCkYkm+9BYy6XLgc2yZ+NcAEKikpgYhguCeXIASHW4L17vlUG1Q3zrqmTfGGL uf79KDG9s81UrRSkFP8N5Pog9xT5BmQh/u6fOpQWV6ItElsMMKn35D3ylMmLjoj1EYr5 KwYPo1K9/CgJ5PSsOLsJj94dEFz1/u9akKLj1CjSTx5edvVcYNRA0W/gjxfW0ymkODe/ fchQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710260052; x=1710864852; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VtKrj+mHWehIuNfzy02dIHLuhiC3mS9oBPYIF9IqRSM=; b=j7oduw9vp8Gbmz5VUUcgQBuivf7ZQLHXMhqrTbI02mR66lTHM27xNEZVVnSJxOuDmY pAIjzYAv/zmLBCj5/CcZCPS3j996P41THv2QCHUxIuUbg2Zgkzpu9yyl08AoG56CTOLh XvFqw9dkzDPf4YNR+cQHUaEooXU2IzuNVJLwFgxwYjLAqbCAlEQT/MALV/LHRBsJ6I+b qVJrYfVbLdckBIm/YU80VRBEEjT7573824ggG02H+X8S2mMx3hRMTZOp9jiO8IS3+Nha nMrTj7og+H5Asg2Oq/PpUt3OCnzCkU8Tb6pZXAkhDKGVOg5hLwXgVyqGogSvgScdgdi/ 2+bw== X-Gm-Message-State: AOJu0YxnQ+MK0bDNdIIfrr9OKzuXJdpp8VaIlAAr4RiFzB74Hq+Pb40/ CCqTRcc6dXvzwKRLeFv+A9/yzJnLI+HiBWJdzcOdVPDNeYnp1GflmYGh3bRHw2c2LVznFmqwBVo oAPPMNxjAU9F7UDHiPb/MbyHQkMYo0uJizLRi73e2 X-Received: by 2002:a25:7806:0:b0:dcc:323e:e1a4 with SMTP id t6-20020a257806000000b00dcc323ee1a4mr752780ybc.6.1710260052217; Tue, 12 Mar 2024 09:14:12 -0700 (PDT) Received: from wsx-cc1-001.. (c-76-141-249-38.hsd1.il.comcast.net. [76.141.249.38]) by smtp-relay.gmail.com with ESMTPS id bv15-20020a056902098f00b00dce07d31891sm355017ybb.7.2024.03.12.09.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 09:14:12 -0700 (PDT) X-Relaying-Domain: proxyid.net From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Mar 2024 11:14:09 -0500 Message-Id: <20240312161409.2386672-1-marth64@proxyid.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avformat/dvdvideodec: use int64_t for menu blocks_read and make format expressions portable 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /IE3qgSlP/by Signed-off-by: Marth64 --- libavformat/dvdvideodec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/dvdvideodec.c b/libavformat/dvdvideodec.c index a182f95097..761ac97ec6 100644 --- a/libavformat/dvdvideodec.c +++ b/libavformat/dvdvideodec.c @@ -392,7 +392,7 @@ static int dvdvideo_menu_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState uint8_t *buf, int buf_size, void (*flush_cb)(AVFormatContext *s)) { - ssize_t blocks_read = 0; + int64_t blocks_read = 0; uint8_t read_buf[DVDVIDEO_BLOCK_SIZE] = {0}; pci_t pci = (pci_t) {0}; dsi_t dsi = (dsi_t) {0}; @@ -423,7 +423,7 @@ static int dvdvideo_menu_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState blocks_read = DVDReadBlocks(state->vob_file, state->sector_offset, 1, read_buf); if (blocks_read != 1) { - av_log(s, AV_LOG_ERROR, "Unable to read VOB block: offset=%d blocks_read=%d\n", + av_log(s, AV_LOG_ERROR, "Unable to read VOB block: offset=%d blocks_read=%" PRId64 "\n", state->sector_offset, blocks_read); return AVERROR_INVALIDDATA; @@ -475,7 +475,7 @@ static int dvdvideo_menu_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState state->vobu_e_ptm = pci.pci_gi.vobu_e_ptm; av_log(s, AV_LOG_DEBUG, "NAV packet: sector=%d " - "vobu_s_ptm=%d vobu_e_ptm=%d ts_offset=%ld\n", + "vobu_s_ptm=%d vobu_e_ptm=%d ts_offset=%" PRId64 "\n", dsi.dsi_gi.nv_pck_lbn, pci.pci_gi.vobu_s_ptm, pci.pci_gi.vobu_e_ptm, state->ts_offset); @@ -758,7 +758,7 @@ static int dvdvideo_play_next_ps_block(AVFormatContext *s, DVDVideoPlaybackState av_log(s, AV_LOG_DEBUG, "NAV packet: s_ptm=%d e_ptm=%d " - "scr=%d lbn=%d vobu_duration=%d nav_pts=%ld\n", + "scr=%d lbn=%d vobu_duration=%d nav_pts=%" PRId64 "\n", e_pci->pci_gi.vobu_s_ptm, e_pci->pci_gi.vobu_e_ptm, e_dsi->dsi_gi.nv_pck_scr, e_pci->pci_gi.nv_pck_lbn, state->vobu_duration, state->nav_pts); @@ -1639,18 +1639,19 @@ static int dvdvideo_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->dts += c->play_state.ts_offset - c->first_pts; if (pkt->pts < 0) { - av_log(s, AV_LOG_VERBOSE, "Discarding packet with negative PTS (st=%d pts=%ld), " + av_log(s, AV_LOG_VERBOSE, "Discarding packet with negative PTS (st=%d pts=%" PRId64 "), " "this is OK at start of playback\n", pkt->stream_index, pkt->pts); return FFERROR_REDO; } } else { - av_log(s, AV_LOG_WARNING, "Unset PTS or DTS @ st=%d pts=%ld dts=%ld\n", + av_log(s, AV_LOG_WARNING, "Unset PTS or DTS @ st=%d pts=%" PRId64 " dts=%" PRId64 "\n", pkt->stream_index, pkt->pts, pkt->dts); } - av_log(s, AV_LOG_TRACE, "st=%d pts=%ld dts=%ld ts_offset=%ld first_pts=%ld\n", + av_log(s, AV_LOG_TRACE, "st=%d pts=%" PRId64 " dts=%" PRId64 " " + "ts_offset=%" PRId64 " first_pts=%" PRId64 "\n", pkt->stream_index, pkt->pts, pkt->dts, c->play_state.ts_offset, c->first_pts);