From patchwork Tue Aug 1 06:33:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 4560 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.85 with SMTP id 82csp3300315vsb; Mon, 31 Jul 2017 23:40:13 -0700 (PDT) X-Received: by 10.223.171.85 with SMTP id r21mr13585490wrc.88.1501569613804; Mon, 31 Jul 2017 23:40:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501569613; cv=none; d=google.com; s=arc-20160816; b=rUrZ0w7lLJZo1lzM6UCRPgx5z5AQpqicIe7ekG2SZucA1eUqNJDMmql+P5OF0VEHmk QEzSPRXE3JcQBqCpqAEKRgT7jwXTpSVmMgVpAn0h1QIFeQ58MApyFGzKaSRrwi+krSg6 Y7DehC/NhUGEZ7sqRzKrrMXxiA2RdGd9I3tU+2AbL+QIRCexlgDVJwaq30kKsxxNLB5P AZXAT/qKUfwkhd+nEwGiVe77eCiqRUP3KAKu0bxT4OTAxTh0L095NEpykcBG1z3Trlxs vnb9Hzty/z4T5V3SIs7RXn3Qhz2+pTQnVZZHcZcKAd1btWRZhIErhZuv6LMZ1vTM09dq mUFw== 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=0Nv3d8b5lU5jxrUR65W3hV7OUesCePk5Utd1s8hw3JA=; b=j3MgDEf43/sEtQtf5Ghr2czkeFqCy9e8FU7lFDFBu1+2ZrBBAu2JrOeiAwcXj6nNLF WTQHsmaVk1H1btIX4sIadTJH5u1fpmBjGqUhD6MxnRcxYOo6KhIkx+VaXtvb+FR1MZV3 xmIxpBW7UluHB1ROBR6Ow2RAPcMEc59bq7edNY+xhpsnbryxx/XEz6f6oJCyC7+L4Kgf VEpIChgeXnNQja+Y+h18kPN+6+cYjtTCBMtmWD2SSmeNR29uuolYGThMvn7HdnNOgtCv MtKagCubHf9JdpxTMwenqnfvpjaY2VLta1/uio+eBg7hKppyi3GmzLFyDvf7i1rv3avS 2b5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=kUhLeg1p; 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 x124si584889wmx.38.2017.07.31.23.40.13; Mon, 31 Jul 2017 23:40:13 -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 header.s=20161025 header.b=kUhLeg1p; 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 73AF068A30F; Tue, 1 Aug 2017 09:40:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C62DF68A205 for ; Tue, 1 Aug 2017 09:40:07 +0300 (EEST) Received: by mail-it0-f66.google.com with SMTP id 77so855304itj.4 for ; Mon, 31 Jul 2017 23:40:10 -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=VORZbtDnmX5akyGH5x5DvLpBxQCGq11UmQQJLrAo5YE=; b=kUhLeg1p1aD2kcnzk8vrR2XyL/YN93yyM8TLC5kbk5FAVgk8hqqjlcdS/W7hSBDgi6 7f3wEaYqZ46nhWb5e58NLdIAwasnGUow4NZpGJOg/fKa7NoFM1b7WD6VDJ951e9KDWkO 2u7fFXXqGIxzuwIjGEtG4K6bSduSFDKgdNTAzoGzDfAusL6SzcLr1hZ6b/X8FFENlgzQ qcbDhMF4ySaGLCZDp2VfTka7nUhUrdjKNhF+nHRslEd2U1Q8vSwvxjOFZ/XgzhDVIuaV QTmnziW0W+SktV0hEzfqfiXOtRZOj9g7OJI2vab+b9d8ElA8mgZLlLEUcw11rU5LttCk hOfA== 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=VORZbtDnmX5akyGH5x5DvLpBxQCGq11UmQQJLrAo5YE=; b=RBr0YhCAS9hDNk+GOZhGQDBJ0uZ+449xa6JX2snRC0fGtqg9cHhr+c2mzfCAVDTnal b+/nKV/q1M2fV1NmxTH3xrKQtS8eG36bHwD2YVzsqRgVh3FQkSNk0GX67X/exMPBJ8SS J80kZ6MMcLroNOMX2c3g/ts1D5hLO1MOJcXEkbZCfl7tsVoqzuk7zHHi0ShXgrECxblt jOIQnA+EX2YE61NhKvpoy6B0ZIZnF3Td3xRM2QYBUQRFQSVl+hGvohFCEw3WvOiJ0HMK r4cw9YFXy6d5aFee1kpkGYDbxutNpbQUpEtEsIYsQKpjJUU4UY/Vb7S9Cx+6lXZUEuDl 2c6Q== X-Gm-Message-State: AIVw113AHsVanStfM7bXBT/W+ka96ZvTGZ3ltgnwkXwuXNg66K3QchRS 6v6znegD47bMtYdubx4= X-Received: by 10.36.49.7 with SMTP id y7mr213702ity.72.1501569241681; Mon, 31 Jul 2017 23:34:01 -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 186sm13887294iow.44.2017.07.31.23.34.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Jul 2017 23:34:00 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2017 01:33:51 -0500 Message-Id: <1501569234-29896-4-git-send-email-rodger.combs@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1501569234-29896-1-git-send-email-rodger.combs@gmail.com> References: <1501569234-29896-1-git-send-email-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/7] lavf/segment: write attached pictures to all segments by default 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 | 4 ++++ libavformat/segment.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 23ef2e7..93147e1 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1576,6 +1576,10 @@ argument must be a time duration specification, and defaults to 0. If enabled, write an empty segment if there are no packets during the period a segment would usually span. Otherwise, the segment will be filled with the next packet written. Defaults to @code{0}. + +@item dup_attached_pics @var{1|0} +If enabled, attached-picture packets will be written to all segments, rather +than only the first. Defaults to @code{1}. @end table @subsection Examples diff --git a/libavformat/segment.c b/libavformat/segment.c index ef0a915..8e82030 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -119,6 +119,7 @@ typedef struct SegmentContext { int reference_stream_index; int break_non_keyframes; int write_empty; + int dup_attached_pics; int use_rename; char temp_list_filename[1024]; @@ -126,6 +127,8 @@ typedef struct SegmentContext { SegmentListEntry cur_entry; SegmentListEntry *segment_list_entries; SegmentListEntry *segment_list_entries_end; + + AVPacket *attached_pics; } SegmentContext; static void print_csv_escaped_str(AVIOContext *ctx, const char *str) @@ -301,6 +304,7 @@ static int segment_start(AVFormatContext *s, int write_header) av_opt_set(oc->priv_data, "mpegts_flags", "+resend_headers", 0); if (write_header) { + int i; AVDictionary *options = NULL; av_dict_copy(&options, seg->format_options, 0); av_dict_set(&options, "fflags", "-autobsf", 0); @@ -308,6 +312,13 @@ static int segment_start(AVFormatContext *s, int write_header) av_dict_free(&options); if (err < 0) return err; + for (i = 0; i < s->nb_streams; i++) { + if (seg->dup_attached_pics && + s->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC && + seg->attached_pics[i].data) { + av_write_frame(oc, &seg->attached_pics[i]); + } + } } seg->segment_frame_count = 0; @@ -680,6 +691,12 @@ static void seg_free(AVFormatContext *s) ff_format_io_close(seg->avf, &seg->list_pb); avformat_free_context(seg->avf); seg->avf = NULL; + if (seg->attached_pics) { + int i; + for (i = 0; i < s->nb_streams; i++) + av_packet_unref(&seg->attached_pics[i]); + av_freep(&seg->attached_pics); + } } static int seg_init(AVFormatContext *s) @@ -840,6 +857,9 @@ static int seg_init(AVFormatContext *s) avpriv_set_pts_info(outer_st, inner_st->pts_wrap_bits, inner_st->time_base.num, inner_st->time_base.den); } + if (seg->dup_attached_pics && !(seg->attached_pics = av_calloc(s->nb_streams, sizeof(AVPacket)))) + return AVERROR(ENOMEM); + if (oc->avoid_negative_ts > 0 && s->avoid_negative_ts < 0) s->avoid_negative_ts = 1; @@ -905,6 +925,9 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) if (!seg->avf || !seg->avf->pb) return AVERROR(EINVAL); + if (seg->dup_attached_pics && st->disposition & AV_DISPOSITION_ATTACHED_PIC) + av_copy_packet(&seg->attached_pics[pkt->stream_index], pkt); + calc_times: if (seg->times) { end_pts = seg->segment_count < seg->nb_times ? @@ -1111,6 +1134,7 @@ static const AVOption options[] = { { "reset_timestamps", "reset timestamps at the begin of each segment", OFFSET(reset_timestamps), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E }, { "initial_offset", "set initial timestamp offset", OFFSET(initial_offset), AV_OPT_TYPE_DURATION, {.i64 = 0}, -INT64_MAX, INT64_MAX, E }, { "write_empty_segments", "allow writing empty 'filler' segments", OFFSET(write_empty), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, E }, + { "dup_attached_pics", "write attached pictures to all segments", OFFSET(dup_attached_pics), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, E }, { NULL }, };