From patchwork Wed Aug 2 06:30:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 4589 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp881299vsu; Wed, 2 Aug 2017 00:17:59 -0700 (PDT) X-Received: by 10.28.107.69 with SMTP id g66mr2874621wmc.119.1501658279010; Wed, 02 Aug 2017 00:17:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501658278; cv=none; d=google.com; s=arc-20160816; b=X9MnMnt+Sq1fz4+dUHt2RxfYmcO8XyxVVazqnflpGoqhpBP46vv7U5apX1Cvbud1c8 175KhfMt2UpmdqMxwsAf0TaHI7BZGHDIfbDveu2NFZI3OAWEluPfC0oySMzgVvjuRIAg Lcfgq/5hw3jam0tSqEFrsC4JnIgy8cXK/VWwUhEOZ7aZyH6zPmobOnmxaGG6xOrV4pfX NPf5VNDugyshm1hUIGQjDE4+3al8v3ZhRclCkHWbGC5BULlqrkxg9YNCKLXUMgHu8m0I 3TEn86V8nmwkMX9Sg1MDPXHKwR319/913kuywy30+B5bAN5cwbXWc+HHRyB9H+kFokoX EG1w== 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=ehommS1pq1DcM4CuiarxAoJoi1k3RFDun0hJGBepsQk=; b=MmcZcCki95vr6cWatUK4osmQzgbUdB+IZ766+P7mU9BPxFN0aCFsifFZ2IqZ7zj6M9 rAIW3op588VVn11kNBtp2XZ1ULpYXSqY/Dck60srYx0n5ymOJ+CErbeVjcWBOsvLzH/3 lw+OAZaDNgMbWg3JbBIcuAYR+KjkK/V9XgVRBzp/FLnNaikGR+jH7z/NVASZv2sy+20e i1KtmC+R+3b8ZV3Vc70mfajnvv8TUL7UksB/dKXVyG3pyG8Js4TVugs9g2VWY0ip/kvG M1ZUCRsn2suDkNUnL6ssBafBmXpuLwBmsFj2G9XCs436ap5Bblx4VexNsO1bsF0OiyYy kcPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=u72yx5Lp; 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 s4si535978wrc.116.2017.08.02.00.17.58; Wed, 02 Aug 2017 00:17:58 -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.b=u72yx5Lp; 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 4CCD668A47D; Wed, 2 Aug 2017 10:17:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEFCD68A454 for ; Wed, 2 Aug 2017 10:17:21 +0300 (EEST) Received: by mail-it0-f68.google.com with SMTP id t78so3277555ita.1 for ; Wed, 02 Aug 2017 00:17:24 -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=va0pia/ovdn9AU0NoE3ThS8hFXSux+rmZB3LybSSdCk=; b=u72yx5Lp/Y1lqPj8AIm0uwlYbV/60O6igilUE65Rhf7eRfseD5eSoxoyGG70qmzBMO TkECvEH7+U89e2iengkHMEIyr5LY8UAQzfQIdfrsNLeNxK2ThNcGHE7QlXhaxi8d3geu f8Ri6BOKEQRqr+gidMgSKoi/1KqSHOJrkGl8PwA9onyddgJnOOlV31zwz7TPlMCBw1kP rqY9wEzxDWEHKG+cHi8YX2O5QSadXGrCXTU23N27msZhUkdWnvySkDFe9hpWaF94cfUh V+t61leoPalVMTZonbZLDOrF5AmxHsRYmB/cDwYjQojEY8xo5pHQt0G2Sg9UhQrqATPg uE4g== 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=va0pia/ovdn9AU0NoE3ThS8hFXSux+rmZB3LybSSdCk=; b=f/aCxRPA0tXrKmCcfx42aZVLIExjVEJx7Gh17YPZDNgYdT2Sc0ZYsd/bcX0DKc83Ry m2WAP/S5p+EiwFCXiW1U0k9WuBs4MR8HAj887ISybTF3hCu+CiBANTm9l0H+rNKAbAvM uyGmaiAvOrvDPKgiEqOcFoB9lH+yccYrxkJkqGUtS6e8YaBBM+fk4xKH2dHEZ4Pyjfr6 2G5ssvzdi5XsxSamwUjfXNioqhmh5quqOmeiV6fUJltEsbX37DO7SYyqKl2t+i6r8nW7 Gfxd5orySoSweu21MEdWfV/lYVQYZFnMHJhm9/CYb4vpXggJKo51fVtvrfbr0ZQTSBEe iSqQ== X-Gm-Message-State: AIVw112XuiUvCqDpXzuepmEqoIcaSAw/iGqRn0eRDdkZfmycw9ETS/BV 8FTnhuT0UqarfUJKyxA= X-Received: by 10.36.103.203 with SMTP id u194mr4680089itc.27.1501658243372; Wed, 02 Aug 2017 00:17:23 -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 196sm4382274iou.50.2017.08.02.00.17.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Aug 2017 00:17:22 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2017 01:30:42 -0500 Message-Id: <1501655445-18976-4-git-send-email-rodger.combs@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1501655445-18976-1-git-send-email-rodger.combs@gmail.com> References: <1501655445-18976-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 | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) 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..632476e 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) @@ -193,16 +196,15 @@ static int replace_variables(AVFormatContext *oc) { char name[sizeof(oc->filename)]; char *p = name; - char *out = oc->filename; + AVBPrint bprint; strncpy(name, oc->filename, sizeof(name)); + av_bprint_init_for_buffer(&bprint, oc->filename, sizeof(oc->filename)); while (*p) { char c = *p++; if (c == '$') { if (*p == '$') { - p++; - goto append; + av_bprint_chars(&bprint, c, 1); } else { - int len; const char *val; const AVDictionaryEntry *e; int end = strcspn(p, "$"); @@ -211,18 +213,13 @@ static int replace_variables(AVFormatContext *oc) 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); + av_bprint_append_data(&bprint, val, strlen(val)); p += end + 1; } } else { -append: - if (out - oc->filename < sizeof(oc->filename) - 1) - *out++ = c; + av_bprint_chars(&bprint, c, 1); } } - *out = '\0'; return 0; } @@ -301,6 +298,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 +306,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 +685,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 +851,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 +919,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 +1128,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 }, };