From patchwork Mon May 8 04:36:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 3604 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp682945vsd; Sun, 7 May 2017 21:36:57 -0700 (PDT) X-Received: by 10.223.136.131 with SMTP id f3mr41554171wrf.70.1494218217693; Sun, 07 May 2017 21:36:57 -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 135si12650402wmu.48.2017.05.07.21.36.57; Sun, 07 May 2017 21:36:57 -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 944506882B0; Mon, 8 May 2017 07:36:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f181.google.com (mail-qt0-f181.google.com [209.85.216.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A2106800B4 for ; Mon, 8 May 2017 07:36:25 +0300 (EEST) Received: by mail-qt0-f181.google.com with SMTP id j29so41168132qtj.1 for ; Sun, 07 May 2017 21:36:31 -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=6vkp5XPHsV2k0dVD6SQuVxMLiizXJi8KS5QTwIwKSt8=; b=EIkBFO+nxgdqL4gXE6MwDDH1fCCAPzhj4WhR2i5uv6Xb16SWpgi3uF4nt1fggMW8yE saXzVMFOV7GUWs1BYR7Zz8IXPAgr9UNO4kwypdcnmWS8t4qyDFanncVf4ud0it7wozjK I5DPkoa9Sact6KqjbIidR8jfC3ylPSov2Top3QOqt8b5uhUGsvRWk6uETsy6nro155ML 0Q3AgOjm2Zo/XzmpvH09TWaxU+nCTo3hgFB9XF5NieZiBseKMfBJu0yXT+Cmt/Yywcr+ YR04nrcJjI50jur5DP42QUcGf9HtIyHycPf416btiRHQyoT7sZ/4VKZ7JLCjRaukbq87 lNCg== 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=6vkp5XPHsV2k0dVD6SQuVxMLiizXJi8KS5QTwIwKSt8=; b=BLtdXFrgjkKQWtR8lEYcnoHrdaKmuYHqz9wSsjyjeGl4esVGJuTjSMJA7ENFvyzIEK 1l/c8aBLHmLDt997a1EGTggNXBefFhAa9xifpqNVk1Wo8F0FUjehLkBVfUni1L3WC1aM I8LEZhWHqmbYdIQmiVsrNGmxgBsLq0fiudEqpQrR2z7X1LvIdWrqHCan+3k2MB7BhYxd lDGF1zqpn2Wv4Y/B01+8Trc05mhxpxeQJ8glqINAe0aZB3zXoeSPIRC5SfnfW9fGAyUp 5TckxOHCeIiE8+W08d85JLEIP2mks1YLDOHj5dRcyjOGU4P9uTjURANVsDaZ9yfNqtqY CSCg== X-Gm-Message-State: AODbwcBvb+hpSbYKixvSu9z8iEzugCAQYtvS3gntemE2poGHBGXHpceh Xwc4EFVUxSyM5yo1Mgs= X-Received: by 10.200.37.227 with SMTP id f32mr15652222qtf.221.1494218190225; Sun, 07 May 2017 21:36:30 -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.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 May 2017 21:36:29 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 May 2017 23:36:21 -0500 Message-Id: <1494218184-17850-4-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 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 ++++++++++++++++++++++++ libavformat/version.h | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index b80bc68..3707d05 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1559,6 +1559,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 9c6ce73..0b9089c 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -121,6 +121,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]; @@ -128,6 +129,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) @@ -303,6 +306,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); @@ -310,6 +314,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; @@ -682,6 +693,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) @@ -842,6 +859,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; @@ -907,6 +927,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 ? @@ -1113,6 +1136,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 }, }; diff --git a/libavformat/version.h b/libavformat/version.h index 645a226..910e348 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 101 +#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \