From patchwork Sun Feb 12 18:12:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Miroslav_Sluge=C5=88?= X-Patchwork-Id: 2521 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp570375vsb; Sun, 12 Feb 2017 10:12:44 -0800 (PST) X-Received: by 10.28.224.213 with SMTP id x204mr14637772wmg.82.1486923164167; Sun, 12 Feb 2017 10:12:44 -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 z139si2325040wmc.8.2017.02.12.10.12.43; Sun, 12 Feb 2017 10:12:44 -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=@email.cz; dkim=neutral (body hash did not verify) header.i=@email.cz; 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=email.cz Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2151689DC2; Sun, 12 Feb 2017 20:12:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mxf2.seznam.cz (mxf2.seznam.cz [77.75.76.123]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21F026897ED for ; Sun, 12 Feb 2017 20:12:29 +0200 (EET) Received: from email.seznam.cz by email-smtpc12a.ng.seznam.cz (email-smtpc12a.ng.seznam.cz [10.23.11.105]) id 1c2c64b028fb7cac1cbe4dbd; Sun, 12 Feb 2017 19:12:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=email.cz; s=beta; t=1486923153; bh=yczkOPXAZSnyyFc5IjT0jK5qamx1Sm93/RDLtNTd1Es=; h=DKIM-Signature:Received:From:Subject:To:Message-ID:Date: User-Agent:MIME-Version:Content-Type; b=Gf/4U2YOd29n1u/9omspNw83WYdvqsKuow8sc5AGtg0IQCrHqSZSlZRe0p1NH28Nf RRfA4/oP1I6RTVrw0zZpI45pBkWKH7u3T/x7znHjDokmE830EXzS+uniwT604eKuTC vcVDFTi5YN2OxCZQMwcowiJWeQCHnOzzvfobiuNk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=email.cz; s=beta; t=1486923153; bh=yczkOPXAZSnyyFc5IjT0jK5qamx1Sm93/RDLtNTd1Es=; h=Received:From:Subject:To:Message-ID:Date:User-Agent:MIME-Version: Content-Type; b=WR4unCKmxktdQN7qcgInVKIXIz8AXcaiTa8Hww9VZ6ZMECeIVQeXD08g5sJJ4jXDf BV+cQazQbS8QTFqdd17v+RQeC+VA7Fk3cMiM1pct0YigSuTl68ckULKEs8ERIfOcuf n6OEiFucrwM/mJzsoJm+YWtbdTo9K1qjykd+GbZ8= Received: from [192.168.0.6] (ip-94-113-140-7.net.upcbroadband.cz [94.113.140.7]) by email-relay3.ng.seznam.cz (Seznam SMTPD 1.3.56) with ESMTP; Sun, 12 Feb 2017 19:12:32 +0100 (CET) From: =?UTF-8?Q?Miroslav_Sluge=c5=88?= To: ffmpeg-devel@ffmpeg.org Message-ID: <58A0A58F.5030403@email.cz> Date: Sun, 12 Feb 2017 19:12:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: add new forced_keyframes option -hls:time 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" If we are using copyts parameter it is not possible to inserting key frames same way as hlsenc requests, this will lead to different hls segments length. -copyts is required for long period audio/video sync Small modification to hlsenc.c is also required and will arrive in next patch. From 90d0636ea6cd34c9b51e4b568bb9e8aa461fa615 Mon Sep 17 00:00:00 2001 From: Miroslav Slugen Date: Sun, 12 Feb 2017 19:08:27 +0100 Subject: [PATCH 1/1] ffmpeg: add new forced_keyframes option -hls:time for inserting keyframes exactly athlsenc position compatible with copyts --- ffmpeg.c | 19 +++++++++++++++++++ ffmpeg.h | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index 06570c0..6ba5771 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1237,6 +1237,20 @@ static void do_video_out(OutputFile *of, } ost->forced_keyframes_expr_const_values[FKF_N] += 1; + } else if (ost->forced_keyframes_hls_interval) { + if (in_picture->pts != AV_NOPTS_VALUE) { + int64_t pts_out = av_rescale_q(in_picture->pts, enc->time_base, ost->st->time_base); + + if (ost->forced_keyframes_hls_start_pts == AV_NOPTS_VALUE) { + ost->forced_keyframes_hls_start_pts = pts_out; + } + + if (av_compare_ts(pts_out - ost->forced_keyframes_hls_start_pts, ost->st->time_base, ost->forced_keyframes_hls_end_pts, AV_TIME_BASE_Q) >= 0) { + ost->forced_keyframes_hls_number++; + ost->forced_keyframes_hls_end_pts+= ost->forced_keyframes_hls_interval; + forced_keyframe = 1; + } + } } else if ( ost->forced_keyframes && !strncmp(ost->forced_keyframes, "source", 6) && in_picture->key_frame==1) { @@ -3224,6 +3238,11 @@ static int init_output_stream_encode(OutputStream *ost) ost->forced_keyframes_expr_const_values[FKF_N_FORCED] = 0; ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_N] = NAN; ost->forced_keyframes_expr_const_values[FKF_PREV_FORCED_T] = NAN; + } else if (!strncmp(ost->forced_keyframes, "hls:", 4)) { + ost->forced_keyframes_hls_interval = atof(ost->forced_keyframes+4) * AV_TIME_BASE; + ost->forced_keyframes_hls_number = 1; + ost->forced_keyframes_hls_start_pts = AV_NOPTS_VALUE; + ost->forced_keyframes_hls_end_pts = ost->forced_keyframes_hls_interval; // Don't parse the 'forced_keyframes' in case of 'keep-source-keyframes', // parse it only for static kf timings diff --git a/ffmpeg.h b/ffmpeg.h index 458bb8a..85a8f18 100644 --- a/ffmpeg.h +++ b/ffmpeg.h @@ -478,6 +478,10 @@ typedef struct OutputStream { char *forced_keyframes; AVExpr *forced_keyframes_pexpr; double forced_keyframes_expr_const_values[FKF_NB]; + int forced_keyframes_hls_interval; + int64_t forced_keyframes_hls_number; + int64_t forced_keyframes_hls_start_pts; + int64_t forced_keyframes_hls_end_pts; /* audio only */ int *audio_channels_map; /* list of the channels id to pick from the source stream */ -- 2.1.4