From patchwork Wed Feb 22 01:37:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Micah Galizia X-Patchwork-Id: 2636 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp657672vsf; Tue, 21 Feb 2017 17:37:49 -0800 (PST) X-Received: by 10.223.166.72 with SMTP id k66mr20311053wrc.52.1487727468930; Tue, 21 Feb 2017 17:37:48 -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 f197si528740wmg.21.2017.02.21.17.37.48; Tue, 21 Feb 2017 17:37:48 -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=@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 sp=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 DDAC16882FC; Wed, 22 Feb 2017 03:37:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f67.google.com (mail-it0-f67.google.com [209.85.214.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C120687EE3 for ; Wed, 22 Feb 2017 03:37:30 +0200 (EET) Received: by mail-it0-f67.google.com with SMTP id r141so18772215ita.1 for ; Tue, 21 Feb 2017 17:37:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=jCRb+JTumjsjDPAgfT0okEcHJPJXbGfHsTfCabWlUhg=; b=mL2DlrrzN7A0wty238SRgO0n7heeJMjGd1bqp9s9i7MFcjtSIm8BoOkLemJOlWYqkv WgHGAVXyyzYJSfGmAY8NSgzPch2TkFZsg8mkclBjnY80+6bgvWAf7PwLsILPKZS/Pzsi LhsaBo3PmQCDMoJDOaNgc4nsjIfxlQ/yK6RrsSfQ6XBkkyp/mVO+tllWUMLQ0tfmEsHy uo1d2KWBX9IIDrCMhOijYfuCbQrXG4eoG7rhN7bBfd2wwVQeApjD9LJLAGUtouNaJtrJ ptMsMJgRAsGFnW6uv6jFRSkVXH4xKEOH+dFB01Wo2rdTKDLRyLpOG9yEUKD55A44QhOO 1Njw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=jCRb+JTumjsjDPAgfT0okEcHJPJXbGfHsTfCabWlUhg=; b=razX8dJhU4K7Nku00rz2qGy8EU7k/k0Qk7GqTTcnN9HmlRc/bCbzsjO6Gjp3orbnF6 oANNsogfuGgpwGvZn9ZgAVdAU5Q4tOcYbdQQWWahDBTB1CijCEH2q54zWenuOwA58QsV tEZFvokHICcywI/Sg4KZ/QKLGB9XETTbxDiLyPmR/lJxEeqwssrE8vDEZVYhcb3rr1gl S35L0Lw+cC9Perf5hW3zUgexk1Qiuio1Ff2T3+53V9G8KGVF636ANnDnbz3NDxjKAQUg vvqEUVbs7M1KHlJ8CZQeJoqIMq769ulCwzPOK3I70eOxFuUMyTHdoyeGR6pGMdHxywF6 q//g== X-Gm-Message-State: AMke39nbKisBbRPFPql1hJf9EobmCFWKKF2MlEhv/CzgiSmYfaleK4CdwIhyZ3+tHSpXiA== X-Received: by 10.36.44.12 with SMTP id i12mr97508iti.92.1487727457012; Tue, 21 Feb 2017 17:37:37 -0800 (PST) Received: from localhost.localdomain (ip-24-54-73-138.user.start.ca. [24.54.73.138]) by smtp.gmail.com with ESMTPSA id h126sm1966ioe.61.2017.02.21.17.37.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Feb 2017 17:37:36 -0800 (PST) From: Micah Galizia To: micahgalizia@gmail.com, ffmpeg-devel@ffmpeg.org Date: Tue, 21 Feb 2017 20:37:25 -0500 Message-Id: <20170222013725.25413-1-micahgalizia@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170220104750.GA2923380@phare.normalesup.org> References: <20170220104750.GA2923380@phare.normalesup.org> Subject: [FFmpeg-devel] [PATCH] add locale month names to av_small_strptime 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" Signed-off-by: Micah Galizia --- libavutil/parseutils.c | 28 ++++++++++++++++++++++++++++ libavutil/tests/parseutils.c | 7 +++++++ tests/ref/fate/parseutils | 7 +++++++ 3 files changed, 42 insertions(+) diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 86d3dac..7ca07b3 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -140,6 +140,11 @@ static const VideoRateAbbr video_rate_abbrs[]= { { "ntsc-film", { 24000, 1001 } }, }; +static const char *months[12] = { + "january", "february", "march", "april", "may", "june", "july", "august", + "september", "october", "november", "december" +}; + int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str) { int i; @@ -466,6 +471,21 @@ static int date_get_num(const char **pp, return val; } +static int date_get_month(const char **pp) { + int i = 0; + for (; i < 12; i++) { + if (!av_strncasecmp(*pp, months[i], 3)) { + const char *mo_full = months[i] + 3; + int len = strlen(mo_full); + *pp += 3; + if (len > 0 && !av_strncasecmp(*pp, mo_full, len)) + *pp += len; + return i; + } + } + return -1; +} + char *av_small_strptime(const char *p, const char *fmt, struct tm *dt) { int c, val; @@ -525,6 +545,14 @@ char *av_small_strptime(const char *p, const char *fmt, struct tm *dt) if (!p) return NULL; break; + case 'b': + case 'B': + case 'h': + val = date_get_month(&p); + if (val == -1) + return NULL; + dt->tm_mon = val; + break; case '%': if (*p++ != '%') return NULL; diff --git a/libavutil/tests/parseutils.c b/libavutil/tests/parseutils.c index 682b390..180f624 100644 --- a/libavutil/tests/parseutils.c +++ b/libavutil/tests/parseutils.c @@ -138,6 +138,13 @@ static void test_av_small_strptime(void) { "%Y - %m - %d", "2012-12-21" }, { "%Y-%m-%d %H:%M:%S", "2012-12-21 20:12:21" }, { " %Y - %m - %d %H : %M : %S", " 2012 - 12 - 21 20 : 12 : 21" }, + { " %Y - %b - %d %H : %M : %S", " 2012 - nOV - 21 20 : 12 : 21" }, + { " %Y - %B - %d %H : %M : %S", " 2012 - nOVemBeR - 21 20 : 12 : 21" }, + { " %Y - %B%d %H : %M : %S", " 2012 - may21 20 : 12 : 21" }, + { " %Y - %B%d %H : %M : %S", " 2012 - mby21 20 : 12 : 21" }, + { " %Y - %B - %d %H : %M : %S", " 2012 - JunE - 21 20 : 12 : 21" }, + { " %Y - %B - %d %H : %M : %S", " 2012 - Jane - 21 20 : 12 : 21" }, + { " %Y - %B - %d %H : %M : %S", " 2012 - January - 21 20 : 12 : 21" }, }; av_log_set_level(AV_LOG_DEBUG); diff --git a/tests/ref/fate/parseutils b/tests/ref/fate/parseutils index 1aad5ec..568b6d2 100644 --- a/tests/ref/fate/parseutils +++ b/tests/ref/fate/parseutils @@ -68,6 +68,13 @@ fmt:'%Y-%m-%d' spec:'2012-12-21' -> 2012-12-21 00:00:00 fmt:'%Y - %m - %d' spec:'2012-12-21' -> 2012-12-21 00:00:00 fmt:'%Y-%m-%d %H:%M:%S' spec:'2012-12-21 20:12:21' -> 2012-12-21 20:12:21 fmt:' %Y - %m - %d %H : %M : %S' spec:' 2012 - 12 - 21 20 : 12 : 21' -> 2012-12-21 20:12:21 +fmt:' %Y - %b - %d %H : %M : %S' spec:' 2012 - nOV - 21 20 : 12 : 21' -> 2012-11-21 20:12:21 +fmt:' %Y - %B - %d %H : %M : %S' spec:' 2012 - nOVemBeR - 21 20 : 12 : 21' -> 2012-11-21 20:12:21 +fmt:' %Y - %B%d %H : %M : %S' spec:' 2012 - may21 20 : 12 : 21' -> 2012-05-21 20:12:21 +fmt:' %Y - %B%d %H : %M : %S' spec:' 2012 - mby21 20 : 12 : 21' -> error +fmt:' %Y - %B - %d %H : %M : %S' spec:' 2012 - JunE - 21 20 : 12 : 21' -> 2012-06-21 20:12:21 +fmt:' %Y - %B - %d %H : %M : %S' spec:' 2012 - Jane - 21 20 : 12 : 21' -> error +fmt:' %Y - %B - %d %H : %M : %S' spec:' 2012 - January - 21 20 : 12 : 21' -> 2012-01-21 20:12:21 Testing av_parse_time() (now is 2012-03-17 09:14:13.2 +0100, local time is UTC+1)