From patchwork Tue May 21 09:02:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 49091 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp5097193pzb; Tue, 21 May 2024 02:04:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVXZrtND7FPUK2YUnQQkdWtLUYLKn20h5an/wwvW1v4jek3NW3uM6IDXy+w5IPdZ4Kjf9JynFyF+2LmhJQZBZXaZDll1buCLa4PeA== X-Google-Smtp-Source: AGHT+IF/NV50JDLMVhGEiIBSrNwIPN9vUAMBmfHxytIFTXLtvaVuUIypcWY6AaIaoJF3M1fM/c2W X-Received: by 2002:a17:907:320b:b0:a59:b177:22d7 with SMTP id a640c23a62f3a-a5a2d53b75emr3814361066b.8.1716282298074; Tue, 21 May 2024 02:04:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716282298; cv=none; d=google.com; s=arc-20160816; b=Yf5IMHKkrTWMwuXuOWpfha/gdXkazAVIRrhjTl59Jo7jy4HZy4dhMwNUCLjFPsyPcB dCQz3m1jLBdU7Igv3giuMyZAa1QJTqqAMN8oWM8EFfVHwUNQt+EUIt5z5ZnS14XmRlId TlbpwKOIkxTQmBY7bGEoErggbD+lor8ZxwJ0jaBYriDu9VXwiYmOotWnl9ckKWE6O6hl 98hxIp7xpYQxPwXG3IPxTap7lwVP69sl+sDNfPRhAirNPa78nCWDmmK1yrRTh2SUsKow /yBMrzJ1xPnXYHp0zFJcGbGWZoKblH25oOr8fArMk6CQFiSjo236+nQa/aHhdRr+jxeT pbrA== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=z+yY3QEYX3fMx0KHnVPOXf4wf4FHvdyaBE0aWvWjEqE=; fh=LnlYe9qYwgML7nWWXqAumr7YCmPjjpEPjQf6GasgJC0=; b=rB9hkNQqsWjHmrkh8AIr2OBufl/UHJ9Ksn90RIe4bXd0JlLq0O8+1FJpdU63hUz/G0 kzmr26Vto80vWgTVjHkK8aIahG+rzZ4f6kthwLnI1mRkUKJCGnkGYAJalEk33WSJD31v KUumVKOqO7OjH5TGC1wKf93o1x2RdEpmRzyCoSURee9Bvfwa4so9kJ8jdoQqHWM2dOcd fqpfjibSwJZWgvxoQf+Fc4TF6+1xvAcEgySZNcbDBtlCRRpvMVJfYq5C2KGlyHTbkbCh foPM9Nw68gKmxeBErZisX3mVcbyH1m1Q7/8klHAdrmoMP1wKsK4U5gH52XueS4D/TTxz aEQA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=WUNNDXcu; 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=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5cea7434c2si613099666b.194.2024.05.21.02.04.57; Tue, 21 May 2024 02:04:58 -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=@rothenpieler.org header.s=mail header.b=WUNNDXcu; 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=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3607968D3D7; Tue, 21 May 2024 12:03:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [144.76.60.213]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A694A68D321 for ; Tue, 21 May 2024 12:03:43 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id A9BCD27FFD2B8; Tue, 21 May 2024 11:03:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1716282219; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3Ruj1l7ZbyODxvmvPk9pkUZuZDQaQKfwYvmfpmhPoR4=; b=WUNNDXcunkZAATK1oAj6n0WWAcMMjMNAT+tWXzlDohAhZc6j2Pud82af5OnosNn17fDL38 63icPDK3MCUrpqbRyQJ8OtRUTqXAwGc646pwa+fuVO/qg2+MCs58gh8WbKCS2MkLAJ8sZ3 mUPsCqBiRYH0WZOcUT0gBSQiLuQLTZmVL0y1QSMgPYg+gPghMEG1tMgiwop4VhmFXo0OiD 6Qg8+YPc4myaYV7+KwoZmx+lJoAXAF3LSSe9yi7+ddBmCYoKeV74adU2TDBlLnSQfKHuN+ QtfCEZzKvKChs+ypT8mB4+I2yc2/KZ8wQIuAFVAgw+KmmY7RHsVOLZncI5tkHQ== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 May 2024 11:02:21 +0200 Message-ID: <20240521090316.782-13-timo@rothenpieler.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240521090316.782-1-timo@rothenpieler.org> References: <20240521090316.782-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/13] avformat/flvdec: stop shadowing local variables 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: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QMtKSPbVU8wq --- libavformat/flvdec.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 5877828c52..4f98ff348c 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1394,8 +1394,8 @@ retry: if (enhanced_flv && (flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) { if (pkt_type == PacketTypeMetadata) { - int ret = flv_parse_video_color_info(s, st, next); - av_log(s, AV_LOG_DEBUG, "enhanced flv parse metadata ret %d and skip\n", ret); + int sret = flv_parse_video_color_info(s, st, next); + av_log(s, AV_LOG_DEBUG, "enhanced flv parse metadata ret %d and skip\n", sret); } goto skip; } else if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) { @@ -1498,25 +1498,25 @@ skip: if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && (!s->duration || s->duration == AV_NOPTS_VALUE) && !flv->searched_for_end) { - int size; + int final_size; const int64_t pos = avio_tell(s->pb); // Read the last 4 bytes of the file, this should be the size of the // previous FLV tag. Use the timestamp of its payload as duration. int64_t fsize = avio_size(s->pb); retry_duration: avio_seek(s->pb, fsize - 4, SEEK_SET); - size = avio_rb32(s->pb); - if (size > 0 && size < fsize) { - // Seek to the start of the last FLV tag at position (fsize - 4 - size) + final_size = avio_rb32(s->pb); + if (final_size > 0 && final_size < fsize) { + // Seek to the start of the last FLV tag at position (fsize - 4 - final_size) // but skip the byte indicating the type. - avio_seek(s->pb, fsize - 3 - size, SEEK_SET); - if (size == avio_rb24(s->pb) + 11) { + avio_seek(s->pb, fsize - 3 - final_size, SEEK_SET); + if (final_size == avio_rb24(s->pb) + 11) { uint32_t ts = avio_rb24(s->pb); ts |= (unsigned)avio_r8(s->pb) << 24; if (ts) s->duration = ts * (int64_t)AV_TIME_BASE / 1000; - else if (fsize >= 8 && fsize - 8 >= size) { - fsize -= size+4; + else if (fsize >= 8 && fsize - 8 >= final_size) { + fsize -= final_size+4; goto retry_duration; } } @@ -1610,10 +1610,10 @@ retry_duration: goto leave; } } else if (stream_type == FLV_STREAM_TYPE_VIDEO) { - int ret = flv_set_video_codec(s, st, codec_id, 1); - if (ret < 0) - return ret; - size -= ret; + int sret = flv_set_video_codec(s, st, codec_id, 1); + if (sret < 0) + return sret; + size -= sret; } else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) { st->codecpar->codec_id = AV_CODEC_ID_TEXT; } else if (stream_type == FLV_STREAM_TYPE_DATA) { @@ -1703,20 +1703,20 @@ retry_duration: pkt->stream_index = st->index; pkt->pos = pos; if (!multitrack && flv->new_extradata[stream_type]) { - int ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, - flv->new_extradata[stream_type], - flv->new_extradata_size[stream_type]); - if (ret >= 0) { + int sret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, + flv->new_extradata[stream_type], + flv->new_extradata_size[stream_type]); + if (sret >= 0) { flv->new_extradata[stream_type] = NULL; flv->new_extradata_size[stream_type] = 0; } } else if (multitrack && flv->mt_extradata_cnt > track_idx && flv->mt_extradata[track_idx]) { - int ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, - flv->mt_extradata[track_idx], - flv->mt_extradata_sz[track_idx]); - if (ret >= 0) { + int sret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, + flv->mt_extradata[track_idx], + flv->mt_extradata_sz[track_idx]); + if (sret >= 0) { flv->mt_extradata[track_idx] = NULL; flv->mt_extradata_sz[track_idx] = 0; }