From patchwork Fri Nov 11 03:42:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?GBK?B?w8+zvSjj1bfqKQ==?= X-Patchwork-Id: 1382 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1197802vsb; Thu, 10 Nov 2016 19:44:02 -0800 (PST) X-Received: by 10.28.62.141 with SMTP id l135mr6189620wma.20.1478835842174; Thu, 10 Nov 2016 19:44:02 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y63si8942051wmb.140.2016.11.10.19.44.01; Thu, 10 Nov 2016 19:44:02 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@alibaba-inc.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; dmarc=fail (p=NONE dis=NONE) header.from=alibaba-inc.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E6CD689F30; Fri, 11 Nov 2016 05:43:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out0-155.mail.aliyun.com (out0-155.mail.aliyun.com [140.205.0.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 935E5689EB7 for ; Fri, 11 Nov 2016 05:42:37 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alibaba-inc.com; s=default; t=1478835751; h=Date:Subject:From:To:Message-ID:Mime-version:Content-type; bh=9i4HjhuHQg0Kqd7eon/i4JWsOSvPEruq1GSKZIouVpA=; b=c/PATWzShZXBgCw8s8+LHwEeE6+3GtGeexqCFPLIezH+SCnA9EnVrERoaZnV0k96zsw9F9QTgG/HNSwVWJAdv6rhcx2Targ30ihH6nJIumJyvdlYcXy1X7osoNj+D/MxCrT7PHV1KxcmBBNqS7C59uk689LANZRwqpZZXyxMhMM= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R311e4; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e02c03311; MF=mengchen.mc@alibaba-inc.com; NM=1; PH=DS; RN=2; SR=0; TI=SMTPD_---.7A-eweJ_1478835747; Received: from 30.17.40.119(mailfrom:mengchen.mc@alibaba-inc.com ip:121.0.29.67) by smtp.aliyun-inc.com(127.0.0.1); Fri, 11 Nov 2016 11:42:27 +0800 User-Agent: Microsoft-MacOutlook/f.1b.0.161010 Date: Fri, 11 Nov 2016 11:42:26 +0800 From: "Chen Meng" To: FFmpeg development discussions and patches Message-ID: Thread-Topic: [FFmpeg-devel] [PATCH] Make the process of uuid-xmp atom faster. References: <20161111023616.9417-1-mengchen.mc@alibaba-inc.com> In-Reply-To: Mime-version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] Make the process of uuid-xmp atom faster. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Ya. It’s really annoying everyone using patchwork. (So loooong text.) I’m trying to fix it. Please use my name, Chen Meng, if nothing changed in a short time. 2016-11-11 10:36 GMT+08:00 Chen Meng : --- libavformat/mov.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) -- 2.10.2 LGTM, Except Submitter name used GBK at https://patchwork.ffmpeg.org/project/ffmpeg/list/ diff --git a/libavformat/mov.c b/libavformat/mov.c index 9ec7d03..436c234 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4549,24 +4549,28 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) } else if (!memcmp(uuid, uuid_xmp, sizeof(uuid))) { uint8_t *buffer; size_t len = atom.size - sizeof(uuid); - - buffer = av_mallocz(len + 1); - if (!buffer) { - return AVERROR(ENOMEM); - } - ret = avio_read(pb, buffer, len); - if (ret < 0) { - av_free(buffer); - return ret; - } else if (ret != len) { - av_free(buffer); - return AVERROR_INVALIDDATA; - } if (c->export_xmp) { + buffer = av_mallocz(len + 1); + if (!buffer) { + return AVERROR(ENOMEM); + } + ret = avio_read(pb, buffer, len); + if (ret < 0) { + av_free(buffer); + return ret; + } else if (ret != len) { + av_free(buffer); + return AVERROR_INVALIDDATA; + } buffer[len] = '\0'; av_dict_set(&c->fc->metadata, "xmp", buffer, 0); + av_free(buffer); + } else { + // skip all uuid atom, which makes it fast for long uuid-xmp file + ret = avio_skip(pb, len); + if (ret < 0) + return ret; } - av_free(buffer); } return 0; }