From patchwork Thu May 3 16:50:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 8765 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp2013711jad; Thu, 3 May 2018 09:57:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqtIFw4tCcQF9hoaJkFMO4S2HdJ/uLVgJftj8xv7x7txqMGKPnJ9/caAEtdiTs7w+KEInhI X-Received: by 10.28.125.74 with SMTP id y71mr14936355wmc.89.1525366653562; Thu, 03 May 2018 09:57:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525366653; cv=none; d=google.com; s=arc-20160816; b=06TucXBIhGRsnPryB6wHiYkKsaX63+M5GlAffYyJxZ/X6leZhEnX2sRrUJCnq/D14m giMmhvBj6EqlkRYOqW2gNyZrwADRHMvJhAX8YssBcH1443KpOFsZsb4Se2Eg03re6Fu3 xbPIKLnw9zIDrV+v0fWrLHA6oxWAhZDedgA/avV39LjhC0av2MUoCSr7YouFI5Xn4+vR fN32bsXWuXPdC0c9QN1PId9Q36vqk+7PhbrVsoJ4S7Xoe/yqKxH7xof2qF3FgRNsXATv k+oKPSuZy5/tw8mAm11Mu6xZTQGjfAef+WpIoivFgBoRCflnUu4S08+xRwAbwTvuM+/i 26Pw== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=pFuRBnIzTCqXXbfV6J2Igr+HStDxGeJ6rB6fuMHAHwg=; b=iUPRo+kJ9C/JX0T4OuHo8B9ZIHZ1rE1NwIW8/uXHdlEumZ3bOvkV6C4MSoIlAMRPR1 fQBXV4fPdlOz4/+TtVqpSzXJEziXFsbzoZpir8HroNgktx5z4RdiYdL3m0Gbwbp6MnI/ hZYclp5PJNd9D+RGd2wIU6oWU3ct10IyQ40Bv29nCnZ7pObDkwAt8RrOHytSXNl9i7G0 yQhOg0H7lnYdhzLDJEEY8OsxHuhsKodsQXCIZ7ftOlk8Jr821klii7PtL+WH/4P4hC6O pNjvRK3lSmgzC80dHxxPS6EUKJKkqhsIljtJ+a3XlqzqCeprTNRlLxVis2FyE56Bgwpo zAfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=az4f0pj/; 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 q10-v6si5347827wrn.453.2018.05.03.09.57.33; Thu, 03 May 2018 09:57:33 -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=az4f0pj/; 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 7B8AA68A475; Thu, 3 May 2018 19:56:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B281268A342 for ; Thu, 3 May 2018 19:56:51 +0300 (EEST) Received: by mail-pf0-f178.google.com with SMTP id e9so11198609pfi.4 for ; Thu, 03 May 2018 09:57:25 -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; bh=pHhBvuQNfjBAWCFnn/qOBUJD8MuCLrc7t17m3WNh74U=; b=az4f0pj/43NhjyK7J/lv2vOQJqgarFvp9l0y0lyECGmF76CWzlIcR6iRWRe/GGmoxq I3sfREhnQtkcbi8YLfWXS0ofOG3X4tyefbij0OooIQJQ/Dk/0O8WtGbru3wWWUR+95ef 4JLfHluK5+BSqbJXpKWUhm0m398Mb4siE1hzr2kRLcoZStpIUh0+fv1t37lZrjTyO8yJ IKNje8vaak766lbZa41vpME8kHBB1uR7RiFMLcEKnpvp1RZWM0u2hlfElpSPMFovGT3G 8GqimHCL1Kcng/kUGc/cVRkA2fFnsJdrsiKVda/sIbhB4xZm67/RA95rYB0zqg6Bh9hl 5fYQ== 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; bh=pHhBvuQNfjBAWCFnn/qOBUJD8MuCLrc7t17m3WNh74U=; b=KknM2pJiW+aLAGlS9KQC0Ezb7Uc4ZCeVtqmqXpmf7eS87R8JSr90OrbyoGj3isC80o yJ0+I4buQjuniDkuoS6l/CfCaVO23L5I28jnoY19lg6YfYrVAfqDAFcJn07d9w2E55Th KeRWT2GCGQcfRfj06bDUkN4ozI7BizlYIJX6syPvROwxkRypXaYUWSjXRIqXB6S1TGpN iag9swGAAtVLUBOosRKEJ6QwDZzFFjMIzXhAWj1mpCTlyT4B8CmxSJ/ecMJhanpWkkph Z3QLu1syLJJfifL2PI/G8cKZa5ybZJJwn/SEw+a4cN1ODsaR2GxphjGcOE3z1z7UDp9v HtqQ== X-Gm-Message-State: ALQs6tCd9TfhfCNVUs5ziGy0efFUR7HE+xXRSVdYSv96wOFrJzNJ3qwl INapsil2UOcGoTRoyPgJoUo6trm3 X-Received: by 2002:a63:6a04:: with SMTP id f4-v6mr19960823pgc.225.1525366248752; Thu, 03 May 2018 09:50:48 -0700 (PDT) Received: from localhost.localdomain ([136.25.129.14]) by smtp.gmail.com with ESMTPSA id v14sm9201657pfn.105.2018.05.03.09.50.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 09:50:48 -0700 (PDT) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 May 2018 09:50:21 -0700 Message-Id: <20180503165021.2120-1-alex.converse@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index e8af48cb64..827d798a61 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -480,7 +480,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 int ts) { int64_t data_size; AVIOContext *pb = s->pb; FLVContext *flv = s->priv_data; @@ -492,8 +492,8 @@ 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 + avio_wb24(pb, ts & 0xFFFFFF); + avio_w8(pb, (ts >> 24) & 0x7F); avio_wb24(pb, 0); // streamid pos = avio_tell(pb); if (par->codec_id == AV_CODEC_ID_AAC) { @@ -756,7 +756,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); @@ -900,7 +900,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, pkt->dts); } }