From patchwork Sat Sep 10 01:06:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 503 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp582237vsd; Fri, 9 Sep 2016 18:07:05 -0700 (PDT) X-Received: by 10.194.79.198 with SMTP id l6mr5408491wjx.84.1473469625887; Fri, 09 Sep 2016 18:07:05 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e125si5297759wmf.43.2016.09.09.18.07.04; Fri, 09 Sep 2016 18:07:05 -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; dkim=neutral (body hash did not verify) header.i=@gmail.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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36E5B689E32; Sat, 10 Sep 2016 04:06:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f66.google.com (mail-oi0-f66.google.com [209.85.218.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9EAA689E0B for ; Sat, 10 Sep 2016 04:06:36 +0300 (EEST) Received: by mail-oi0-f66.google.com with SMTP id y2so8626316oie.0 for ; Fri, 09 Sep 2016 18:06:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=wzeQJh+iCxeyUYfhp3v2uoz/7wL3idx+uWXh+TsLH+k=; b=sS/5HjQ1NGNU1oAG/Ro6FtIH1MNjoYzUa22NUoKsmimryN82/cMpVzz4cHpxRzdNaN oxAYNUS9r1yta/sL3yJEjlKFwzcuMjgyKh69Ln9FMTOfacfdi7pLSUyPV+Br0qOSUSNB 6wPO8goxKe8LAwGs9XgHYNTZpiSt0kjjE6yS9/GrWxV6+mCg/f62PTkXyXygFBpJwGVz zDu3aDZt6G5MARxhme+7cASw2CIb4DLuDlT52byG9OG5KREgLcE1bPpAc2FSEYiK1mBy LD7PF5ais3U4RdTD45BTAYs9svwy2rEjIpna7NjfUG/o9eFjkpjW4gN47Bz0gg9l30MC RXQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=wzeQJh+iCxeyUYfhp3v2uoz/7wL3idx+uWXh+TsLH+k=; b=iK5AMb34L9/jCtKorDZcevYgFWEk8CMQtGhhxB5rBGQASe2S2UfQAuW1qpYJffpo7H 8Fc1sESqkO90kfS6Biu35UVcZIuTLrF0yBwL+MUvUfJ+VarctIFlDnKAM0HatbdJrm3X Iexer93CQPFK2U91urzC+dsSKqU24Vu1tqRe+wACb4T8Ac99rNC3Yj0GXe7s11H/JFAa cUc1usMbk/Z8P7Or4OSuhEjIF9Le6aYtZ4nYxKX/KHnaCATQSrOTQUj7mJ02QtvOCNod lCGIXv+Uhlgj0eirVSKKmwJLgOOc/gVBSsP7JgC/X+AX0mqScyIf8FJe7GMYJfoiOmDq DKdg== X-Gm-Message-State: AE9vXwOEVy8eYrWra1D6gSrtbOegkzzLcH4HE3M7IY/+MdrKiWb0+mUa1ftBbEkf173pWg== X-Received: by 10.157.14.214 with SMTP id 80mr8395107otj.29.1473469606400; Fri, 09 Sep 2016 18:06:46 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id 69sm3125533itf.6.2016.09.09.18.06.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 09 Sep 2016 18:06:45 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Sep 2016 20:06:40 -0500 Message-Id: <20160910010640.68408-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20160910010640.68408-1-rodger.combs@gmail.com> References: <20160910010640.68408-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavf/mov: strip com.apple.quicktime prefix in meta; parse creation date 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mov.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 54530e3..b75acd2 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -42,6 +42,7 @@ #include "libavutil/aes_ctr.h" #include "libavutil/sha.h" #include "libavutil/timecode.h" +#include "libavutil/parseutils.h" #include "libavcodec/ac3tab.h" #include "libavcodec/mpegaudiodecheader.h" #include "avformat.h" @@ -476,6 +477,21 @@ retry: return ret; } str[str_size] = 0; + if (!strcmp(key, "com.apple.quicktime.creationdate")) { + struct tm *ptm, tmbuf; + int64_t timeval; + if (av_parse_time(&timeval, str, 0) >= 0) { + time_t timet = timeval / 1000000; + if (ptm = gmtime_r(&timet, &tmbuf)) { + strftime(str, str_size, "%Y-%m-%d %H:%M:%S", ptm); + key = "creation_time"; + } + } + } else if (!strcmp(key, "com.apple.quicktime.location.ISO6709")) { + key = "location"; + } else if (!strncmp(key, "com.apple.quicktime.", 20)) { + key += 20; + } } c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED; av_dict_set(&c->fc->metadata, key, str, 0);