From patchwork Sat Sep 10 01:07:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 504 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp582326vsd; Fri, 9 Sep 2016 18:07:24 -0700 (PDT) X-Received: by 10.194.2.10 with SMTP id 10mr5191949wjq.171.1473469644678; Fri, 09 Sep 2016 18:07:24 -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 17si5297488wmg.21.2016.09.09.18.07.23; Fri, 09 Sep 2016 18:07:24 -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 A1DB968975E; Sat, 10 Sep 2016 04:07:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53881689E3A for ; Sat, 10 Sep 2016 04:07:06 +0300 (EEST) Received: by mail-oi0-f65.google.com with SMTP id y2so8627302oie.0 for ; Fri, 09 Sep 2016 18:07:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=ChFev8WKXQaqJRNNmUm5+8Y+4SwXtXtbfVcy8CywGNM=; b=WDMOoX7stXGMhi4eL5IpvCbWitesnT4pDuXY2Ux3JLkKz/xAyMReXk9alLjjv/y3+V 4PqcurIzbTtlmZt1HnDyRHhOfHGyHsPPrd8cObt1ybFPqITcPdI2nzrb0cGgkWiPsLBy kvhGvA5txpKq1gW+LRAc91yNqQOBvg7tkSkD5oOWup4oKsgoaZsYsOMQsABmcG78R88/ RV0MGTHdo9zfRXXgU2u0psLHRwqMhkjX3WCMYsU8YXtu0uaUgrPexF+rMsGOuhjdrMzO y1fB/vQUYtpvUp436qmR6TejY5+XAE6/sxa+zW/ujuC2F2BSuXCd4WBKd2LZbgDqmgnn uJSg== 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; bh=ChFev8WKXQaqJRNNmUm5+8Y+4SwXtXtbfVcy8CywGNM=; b=B6ZHBlu+Ev3aO09BB5h+lVVGiSGhGQrzT5Yid8UUMai3yV21TnaW2sZYeZFShk1JFZ a2hxCnm9p3UU7QCVnAHYSwy/DVVx86yywljb86xSK6iyOJlEIJH3AstA6jV8Z+CG3Geb +Xqmg38oooS9drgH7axINtquysLZOuBuC50N7zuzinciPAhwbgkkVWSiruuVd9GFA5Dx KsysS0rbz3QxQanTe7xzW3Rr4ksi6LfmPKKKgn+Jfsg+wYYHHZFimu1NVsetLez1j3eo UXeZ6CZO4qNQPSnkk/aJyHAmbAlGKy8pCUTzVEOlM2xkb9AA9CBfOMRKdxLUPL6w/gCE 7EMA== X-Gm-Message-State: AE9vXwMztksUfMximrreVb8SsiEW/X25s80f2ujKsyxaRzIIS+NQXASJigryX+EODotC0Q== X-Received: by 10.157.22.166 with SMTP id c35mr8668855ote.172.1473469636020; Fri, 09 Sep 2016 18:07:16 -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 x203sm3121310itb.11.2016.09.09.18.07.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 09 Sep 2016 18:07:15 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Sep 2016 20:07:11 -0500 Message-Id: <20160910010711.68472-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.10.0 Subject: [FFmpeg-devel] [PATCH] 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 54530e3..103927b 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,28 @@ 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)) { + if (str_size < 29) { + av_free(str); + str = av_malloc(29); + if (!str) + return AVERROR(ENOMEM); + } + strftime(str, str_size, "%Y-%m-%dT%H:%M:%S", ptm); + av_strlcatf(str, str_size, ".%06dZ", (int)(timeval % 1000000)); + 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);