From patchwork Mon May 8 04:36:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 3607 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp682889vsd; Sun, 7 May 2017 21:36:40 -0700 (PDT) X-Received: by 10.223.132.163 with SMTP id 32mr39581003wrg.154.1494218200264; Sun, 07 May 2017 21:36:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494218200; cv=none; d=google.com; s=arc-20160816; b=CCHQStDX2pRLqfAlaB1HWtyfraOXeMrOAEk+Jg60RkDrgtSYPu6dP4nVx3O6UeipdU pAVIKXVfH5UcQw5Xk6sH0+7s37Dpa1a/ZobhRIa98pfYYGdVQisuNFQOJtOE1vMlYxbc wkV/4d50tKMmGSP/Nko8i/5u0XBA71TCqBvrhsdIov3DwvpBKGCT6zPNt2zr6FkHXl/A 2VzULV+YkpNBp1z3de4u/SdLUDStj4wiQniTCrBEsGy3fZgfQEwPLmRhtRwp/4TiCX5U zYUZ4h0FVT2aK2DPiu7ZYlT5c0yoQ3BRFcFfNFSCm+uDa628Tkp67m7Xc9F/vfzN4Qcj SCiQ== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=1BMDITBEULzZPz6d0CYHZW9PzoCBNytYYaW7G8MWdFs=; b=jrxMmp25S496ha5JZ2O46rikihEKRsk/9o9Ijtxrv4xXuSdp8GjL6B3LJwr62MIT2l ZWYL3Yti9N1Rpr5r0JhgGW9jeGcb4vHOodnemGUrislZsaaDGh+rX2VE8uEbnhPXoNQA COyiKY2CP+TSp7N7fpWMVECSGcBcETIXhHSUTUdLAnAQtY8xpkSgZdls/DPaEfOnqHDc 6v/zmJIDP0JC10DaMvjn+WmI1d5HR8j9Z5r0EC7KBVfJnGsVHZLPfDuQwTquH4+pA0cR 4C7WZUwVERXqnCQXGciLAWT/uzbXdbHSQFv+ODn2SU+kJ/0CVawY/on3QdpA26EyqTwM sBqg== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e145si11996330wme.26.2017.05.07.21.36.39; Sun, 07 May 2017 21:36:40 -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 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 C53B4688290; Mon, 8 May 2017 07:36:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f182.google.com (mail-qt0-f182.google.com [209.85.216.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 131BE68044D for ; Mon, 8 May 2017 07:36:24 +0300 (EEST) Received: by mail-qt0-f182.google.com with SMTP id t26so25556215qtg.0 for ; Sun, 07 May 2017 21:36:30 -0700 (PDT) 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=qh2tYjUw9UIrVtubcpB2PvBiVaGQSzcKMzuD4R3IEP8=; b=bWQ/nQll0E/RVKcE4FxLEnTWHiCX8VpQ8dfSjM2OY2kUdG751hN1ngzZr1JXw9FHnV hTak+PJwshquK8z64EDcqZvBxHduGT31YK+VciYcvYSqzt7OPSaA4itc/Fj/q15TKITD MOig6a+JBx72qcVVyP2AUVaULeqXLVZ+9AnHDHZ0CIhBLhQVc7Nh7s3wFfYPoa/DhtIa dQClZ6pRsDrgYckcBrkNNIjhQoDUeWPBB7/pttWMUS5Gpb06GFW3DC8fY/puKaxMSj7c UyYqLkkmaTflgBbRi0tkD03Y8CJ8GYxssn1mJaxvZQ475chCyGK8AidxY2a6nxCBqGDy K3Cg== 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=qh2tYjUw9UIrVtubcpB2PvBiVaGQSzcKMzuD4R3IEP8=; b=q0CHTNSuMa3M8X3YaygNiCpLPZXDRErC64TR+TY0KKA+G2oK/MFGc7iMc9B9e136m4 hw/xaPStKB1crOPU/79V8zpWiW1wiBbvTL8Dx3SwlyL/hN+kVAlazfjMJQ6KglmmiHnu 3eEw6HXtqXyygo7JeEDSj2E9NU9fv6F+V8q3+emGDEUoQQK6Twf4fjJ1p3z28fAeZzcO juXOWSTnoC1tc/VsRE1xsVtOKmkH8fqJ6TkoT0p7LTvb2GA0d44j1nj7fxdk2kDVUksH KL6lJCWinbKDcmdpfmJKMRyVwZddSKuw7a0o7T51oRSHYg5Sfz5lLW7+OztWCNCwSpkN HPBA== X-Gm-Message-State: AN3rC/62thoW1D1xKa3FHBQ5pOIXdTYltph/WZ83UVX43G4TFGyKJT2P vtG/a25+dFX5+rsTkcI= X-Received: by 10.237.59.150 with SMTP id r22mr50631269qte.100.1494218188839; Sun, 07 May 2017 21:36:28 -0700 (PDT) Received: from rcombs-NAS.hsd1.il.comcast.net. (c-73-110-121-59.hsd1.il.comcast.net. [73.110.121.59]) by smtp.gmail.com with ESMTPSA id 88sm10056162qkx.68.2017.05.07.21.36.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 May 2017 21:36:27 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 May 2017 23:36:19 -0500 Message-Id: <1494218184-17850-2-git-send-email-rodger.combs@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1494218184-17850-1-git-send-email-rodger.combs@gmail.com> References: <1494218184-17850-1-git-send-email-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/7] lavf/segment: add option to segment by chapter 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" --- doc/muxers.texi | 6 +++++ libavformat/segment.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++---- libavformat/version.h | 2 +- 3 files changed, 67 insertions(+), 6 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 0866142..b80bc68 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1521,6 +1521,12 @@ This option specifies to start a new segment whenever a reference stream key frame is found and the sequential number (starting from 0) of the frame is greater or equal to the next value in the list. +@item segment_chapters @var{1|0} +Split each chapter into its own segment. Metadata from the chapters +will be written to the corresponding segments. If this option is selected +and the filename contains tokens in the format @code{$varname$}, they +will be replaced by the corresponding metadata values. + @item segment_wrap @var{limit} Wrap around segment index once it reaches @var{limit}. diff --git a/libavformat/segment.c b/libavformat/segment.c index 8ec3653..8575d32 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -108,6 +108,8 @@ typedef struct SegmentContext { int frame_count; ///< total number of reference frames int segment_frame_count; ///< number of reference frames in the segment + int split_chapters; ///< split on chapter markers + int64_t time_delta; int individual_header_trailer; /**< Set by a private option. */ int write_header_trailer; /**< Set by a private option. */ @@ -188,6 +190,43 @@ static int segment_mux_init(AVFormatContext *s) return 0; } +static int replace_variables(AVFormatContext *oc) +{ + char name[sizeof(oc->filename)]; + char *p = name; + char *out = oc->filename; + strncpy(name, oc->filename, sizeof(name)); + while (*p) { + char c = *p++; + if (c == '$') { + if (*p == '$') { + p++; + goto append; + } else { + int len; + const char *val; + const AVDictionaryEntry *e; + int end = strcspn(p, "$"); + if (p[end] == '\0') + continue; + p[end] = '\0'; + e = av_dict_get(oc->metadata, p, NULL, 0); + val = e ? e->value : "(unknown)"; + len = strlen(val); + strncpy(out, val, oc->filename + sizeof(oc->filename) - 1 - out); + out = FFMIN(oc->filename + sizeof(oc->filename) - 1, out + len); + p += end + 1; + } + } else { +append: + if (out - oc->filename < sizeof(oc->filename) - 1) + *out++ = c; + } + } + *out = '\0'; + return 0; +} + static int set_segment_filename(AVFormatContext *s) { SegmentContext *seg = s->priv_data; @@ -212,6 +251,9 @@ static int set_segment_filename(AVFormatContext *s) return AVERROR(EINVAL); } + if (seg->split_chapters) + replace_variables(oc); + /* copy modified name in list entry */ size = strlen(av_basename(oc->filename)) + 1; if (seg->entry_prefix) @@ -238,6 +280,8 @@ static int segment_start(AVFormatContext *s, int write_header) if ((err = segment_mux_init(s)) < 0) return err; oc = seg->avf; + if (seg->split_chapters && seg->segment_count < s->nb_chapters && (err = av_dict_copy(&oc->metadata, s->chapters[seg->segment_count]->metadata, 0)) < 0) + return err; } seg->segment_idx++; @@ -661,10 +705,14 @@ static int seg_init(AVFormatContext *s) "you can use output_ts_offset instead of it\n"); } - if (!!seg->time_str + !!seg->times_str + !!seg->frames_str > 1) { + if (seg->segment_idx < 0) + seg->segment_idx = seg->split_chapters; + + if (!!seg->time_str + !!seg->times_str + !!seg->frames_str + !!seg->split_chapters > 1) { av_log(s, AV_LOG_ERROR, - "segment_time, segment_times, and segment_frames options " - "are mutually exclusive, select just one of them\n"); + "segment_time, segment_times, segment_frames, and " + "segment_chapters options are mutually exclusive; " + "select just one of them\n"); return AVERROR(EINVAL); } @@ -674,7 +722,7 @@ static int seg_init(AVFormatContext *s) } else if (seg->frames_str) { if ((ret = parse_frames(s, &seg->frames, &seg->nb_frames, seg->frames_str)) < 0) return ret; - } else { + } else if (!seg->split_chapters) { /* set default value if not specified */ if (!seg->time_str) seg->time_str = av_strdup("2"); @@ -741,6 +789,9 @@ static int seg_init(AVFormatContext *s) if ((ret = segment_mux_init(s)) < 0) return ret; + if (seg->split_chapters && s->nb_chapters && (ret = av_dict_copy(&seg->avf->metadata, s->chapters[0]->metadata, 0)) < 0) + return ret; + if ((ret = set_segment_filename(s)) < 0) return ret; oc = seg->avf; @@ -862,6 +913,9 @@ calc_times: } else if (seg->frames) { start_frame = seg->segment_count < seg->nb_frames ? seg->frames[seg->segment_count] : INT_MAX; + } else if (seg->split_chapters) { + end_pts = seg->segment_count + 1 < s->nb_chapters ? + av_rescale_q(s->chapters[seg->segment_count]->end, s->chapters[seg->segment_count]->time_base, AV_TIME_BASE_Q) : INT64_MAX; } else { if (seg->use_clocktime) { int64_t avgt = av_gettime(); @@ -1044,9 +1098,10 @@ static const AVOption options[] = { { "segment_time_delta","set approximation value used for the segment times", OFFSET(time_delta), AV_OPT_TYPE_DURATION, {.i64 = 0}, 0, 0, E }, { "segment_times", "set segment split time points", OFFSET(times_str),AV_OPT_TYPE_STRING,{.str = NULL}, 0, 0, E }, { "segment_frames", "set segment split frame numbers", OFFSET(frames_str),AV_OPT_TYPE_STRING,{.str = NULL}, 0, 0, E }, + { "segment_chapters", "split segments on chapter markers", OFFSET(split_chapters), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E }, { "segment_wrap", "set number after which the index wraps", OFFSET(segment_idx_wrap), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E }, { "segment_list_entry_prefix", "set base url prefix for segments", OFFSET(entry_prefix), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E }, - { "segment_start_number", "set the sequence number of the first segment", OFFSET(segment_idx), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E }, + { "segment_start_number", "set the sequence number of the first segment", OFFSET(segment_idx), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, E }, { "segment_wrap_number", "set the number of wrap before the first segment", OFFSET(segment_idx_wrap_nb), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, E }, { "strftime", "set filename expansion with strftime at segment creation", OFFSET(use_strftime), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, { "increment_tc", "increment timecode between each segment", OFFSET(increment_tc), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, E }, diff --git a/libavformat/version.h b/libavformat/version.h index b00a8b0..645a226 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MINOR 73 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \