From patchwork Fri May 11 01:40:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 8916 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp130239jad; Thu, 10 May 2018 18:46:28 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrogLmQU+E583PBpIOpiob9kOEAdA5XcfzmG2WlZ46fFKAIGPw/4lI0EtIA19xCD/uab3zU X-Received: by 2002:a1c:da13:: with SMTP id r19-v6mr697927wmg.2.1526003188294; Thu, 10 May 2018 18:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526003188; cv=none; d=google.com; s=arc-20160816; b=tet14Vr6rANM2iGoy7PHNGNV9pg2UROHY6lZhVQOw97Oqv3hJxsgm0ULo1yONvpmra Bad8M3gxDk7lnnL6erQyO3vYShs1WF8X0DYzilIPneAy4nMJZYNc8OGvlG8gDY6Ur5j6 lT+GpAtqnU2WEHPta4j5AkZnVO5mGkIcTxizBsTcXscB51qIw47UTWSCat/vn5C+TqZB mQ78iVY3WQCvKNuFElwTDDc5LhwRSUxXlrgK9rNkR7GpMlGUSVHrE/RSYSg6jBvHO2YU 1kZ3hMP1quCuVpy45nEYdPlfRRqWUlmnORZL5SwOZ7zYOK2Hn4NZVIbJyoCcT8wPbfSD K2NQ== 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:cc: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=y/yaKKd+9egzP+un5T+lDNR5moCeZeSZtsu/jQgCzMk=; b=eFLN0I7wBu2/8UWqpTy+ffct3l3vxr42DHkPcwWaboYcs4LsKAEbzRjCBxnLdD5unp brUM+mzwpjVYuvCAympQ27QawdFV4brFyp6ccDftTAZGNZSOEDmUd8poOF+3xxYeZ1PG QnBnaPzhEkLu0oVedCxqitZ/Z9zfRN0YqVE7yxDZekxZtPPVwS/wt5/+MAa4wn54F1Zg xAUwFQ167S80qz7tD5WvnthzGDOwwONJKcWDN0o6APiRjghVTH+/ZYo6XfjzttxW4/RU B44ZV5I4OX/RX+aBWlDVTb+RG0QmXYPySJcleNgDA+KoTe4gT8ySVpWX3fuLssWnAQ/X XGew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aONHEBxU; 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=QUARANTINE 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 67-v6si1931087wrk.312.2018.05.10.18.46.27; Thu, 10 May 2018 18:46:28 -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=aONHEBxU; 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=QUARANTINE 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 4EAFE68A8FA; Fri, 11 May 2018 04:45:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A305268A30C for ; Fri, 11 May 2018 04:45:43 +0300 (EEST) Received: by mail-pf0-f196.google.com with SMTP id p12-v6so1923363pff.13 for ; Thu, 10 May 2018 18:46:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fn094tY0zRk+9mDJ3miB1JOTskMnIUW5T7HQHt8UcJA=; b=aONHEBxUOFp/SPwSlLLLVBAcUvEIt6oSNN9rr4BGJOUPZfexsOCu+pi4Ubu4NFrr9H DDuWAkWfoTG+PbeheaGfZPqWUw4YoTpFlPtBrGzhUWZTrfxWwIvOsslIHwyVlAaBUyOV AFp8oKN3q3C/vARgHOY8X8bu38cP6x8DVj3Cg2XjIpGhqZb2w0WCn2x5PrvAy4Grs7q/ +eXUaHyXHEHBrZtNXx/O/elDpegxtPCG97NcnFFoR1iqbs5lNCtohwReYZAaT5IJcE8q t5jXBM2ksrZBC+k/+B3v6gLYqQHkcNJrt2KVsRn2hHWcGSCa4gqEeKC/xEmbHD3yxCWn T0dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Fn094tY0zRk+9mDJ3miB1JOTskMnIUW5T7HQHt8UcJA=; b=E6mq0QUs9T4V3LCA3QhlcyH2SjBYah1GaBnHoLgZE+VMLFP4neePHDKfxrJiV9QDrM Az7vdWi5d/Xv+pFleHmCCefAYaPvKX89NDiwWR+TDXLmsmk5Qr0+CTy5VbdshqNIgas1 ps/VV5e9gk2gT/TCJRngaNM3ChnUqOFV/nauMn/ELDeKzeREJe8B2KHjMaRX9KV+YfA4 DqjOV6C7xPcsvnK4NF70sT7X18atg5VIexiHmBClfrmg90Wyjj2iZgbT6vQGy808pdjz Fkd7i5G+O7fvyO1uWpsYrLKio+kSQBTxCk7Y+PKeR6BDzw3IXtNelEfZ3R0njYrUefjy 1mhw== X-Gm-Message-State: ALKqPwezoieh3rtH7O04DM0sUQSIRUtBbYc2bgXs7cCvjLOTA1voCYjB J2mVB2ZzKwVy2OrXHGK7zJ7Hqsc5 X-Received: by 2002:a62:4353:: with SMTP id q80-v6mr3497078pfa.228.1526002841076; Thu, 10 May 2018 18:40:41 -0700 (PDT) Received: from localhost.localdomain ([136.25.129.14]) by smtp.gmail.com with ESMTPSA id v5-v6sm3149474pff.130.2018.05.10.18.40.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 May 2018 18:40:40 -0700 (PDT) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 May 2018 18:40:08 -0700 Message-Id: <20180511014008.1676-2-alex.converse@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511014008.1676-1-alex.converse@gmail.com> References: <20180503165021.2120-1-alex.converse@gmail.com> <20180511014008.1676-1-alex.converse@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] flvenc: Fix sequence header update timestamps 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: Alex Converse MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Alex Converse --- libavformat/flvenc.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 9b7cdfe7db..7aa2dbf9a6 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -485,7 +485,7 @@ static int unsupported_codec(AVFormatContext *s, return AVERROR(ENOSYS); } -static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par) { +static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, unsigned ts) { int64_t data_size; AVIOContext *pb = s->pb; FLVContext *flv = s->priv_data; @@ -497,8 +497,7 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par) { par->codec_type == AVMEDIA_TYPE_VIDEO ? FLV_TAG_TYPE_VIDEO : FLV_TAG_TYPE_AUDIO); avio_wb24(pb, 0); // size patched later - avio_wb24(pb, 0); // ts - avio_w8(pb, 0); // ts ext + put_timestamp(pb, ts); avio_wb24(pb, 0); // streamid pos = avio_tell(pb); if (par->codec_id == AV_CODEC_ID_AAC) { @@ -761,7 +760,7 @@ static int flv_write_header(AVFormatContext *s) } for (i = 0; i < s->nb_streams; i++) { - flv_write_codec_header(s, s->streams[i]->codecpar); + flv_write_codec_header(s, s->streams[i]->codecpar, 0); } flv->datastart_offset = avio_tell(pb); @@ -905,7 +904,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) } memcpy(par->extradata, side, side_size); par->extradata_size = side_size; - flv_write_codec_header(s, par); + flv_write_codec_header(s, par, (unsigned)pkt->dts); } }