From patchwork Tue Jul 28 17:02:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 21345 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 0F97B44B351 for ; Tue, 28 Jul 2020 20:03:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5F6C68B9B0; Tue, 28 Jul 2020 20:03:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-192.mail.qq.com [203.205.221.192]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7885768B947 for ; Tue, 28 Jul 2020 20:03:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1595955825; bh=XYgwcUkKsUqN0xAziUnix5ocevmFFviQz2/+sBEwnAU=; h=From:To:Cc:Subject:Date; b=Xtgl4g4m9mntqwuLbEAJqJVj6JYPMr1t6gI1lqDyfwSSBTqRe+Y6s2m72JYMXNVlQ 5L9StX4YyRSWezywUHI70tFGnTCeZMnwupEdQZ52aoggOaMTwjA5/bj6K8KrJLgTqA EZa8nUgGRM4aAESL/wMTs9Hd8DW7Wa9j1a5BWntg= Received: from localhost.localdomain ([27.46.106.166]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id AA8B451; Wed, 29 Jul 2020 01:02:42 +0800 X-QQ-mid: xmsmtpt1595955762tr14561z2 Message-ID: X-QQ-XMAILINFO: M9Ybp4IenfvnSbrEO1T2Mj4RC9tuCIkoQI11pncu7erQ4aRaHVm0ScBi1azkoK R0h8COG/cOo0vpul+PHH5SEVaqtHnAH15Ut5mEPPuv3CABD5Qsbq2DWr3ORqyooW0rPJYh6A8zl8 5Lwj56IVCxOaOPEkPc/GFmycRyuqBwPAXrQ+bFULTnXUqXTh/BPKdyxrlJU7aFLz4vQUS7rcXGtK tT9mpXM99f7AzxWxE5A29FNB5Xtobql3O6kwbP22MUpdu3ErqTQoHz50lswGX7XCtUPDiEUjr03Q aQBjYSj2x0Me0lc358MCPD0QieMJEhndjM2LXyWf20Kr6/eKNdkkZ1J7CzxckNQlCXwja1lU48Le x37but7Kn8ASjyGtsq3/OZA4pQMeEOs0af3s9VWn91VugLynim4ytI+06ON3san4SJ54kyZHnP5u jp5VTa4YlrPSCG8qe5UiegfV8NfLIfIvqm0fpi8arDilN9Lwvu27QD0CeqFTLeR4DAZydkEWODPO pE5dDQt21CKGmhQFT3fJ8GIgK/ow5K8GMxnzz7LZHnwVgNSQASG/sWzNmy5YBI8p6naph9ih+b2L 3EvdWnFScWY9q1dV2P0xqO1QHk1QYZf5pp0SFJytMr3A0Oq/Le07qub3673GYaSLgUHP3f2mDf+5 tZ25xzL2u0QZ6gl5VqovE8+j5cHKesAkjR5iMA3/lFg8wqy/uZzUkNXs4= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jul 2020 01:02:39 +0800 X-OQ-MSGID: <20200728170240.293678-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/utils: remove always true if() 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/utils.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 807d9f10cb..af1cca0c7d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2543,6 +2543,8 @@ int av_seek_frame(AVFormatContext *s, int stream_index, int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags) { + int ret; + int dir; if (min_ts > ts || max_ts < ts) return -1; if (stream_index < -1 || stream_index >= (int)s->nb_streams) @@ -2553,7 +2555,6 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, flags &= ~AVSEEK_FLAG_BACKWARD; if (s->iformat->read_seek2) { - int ret; ff_read_frame_flush(s); if (stream_index == -1 && s->nb_streams == 1) { @@ -2582,19 +2583,14 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, // Fall back on old API if new is not implemented but old is. // Note the old API has somewhat different semantics. - if (s->iformat->read_seek || 1) { - int dir = (ts - (uint64_t)min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0); - int ret = av_seek_frame(s, stream_index, ts, flags | dir); + dir = (ts - (uint64_t)min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0); + ret = av_seek_frame(s, stream_index, ts, flags | dir); if (ret<0 && ts != min_ts && max_ts != ts) { ret = av_seek_frame(s, stream_index, dir ? max_ts : min_ts, flags | dir); if (ret >= 0) ret = av_seek_frame(s, stream_index, ts, flags | (dir^AVSEEK_FLAG_BACKWARD)); } return ret; - } - - // try some generic seek like seek_frame_generic() but with new ts semantics - return -1; //unreachable } int avformat_flush(AVFormatContext *s) From patchwork Tue Jul 28 17:02:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 21344 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 194AA44A61E for ; Tue, 28 Jul 2020 20:02:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5B8268B99B; Tue, 28 Jul 2020 20:02:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-221-141.mail.qq.com [203.205.221.141]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F114B68B976 for ; Tue, 28 Jul 2020 20:02:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1595955764; bh=6vncrM8WEy2ZJm/qhehL3hnPRFVYG598B64Z7AaxlqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RZSTuuFLumh1u3mwIFJOFuKTsaKabndCXkidBUYB7qin3GZhAOhGjYHPculzI2kmh B60kszEB7wSxpRQa+pKy+2oC3FNpVGon3vtX0lI+DpIGkDH8mJ2PQDfVtYgmhjdxk4 OEIZeh+MPvxJIwGDwziU1hDwD/3yV+YBQQyqS2Wo= Received: from localhost.localdomain ([27.46.106.166]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id AA8B451; Wed, 29 Jul 2020 01:02:42 +0800 X-QQ-mid: xmsmtpt1595955763tz3eqvc1n Message-ID: X-QQ-XMAILINFO: Mhi/VOzNUsFXX4Ilc4akl0eWKU7GOfqSCgoAip81GUWLDlDYnyJckf07kQiqQm YgEZweVF1Y1BM4szOmvGpajr+N0J6nvTCnXpqI7dWgAcJjD9Cb+5aXmZv496PF74prZdf6ogCfr7 B+Ai36OR7fQoH+8rSIS2VtH+R+axV/oOt3gTTXBCxs/kvk1u9dVJ8ppAlToTAHNsmvgTnrcS/3+Z eXiRT++AFntHR4Kkw/yM7IBECczLiMFClckBh6mOTyi+thBqDjqzXsy8f+04IKSHblVUFPSOXTSr 6C3nzOsLS7mvlUHfCF0YqGsciRzMh2xw5ZSRH/PbJtP2aehyXbRuNE6jsQq1P8sJ+Opq4jjcKq4g 5Q3QR6QrifQW+nzBKZAO4BTzfwqRQMuiIFzlSn+2grqs1QqIJ20+stdKZaI1RNJfp7+YbOjiyaMe CJ1hZeezHT7nIiGwDVyBOHzBlqMvdc4My0p9Kh2efCsqxA+DSr3RKNYfyZo2yflgd6HTA4RNbQvK L5IhhVmLkTbzsRBtMg/r9v9PpO/cH4i8wflXouWBAG66ZOoXPuMWtbcmX1folMdVmeZFrXm/TBcV oXTdCgegJMxTk3zJBPbaYxie26AoNg5r6YwHUA6v8QSSgpUoE/918ha/6elafexChXm2Cp+588YX QA9NpDxwXl8TDUCbZg92MMH40+2q6WB41fqwOzZX2ByAFSRfP2e2WvXDRMN8pRwpkqf4kOB//ROv 1n From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jul 2020 01:02:40 +0800 X-OQ-MSGID: <20200728170240.293678-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200728170240.293678-1-quinkblack@foxmail.com> References: <20200728170240.293678-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/utils: reindent after remove if() 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/utils.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index af1cca0c7d..88b69c6036 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2583,14 +2583,14 @@ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, // Fall back on old API if new is not implemented but old is. // Note the old API has somewhat different semantics. - dir = (ts - (uint64_t)min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0); - ret = av_seek_frame(s, stream_index, ts, flags | dir); - if (ret<0 && ts != min_ts && max_ts != ts) { - ret = av_seek_frame(s, stream_index, dir ? max_ts : min_ts, flags | dir); - if (ret >= 0) - ret = av_seek_frame(s, stream_index, ts, flags | (dir^AVSEEK_FLAG_BACKWARD)); - } - return ret; + dir = (ts - (uint64_t)min_ts > (uint64_t)max_ts - ts ? AVSEEK_FLAG_BACKWARD : 0); + ret = av_seek_frame(s, stream_index, ts, flags | dir); + if (ret<0 && ts != min_ts && max_ts != ts) { + ret = av_seek_frame(s, stream_index, dir ? max_ts : min_ts, flags | dir); + if (ret >= 0) + ret = av_seek_frame(s, stream_index, ts, flags | (dir^AVSEEK_FLAG_BACKWARD)); + } + return ret; } int avformat_flush(AVFormatContext *s)