From patchwork Tue Mar 26 11:04:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 12452 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 74EEC44826F for ; Tue, 26 Mar 2019 13:04:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5EC7F68A768; Tue, 26 Mar 2019 13:04:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B11D768A71A for ; Tue, 26 Mar 2019 13:04:27 +0200 (EET) Received: by mail-pf1-f182.google.com with SMTP id 8so7906138pfr.4 for ; Tue, 26 Mar 2019 04:04:27 -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; bh=Z0ULFtxGHAJwdjiA4WWRQV/W65oAEFoEcgQabg5Zubw=; b=N1tNo2gCU8LulUMzboAjmaq7eirXVFvmSEGIYxqQjiFnaB2n0hnrtKCcZq+tSarKwo 4gEdJwpnkNrDJGqBTV+xsMVASlmrFr/dHzl2pek4gEqf7rrc09ftb6u3eV9UkUm2ZQ5x ZSHrwhLMASVGcBXqRFPzlxQbkc9Ca0mOnx7kKa4BbS0EVL+iraUBD4FOVxH2Dmhvqn7e Hc4fnbXcNEOq5tSeKrgJOe9qzK8EKIam6vV8dxtgb3izEx0itNjZIepgq9E9+MIdXbK8 P2x3rqQId6IJEWrBRbbYfitSlS8sfkVAKjfyEUZm1g/1Mxhhrv00BFDOLLNbKo1EkPA7 o5hg== 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; bh=Z0ULFtxGHAJwdjiA4WWRQV/W65oAEFoEcgQabg5Zubw=; b=tB3NVG1ws9Z6t3l5+vxTkO/p/8Q1b4Zot5E4CUFkJAkrSMWAuTQZRaYxaKArxr1hpD GyI6hRRs4GMRuJWAHqD9ApZtdgG5VDvx9EAxD9H+KiVITc3VbdMH4u4dcRgCGcUMBGNM C/m1yfpagdHOnApgZa4UprwazKy0IU6LyjxPYDlZiivQgSmrWxgCG9HgXcGfLh0ZUE5L pYEKQ4D+X6MhHDsmsw/WUZQWIuMAKjWS46kBgs0scEHU1nHa85IpeNg9SrhQoi76OrU/ RFCQnRIe7liJmigDMMbZciRj50U5DbcAWUhU/qCz170Kdo2SbE1PSvEVla79mDKlE/9X sNHg== X-Gm-Message-State: APjAAAV3Ovu52csO7L89wsiMkxHmdvihUOZ3dZO0QKV8A6ZEO4optXiC EUdmHk0Rpwsx0zNYQOKbuvbU08er X-Google-Smtp-Source: APXvYqzoyxLIG1W1EFGuBXj5kwnYlLQl27ScJMH8iOPWDeAAAlkUh/OuntYWHJIej986E+Hs7ynoHQ== X-Received: by 2002:aa7:9389:: with SMTP id t9mr28915751pfe.60.1553598265998; Tue, 26 Mar 2019 04:04:25 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id e27sm21233133pgm.13.2019.03.26.04.04.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 04:04:25 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Mar 2019 19:04:16 +0800 Message-Id: <1553598256-15995-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1553598256-15995-1-git-send-email-mypopydev@gmail.com> References: <1553598256-15995-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 2/2] lavf/flvdec: Cosmetics: Fix indentation for flv_read_packet 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Commit e34ba5ec53b missed the indent Signed-off-by: Jun Zhao --- libavformat/flvdec.c | 244 +++++++++++++++++++++++++------------------------- 1 files changed, 122 insertions(+), 122 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b1e13da..445d58d 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -986,144 +986,144 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) retry: /* pkt size is repeated at end. skip it */ - pos = avio_tell(s->pb); - type = (avio_r8(s->pb) & 0x1F); - orig_size = - size = avio_rb24(s->pb); - flv->sum_flv_tag_size += size + 11; - dts = avio_rb24(s->pb); - dts |= (unsigned)avio_r8(s->pb) << 24; - av_log(s, AV_LOG_TRACE, "type:%d, size:%d, last:%d, dts:%"PRId64" pos:%"PRId64"\n", type, size, last, dts, avio_tell(s->pb)); - if (avio_feof(s->pb)) - return AVERROR_EOF; - avio_skip(s->pb, 3); /* stream id, always 0 */ - flags = 0; - - if (flv->validate_next < flv->validate_count) { - int64_t validate_pos = flv->validate_index[flv->validate_next].pos; - if (pos == validate_pos) { - if (FFABS(dts - flv->validate_index[flv->validate_next].dts) <= - VALIDATE_INDEX_TS_THRESH) { - flv->validate_next++; - } else { - clear_index_entries(s, validate_pos); - flv->validate_count = 0; - } - } else if (pos > validate_pos) { + pos = avio_tell(s->pb); + type = (avio_r8(s->pb) & 0x1F); + orig_size = + size = avio_rb24(s->pb); + flv->sum_flv_tag_size += size + 11; + dts = avio_rb24(s->pb); + dts |= (unsigned)avio_r8(s->pb) << 24; + av_log(s, AV_LOG_TRACE, "type:%d, size:%d, last:%d, dts:%"PRId64" pos:%"PRId64"\n", type, size, last, dts, avio_tell(s->pb)); + if (avio_feof(s->pb)) + return AVERROR_EOF; + avio_skip(s->pb, 3); /* stream id, always 0 */ + flags = 0; + + if (flv->validate_next < flv->validate_count) { + int64_t validate_pos = flv->validate_index[flv->validate_next].pos; + if (pos == validate_pos) { + if (FFABS(dts - flv->validate_index[flv->validate_next].dts) <= + VALIDATE_INDEX_TS_THRESH) { + flv->validate_next++; + } else { clear_index_entries(s, validate_pos); flv->validate_count = 0; } + } else if (pos > validate_pos) { + clear_index_entries(s, validate_pos); + flv->validate_count = 0; } + } - if (size == 0) { - ret = FFERROR_REDO; - goto leave; - } + if (size == 0) { + ret = FFERROR_REDO; + goto leave; + } - next = size + avio_tell(s->pb); - - if (type == FLV_TAG_TYPE_AUDIO) { - stream_type = FLV_STREAM_TYPE_AUDIO; - flags = avio_r8(s->pb); - size--; - } else if (type == FLV_TAG_TYPE_VIDEO) { - stream_type = FLV_STREAM_TYPE_VIDEO; - flags = avio_r8(s->pb); - size--; - if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) - goto skip; - } else if (type == FLV_TAG_TYPE_META) { - stream_type=FLV_STREAM_TYPE_SUBTITLE; - if (size > 13 + 1 + 4) { // Header-type metadata stuff - int type; - meta_pos = avio_tell(s->pb); - type = flv_read_metabody(s, next); - 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 - ) { - av_log(s, AV_LOG_WARNING, "Adjusting next position due to index mismatch\n"); - next = flv->validate_index[0].pos - 4; - } - goto skip; - } else if (type == TYPE_ONTEXTDATA) { - avpriv_request_sample(s, "OnTextData packet"); - return flv_data_packet(s, pkt, dts, next); - } else if (type == TYPE_ONCAPTION) { - return flv_data_packet(s, pkt, dts, next); - } else if (type == TYPE_UNKNOWN) { - stream_type = FLV_STREAM_TYPE_DATA; + next = size + avio_tell(s->pb); + + if (type == FLV_TAG_TYPE_AUDIO) { + stream_type = FLV_STREAM_TYPE_AUDIO; + flags = avio_r8(s->pb); + size--; + } else if (type == FLV_TAG_TYPE_VIDEO) { + stream_type = FLV_STREAM_TYPE_VIDEO; + flags = avio_r8(s->pb); + size--; + if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) + goto skip; + } else if (type == FLV_TAG_TYPE_META) { + stream_type=FLV_STREAM_TYPE_SUBTITLE; + if (size > 13 + 1 + 4) { // Header-type metadata stuff + int type; + meta_pos = avio_tell(s->pb); + type = flv_read_metabody(s, next); + 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 + ) { + av_log(s, AV_LOG_WARNING, "Adjusting next position due to index mismatch\n"); + next = flv->validate_index[0].pos - 4; } - avio_seek(s->pb, meta_pos, SEEK_SET); - } - } else { - av_log(s, AV_LOG_DEBUG, - "Skipping flv packet: type %d, size %d, flags %d.\n", - type, size, flags); -skip: - if (avio_seek(s->pb, next, SEEK_SET) != next) { - // This can happen if flv_read_metabody above read past - // next, on a non-seekable input, and the preceding data has - // been flushed out from the IO buffer. - av_log(s, AV_LOG_ERROR, "Unable to seek to the next packet\n"); - return AVERROR_INVALIDDATA; + goto skip; + } else if (type == TYPE_ONTEXTDATA) { + avpriv_request_sample(s, "OnTextData packet"); + return flv_data_packet(s, pkt, dts, next); + } else if (type == TYPE_ONCAPTION) { + return flv_data_packet(s, pkt, dts, next); + } else if (type == TYPE_UNKNOWN) { + stream_type = FLV_STREAM_TYPE_DATA; } - ret = FFERROR_REDO; - goto leave; + avio_seek(s->pb, meta_pos, SEEK_SET); } - - /* skip empty data packets */ - if (!size) { - ret = FFERROR_REDO; - goto leave; + } else { + av_log(s, AV_LOG_DEBUG, + "Skipping flv packet: type %d, size %d, flags %d.\n", + type, size, flags); +skip: + if (avio_seek(s->pb, next, SEEK_SET) != next) { + // This can happen if flv_read_metabody above read past + // next, on a non-seekable input, and the preceding data has + // been flushed out from the IO buffer. + av_log(s, AV_LOG_ERROR, "Unable to seek to the next packet\n"); + return AVERROR_INVALIDDATA; } + ret = FFERROR_REDO; + goto leave; + } - /* now find stream */ - for (i = 0; i < s->nb_streams; i++) { - st = s->streams[i]; - if (stream_type == FLV_STREAM_TYPE_AUDIO) { - if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && - (s->audio_codec_id || flv_same_audio_codec(st->codecpar, flags))) - break; - } else if (stream_type == FLV_STREAM_TYPE_VIDEO) { - if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && - (s->video_codec_id || flv_same_video_codec(st->codecpar, flags))) - break; - } else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) { - if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) - break; - } else if (stream_type == FLV_STREAM_TYPE_DATA) { - if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) - break; - } - } - if (i == s->nb_streams) { - static const enum AVMediaType stream_types[] = {AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_SUBTITLE, AVMEDIA_TYPE_DATA}; - st = create_stream(s, stream_types[stream_type]); - if (!st) - return AVERROR(ENOMEM); + /* skip empty data packets */ + if (!size) { + ret = FFERROR_REDO; + goto leave; + } + /* now find stream */ + for (i = 0; i < s->nb_streams; i++) { + st = s->streams[i]; + if (stream_type == FLV_STREAM_TYPE_AUDIO) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && + (s->audio_codec_id || flv_same_audio_codec(st->codecpar, flags))) + break; + } else if (stream_type == FLV_STREAM_TYPE_VIDEO) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && + (s->video_codec_id || flv_same_video_codec(st->codecpar, flags))) + break; + } else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) + break; + } else if (stream_type == FLV_STREAM_TYPE_DATA) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) + break; } - av_log(s, AV_LOG_TRACE, "%d %X %d \n", stream_type, flags, st->discard); + } + if (i == s->nb_streams) { + static const enum AVMediaType stream_types[] = {AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_SUBTITLE, AVMEDIA_TYPE_DATA}; + st = create_stream(s, stream_types[stream_type]); + if (!st) + return AVERROR(ENOMEM); - if (flv->time_pos <= pos) { - dts += flv->time_offset; - } + } + av_log(s, AV_LOG_TRACE, "%d %X %d \n", stream_type, flags, st->discard); - if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && - ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || - stream_type == FLV_STREAM_TYPE_AUDIO)) - av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME); + if (flv->time_pos <= pos) { + dts += flv->time_offset; + } - 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; - } + if ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && + ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || + 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 + ) { + avio_seek(s->pb, next, SEEK_SET); + ret = FFERROR_REDO; + goto leave; + } // if not streamed and no duration from metadata then seek to end to find // the duration from the timestamps