From patchwork Mon Sep 3 10:05:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 10214 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2492328jap; Mon, 3 Sep 2018 03:06:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZDSC56icecKbj3aEj/3Uy6FjFHFYRlH4q0UbGDiARWKvTf4+9KACDBV91i0CBhJZ+MDXRq X-Received: by 2002:adf:fc44:: with SMTP id e4-v6mr19359269wrs.9.1535969210813; Mon, 03 Sep 2018 03:06:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535969210; cv=none; d=google.com; s=arc-20160816; b=WihPot8yhzMhJgA8F+WVyBMvs9NAKkO4m0x6kTIU0Zlry8D0GP56Vqkq/9WzTEHlfY JKhseeihtIk6naLX+nNwxXLy08d88gTRzFmAdlBVi177wjON++EKHWBoMhxRcTbsoRP+ CzlY8l9XIszqNB2JFqMea8VxdcWuF7DQi5RRJYVVifGXS9rpinnC8GPyBIObMMqpwY7O 3R5K/X1WdP/sHM5GNKKExtLzIvNYRSKhdQGVHbLwDDAlF8sTKr17doZanXYxbP3oIXTy 4LPg+/vYTDwHRDssg8C23inJIgYmOnWkaTiv8UrSzCF1BIDgdGotuu1SXE43bQHr40E7 IIiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=mqJDh7iYfwLigj5CCmWcQSZ3HuIAEPVKf+Ev2LOeCi4=; b=rI+iwZab1q6mmgCvJPFvLYcz2HF4UM8h0yTalcwvtl/Ue2nEaeyfjwAHKOAzKnInWF z6yoNZ0dt5gUjOxag3NYsHLyGuVugWSMbRCdhgSS6ySo+nL4aZxGA+KGLPH/ZhVoDGoZ HqwA98IjZRLKXKF9t3B0PvhdgVanToS1+4L504VQp9LxzDYbpwBbcHRcQ0cBQe5PGG58 sgdxu1y5MTMRVnBxLinc9lld2fCdICWSMgs/MVV+/C1Jxwr9a3nouzvN8zXbvi0l0kMG CHWmHj6ut7PaAM/B7f8PXVP1CD9XislQb5wNr5SATKrGiP1XWcI1/FRVGzVAIflltBWe 84uA== 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 m16-v6si9031516wmd.3.2018.09.03.03.06.50; Mon, 03 Sep 2018 03:06:50 -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 63F01689C3E; Mon, 3 Sep 2018 13:06:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg202.qq.com (smtpbg202.qq.com [184.105.206.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C35A7689BA3 for ; Mon, 3 Sep 2018 13:06:17 +0300 (EEST) X-QQ-mid: bizesmtp6t1535969178tfj1fxig1 Received: from localhost (unknown [117.136.38.158]) by esmtp6.qq.com (ESMTP) with id ; Mon, 03 Sep 2018 18:06:17 +0800 (CST) X-QQ-SSF: 01100000002000F0FMF0000A0000000 X-QQ-FEAT: 3GtnPQ8BMmaNHdgmMDzDdLYOPuDIK79wW3rj8arV5TiRlxLIiN8wnEkPf4xig bMKxjh7IpLBEXLHoME2kc7ioI8/J+mRbPhSWfgJ+U+SBiyXJlT/eUm5hUOj9EPl42zxD2Uc cV02+vnFb6IaNqsH3x8aCK6GAl/RMZGQ5hd/C2WyJjArQrhGnOohgFVSsWycAXTRaZ6hZ4U CQ3xiN3Z0J80zjGudxYSiX2+3vmwLWfng3jlFuPB78qFd8ND8EqbHrz1I+YFr5MwoG/SX6B 1k1MEnCgxlGGLKsA/ROFt8GveDAZTzEJBh2Q== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Sep 2018 18:05:55 +0800 Message-Id: <20180903100600.85023-3-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) In-Reply-To: <20180903100600.85023-1-lq@chinaffmpeg.org> References: <20180903100600.85023-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 3/8] avformat/dashdec: remove redundant code 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/dashdec.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index ff6684c511..9d69045d37 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1568,14 +1568,8 @@ static struct fragment *get_current_fragment(struct representation *pls) return seg; } -enum ReadFromURLMode { - READ_NORMAL, - READ_COMPLETE, -}; - static int read_from_url(struct representation *pls, struct fragment *seg, - uint8_t *buf, int buf_size, - enum ReadFromURLMode mode) + uint8_t *buf, int buf_size) { int ret; @@ -1583,14 +1577,7 @@ static int read_from_url(struct representation *pls, struct fragment *seg, if (seg->size >= 0) buf_size = FFMIN(buf_size, pls->cur_seg_size - pls->cur_seg_offset); - if (mode == READ_COMPLETE) { - ret = avio_read(pls->input, buf, buf_size); - if (ret < buf_size) { - av_log(pls->parent, AV_LOG_WARNING, "Could not read complete fragment.\n"); - } - } else { ret = avio_read(pls->input, buf, buf_size); - } if (ret > 0) pls->cur_seg_offset += ret; @@ -1666,7 +1653,7 @@ static int update_init_section(struct representation *pls) av_fast_malloc(&pls->init_sec_buf, &pls->init_sec_buf_size, sec_size); ret = read_from_url(pls, pls->init_section, pls->init_sec_buf, - pls->init_sec_buf_size, READ_COMPLETE); + pls->init_sec_buf_size); ff_format_io_close(pls->parent, &pls->input); if (ret < 0) @@ -1737,7 +1724,7 @@ restart: ret = AVERROR_EOF; goto end; } - ret = read_from_url(v, v->cur_seg, buf, buf_size, READ_NORMAL); + ret = read_from_url(v, v->cur_seg, buf, buf_size); if (ret > 0) goto end;