From patchwork Tue Aug 2 13:24:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sebechlebskyjan@gmail.com X-Patchwork-Id: 57 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp211675vsd; Tue, 2 Aug 2016 06:24:53 -0700 (PDT) X-Received: by 10.28.197.1 with SMTP id v1mr55991718wmf.8.1470144293161; Tue, 02 Aug 2016 06:24:53 -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 g125si3172762wmf.133.2016.08.02.06.24.52; Tue, 02 Aug 2016 06:24:53 -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 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 CE730689F39; Tue, 2 Aug 2016 16:24:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9A836689BE4 for ; Tue, 2 Aug 2016 16:24:35 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id i5so30797596wmg.2 for ; Tue, 02 Aug 2016 06:24:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kx2Q2ZSWGzzZbGYfJ1MFRFH/O+laG8v775m02Qirz+g=; b=sDs/IyEio9zoY+odzAVkuZCzppcTuVA2IZ/v9VMIqaY9ZWpQbIm4DOVglvbGyFtlRi +JT689AhO4igIaYpOQK5NrdSvQzpwuPIh5tdfBKjqhOGgExqIH4PI9vEFWMpT2S1i2SJ HvRehnUKYKo3Fvc/dkytPrFVsQCbZfhNO+/I+IrXtvWqHC0oTmkiY7a5gqi7VxO0bHfY Nk5bNX2Jf4ZNHZkdCCI3u84nGeucdpdHcSZnuHkIHeq1Tt7c0wbgEI6DVchfCdE1DFVk rTgtbDlLwb8/8mPH45H8q1863ahw5LcmLTEccK3N+w3PGMtg2R2a/d7oGuqC5tCxw9vP u+Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kx2Q2ZSWGzzZbGYfJ1MFRFH/O+laG8v775m02Qirz+g=; b=UXzpL/qgsxh0DHSQQ9dCf7UkOBUUSr1amAUUyWtm9R74YiHCygWDeWCkh5MAJE+9On A1RkeDC/LyFoLFLPd4pAK+JksXNBDcb7diSwMh7nOW/4SiLL9XPMu6JpkAB39Y3tHy+6 VuYFP+ngQRPOWIurt57qVXuF2M9NFDbit2tdaRTZq5gZ5BVdYrfv8hxknOa9mCJR6qiL fRzlT4b8JUQEYz8mAshteJIUMT2ujJiy9Lea5WfjclcvJwPDG0QVCcFc+TN8IGh4p3eg 4TNqm/nE2wlrAncc2myUTukD0MVeNR0GG92stldaR2gf0NWMXKX4C/sMoQo/I0tWKeUw o4BA== X-Gm-Message-State: AEkoouusOqPjzKFN1aSGu72J+/PPPVCbUjjTrUlj63SBSusAuePpvE9QZmvqIH4ncCrvmg== X-Received: by 10.194.127.163 with SMTP id nh3mr56043730wjb.74.1470144281391; Tue, 02 Aug 2016 06:24:41 -0700 (PDT) Received: from localhost.localdomain (157.174.broadband3.iol.cz. [85.70.174.157]) by smtp.gmail.com with ESMTPSA id n131sm22060902wmd.3.2016.08.02.06.24.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Aug 2016 06:24:40 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Aug 2016 15:24:20 +0200 Message-Id: <1470144262-13167-10-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470144262-13167-1-git-send-email-sebechlebskyjan@gmail.com> References: <1470144262-13167-1-git-send-email-sebechlebskyjan@gmail.com> Subject: [FFmpeg-devel] [PATCH 09/11] avformat/mux: Restore stream ts in av_write_packet on EAGAIN 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 Cc: Jan Sebechlebsky MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jan Sebechlebsky compute_muxer_pkt_fields() stores the last seen timestamps in stream and produces error if the same timestamp is presented again. This is a problem if muxer works in non-blocking mode and calls av_write_packet repeatedly with the same packet. This patch saves stream fields affected by compute_muxer_pkt_fields and restores them in case AVERROR(EAGAIN) is returned from write_packet, and muxer has AVFMT_FLAG_NONBLOCK flag set. Signed-off-by: Jan Sebechlebsky --- libavformat/mux.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index ef4720a..fdf3fd1 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -880,6 +880,9 @@ static int do_packet_auto_bsf(AVFormatContext *s, AVPacket *pkt) { int av_write_frame(AVFormatContext *s, AVPacket *pkt) { int ret; +#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX + int64_t st_cur_dts_backup, st_priv_pts_val_backup; +#endif ret = prepare_input_packet(s, pkt); if (ret < 0) @@ -907,6 +910,9 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) return ret; #if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX + st_cur_dts_backup = s->streams[pkt->stream_index]->cur_dts; + st_priv_pts_val_backup = s->streams[pkt->stream_index]->priv_pts->val; + ret = compute_muxer_pkt_fields(s, s->streams[pkt->stream_index], pkt); if (ret < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) @@ -914,7 +920,13 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) #endif ret = write_packet(s, pkt); - if (ret >= 0 && s->pb && s->pb->error < 0) + if (s->flags & AVFMT_FLAG_NONBLOCK && ret == AVERROR(EAGAIN)) { +#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX + s->streams[pkt->stream_index]->cur_dts = st_cur_dts_backup; + s->streams[pkt->stream_index]->priv_pts->val = st_priv_pts_val_backup; +#endif + return ret; + } else if (ret >= 0 && s->pb && s->pb->error < 0) ret = s->pb->error; if (ret >= 0)