From patchwork Sun Jun 21 08:53:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20533 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 1AFBB44B677 for ; Sun, 21 Jun 2020 11:54:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9D4C68B617; Sun, 21 Jun 2020 11:54:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1669668B617 for ; Sun, 21 Jun 2020 11:54:15 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id l10so13691869wrr.10 for ; Sun, 21 Jun 2020 01:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JVUanU8oXYrUgAejyh7r2U5sV9xVpVR6CcmpGDM9poE=; b=dEyK1e87so93JZtU07sWcmQbw82uYPmEgOlaBtqhQ60FsriSraVcFhau40dNoLvDKF /racuoINKvA/M0v78YVEi4NyVnn8EIv33HQk/UQ4wwsSBQSbxxqg/HfyX8YCKLUWSo3U 3sWlxSX8b0GAYp7gn/r2z4Mc6sNsLoD+yvjKP1Z7zf84OT6UuzhZK/9MOTr4Km7fHqJI +LHcLRUS7nA8DDwtJIDnuA9hU6KK3cOKkgu2gq1qEUzNJ3Lwlu5W7GQwc4rsPgAgz5AF 5FfBAIix2bYegB4RL6gDbMD4oJgu5ssUDOUuWp+PRqLqyQiCcYxOmds1G6vP46SiP8xc d/dw== 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=JVUanU8oXYrUgAejyh7r2U5sV9xVpVR6CcmpGDM9poE=; b=fCBCx4xdqfDCJm6JwVyR7bf55Du3p4uKAqtNsRyjz5OAezfAE8lSSq+5TQcLviwlxx aT5+x2G8cpwS1XEU3KALpJFKRGnaXmh4lhsDTNVF7UNZ7OuW1s28hEMAiasmuzkb4qJy TICsHFhGB+ImainQOVCrp79AmuNpJr+gh4qJl0sAM4noGqK7Uq6ZGAgJRI70fzflfics MeVRZpk/T1wtc8ysoGytTfAKB6JvLU5CeoIps+lqp0I/JZKV+A/p7+hCqdQC2AY1+k4Y VASCtsQi9ncnvjSutAG22m6yzH6j685iZbXCb+WZ59mWdxKJPuDoaF6RVYGf3MlRf2vq T/ig== X-Gm-Message-State: AOAM532x2gfr/yWPc355LrVBeYutTfLz566L43bF9HIiUkRclvT1YmQJ kEhIQcbB0xrEO2S5z6eaH6Gr+jOs X-Google-Smtp-Source: ABdhPJxiaPGQxWNwJwvwQhNwcYfVtYFyvumUCpKQdZ2x9tUcD3oX6QhcIjeNlDgGHX8Os5m7KWkWjA== X-Received: by 2002:adf:9d8f:: with SMTP id p15mr13185092wre.421.1592729654047; Sun, 21 Jun 2020 01:54:14 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id b143sm12616054wme.20.2020.06.21.01.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jun 2020 01:54:13 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Jun 2020 10:53:46 +0200 Message-Id: <20200621085349.22370-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200621085349.22370-1-andreas.rheinhardt@gmail.com> References: <20200621085349.22370-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avformat/flvdec: Cosmetics 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: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/flvdec.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 957acedf39..08622739f3 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -514,8 +514,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, if (key && (ioc->seekable & AVIO_SEEKABLE_NORMAL) && !strcmp(KEYFRAMES_TAG, key) && depth == 1) - if (parse_keyframes_index(s, ioc, - max_pos) < 0) + if (parse_keyframes_index(s, ioc, max_pos) < 0) av_log(s, AV_LOG_ERROR, "Keyframe index parsing failed\n"); else add_keyframes_index(s); @@ -732,8 +731,7 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) astream = stream; if (flv->last_keyframe_stream_index == -1) flv->last_keyframe_stream_index = i; - } - else if (stream->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) + } else if (stream->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) dstream = stream; } @@ -1058,8 +1056,7 @@ retry: if (type == 0 && dts == 0 || type < 0) { if (type < 0 && flv->validate_count && flv->validate_index[0].pos > next && - flv->validate_index[0].pos - 4 < next - ) { + flv->validate_index[0].pos - 4 < next) { av_log(s, AV_LOG_WARNING, "Adjusting next position due to index mismatch\n"); next = flv->validate_index[0].pos - 4; } @@ -1120,7 +1117,6 @@ skip: st = create_stream(s, stream_types[stream_type]); if (!st) return AVERROR(ENOMEM); - } av_log(s, AV_LOG_TRACE, "%d %X %d \n", stream_type, flags, st->discard); @@ -1133,10 +1129,9 @@ skip: stream_type == FLV_STREAM_TYPE_AUDIO)) av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME); - if ( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || (stream_type == FLV_STREAM_TYPE_AUDIO))) - ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && (stream_type == FLV_STREAM_TYPE_VIDEO))) - || st->discard >= AVDISCARD_ALL - ) { + if ((st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || stream_type == FLV_STREAM_TYPE_AUDIO)) || + (st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && stream_type == FLV_STREAM_TYPE_VIDEO)) || + st->discard >= AVDISCARD_ALL) { avio_seek(s->pb, next, SEEK_SET); ret = FFERROR_REDO; goto leave; @@ -1299,10 +1294,10 @@ retry_duration: ff_add_param_change(pkt, channels, 0, sample_rate, 0, 0); } - if ( stream_type == FLV_STREAM_TYPE_AUDIO || - ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) || - stream_type == FLV_STREAM_TYPE_SUBTITLE || - stream_type == FLV_STREAM_TYPE_DATA) + if (stream_type == FLV_STREAM_TYPE_AUDIO || + (flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || + stream_type == FLV_STREAM_TYPE_SUBTITLE || + stream_type == FLV_STREAM_TYPE_DATA) pkt->flags |= AV_PKT_FLAG_KEY; leave: