From patchwork Fri Aug 4 02:54:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 43117 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b914:b0:130:ccc6:6c4b with SMTP id fe20csp328830pzb; Thu, 3 Aug 2023 19:54:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAU+HJVPk7CZqvyw/DHmOKhmGP+XrGr/jY+q5FSvCxJfqz3Vvb6jCyKIzgX/iVAleloYrF X-Received: by 2002:a17:906:1085:b0:99b:f3ef:f084 with SMTP id u5-20020a170906108500b0099bf3eff084mr420515eju.66.1691117673340; Thu, 03 Aug 2023 19:54:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691117673; cv=none; d=google.com; s=arc-20160816; b=EmbBwpuFwDh6S/L2PK6jHbD2oNHJqRpaGsOLueFCm+GQutuvPy5OMxrbHScaPTBUdg V+PG0hT1+mcKxdEIhBGLZZAJ0SFwnNpyFvCtks+D6KKLgNrOAXqv/pSiSUy4WarhDb3U 2hjdKug/Re+1wEtPeEe2ge1J82w2KDsgul1bkCQEqPNknuPmDuYwTCnMXJCwD22ISdnl maU498lZAOmQIMCNk5sl4JLXeA8Tf3sU37yMnqpIwAgBUlfAUWHgZ5yCCASoTDz+JtOA 8iIhCuYLLYELuxivNt3ed0Iw3nQWUG419ze50Mye8Z3HFm/dTWfL9YV631kZVcMGGf2P 2W7A== 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:feedback-id:mime-version:message-id:date :to:from:delivered-to; bh=NACHdUg4/iRLzk6OIcSqSrA+Ilx6P+DMC9LMIt/ifXs=; fh=UbKzVxiKqWMRVKHrgyn1mg7tw/nuokz5Lr8G3ZXebqo=; b=Zn3rrMDnXcn4YqMeXSuPEcgsEXez8Kk0Kz++xZ/kjH1O10VQNPqkNDg8fN0KCXUBbO k5W+BpxMZ2tZtAOltDWNW4cEsiMLLN6FKbRDKEj5CsQGJo5AE083TUwlS7bXXFO1iURK u3e8zNY9moz2vqijX13q56+dWtJ5l9jPQs+a29OrOn4bpfsmRPcvvmFFTzvDSAgtid31 9fxy5hq/by/45O7ITVIZi1yollgPASOVMqZq0ZoAj8CgV0WYT8eyWKzJgG5kOPlf5rF6 Y64T0YPUHLnUznI3wYzGJjudRJR7uHphGE3fvVGl9dyEET6djpzCAWd1L08oWrqp/Lg/ PfMQ== ARC-Authentication-Results: i=1; mx.google.com; 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 bj9-20020a170906b04900b0098da7ffc5a2si880909ejb.222.2023.08.03.19.54.32; Thu, 03 Aug 2023 19:54:33 -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; 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 A83F168C55A; Fri, 4 Aug 2023 05:54:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.154.54.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8818468C2E0 for ; Fri, 4 Aug 2023 05:54:20 +0300 (EEST) X-QQ-mid: bizesmtp70t1691117653t5j0y6mf Received: from localhost ( [103.102.203.192]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 04 Aug 2023 10:54:11 +0800 (CST) X-QQ-SSF: 01100000000000Z0Z000000A0000000 X-QQ-FEAT: aBJFcW+uBGYyM1Htye8Wx1/x6otkbZuOzSrwkXBa4ok7yRFPM4cGDs9b90QXR McZhfCKyv8Uh38vp/hgk7mrMi5/Plioh3WoU79l03e7ntxYyl17Z6Q6omqGYC3lifPQuklo D9+Py5/li4pRIvGoGXi/Rg+WY4AekOikorKzszUU/zV0l7ycpPizNmJ/HFQoHipUu0dQ/jH uFhNu9Bkmk0R73GT+Xa0d0o1Mm/eu5tOKvBY4pfmQQlr19MJ1jtRF4a6sX33E/KJ1uQ5na5 JsY0+cauI7KWwB4dR7zO1TkokU6ek/f4cNXEGe4G08TC/53sbjv3UmwDDp243+xzYU/WgcN M+a692XyskJ10Zp8QPmSSthhAZuiN31sk8YHMmo X-QQ-GoodBg: 0 X-BIZMAIL-ID: 4804387600893521159 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 4 Aug 2023 10:54:09 +0800 Message-Id: <20230804025409.38156-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybglogicsvrsz:qybglogicsvrsz3a-0 Subject: [FFmpeg-devel] [PATCH] avformat/flvdec: remove unused context member of flv 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: Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CsqIWE7gKx9F The exheader is unnecessary after 207e9f4e505d969d6ff7545b449295a1b88d6d1c Iust use local varible can do the same function. Signed-off-by: Steven Liu --- libavformat/flvdec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index bdcf96b4ae..e25b5bd163 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -80,7 +80,6 @@ typedef struct FLVContext { int64_t time_offset; int64_t time_pos; - uint8_t exheader; } FLVContext; /* AMF date type */ @@ -813,7 +812,6 @@ static int flv_read_header(AVFormatContext *s) s->start_time = 0; flv->sum_flv_tag_size = 0; flv->last_keyframe_stream_index = -1; - flv->exheader = 0; return 0; } @@ -1043,6 +1041,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) AVStream *st = NULL; int last = -1; int orig_size; + int enhanced_flv = 0; uint32_t video_codec_id = 0; retry: @@ -1095,9 +1094,9 @@ retry: * Reference Enhancing FLV 2023-03-v1.0.0-B.8 * https://github.com/veovera/enhanced-rtmp/blob/main/enhanced-rtmp-v1.pdf * */ - flv->exheader = (flags >> 7) & 1; + enhanced_flv = (flags >> 7) & 1; size--; - if (flv->exheader) { + if (enhanced_flv) { video_codec_id = avio_rb32(s->pb); size -= 4; } @@ -1276,7 +1275,7 @@ retry_duration: st->codecpar->codec_id == AV_CODEC_ID_AV1 || st->codecpar->codec_id == AV_CODEC_ID_VP9) { int type = 0; - if (flv->exheader && stream_type == FLV_STREAM_TYPE_VIDEO) { + if (enhanced_flv && stream_type == FLV_STREAM_TYPE_VIDEO) { type = flags & 0x0F; } else { type = avio_r8(s->pb);