From patchwork Fri Feb 23 17:33:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 7721 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp942300jai; Fri, 23 Feb 2018 09:46:19 -0800 (PST) X-Google-Smtp-Source: AH8x227MRgXM7hJMHY0Xcs9nWLvUSiJTtZNRcH6jgaeKPeIIBOaRkis1yVVJlKeXJQlmCh+ddk40 X-Received: by 10.223.199.148 with SMTP id l20mr2214167wrg.117.1519407978968; Fri, 23 Feb 2018 09:46:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519407978; cv=none; d=google.com; s=arc-20160816; b=CJ7EQKHY2rhASAJzqWXmDo5yRiNLKSTgPVy94sOrsMBwJBmnC8rmN0ytQ+IdmJpqaK oaPOpl3FNy/U1TAmWbzhgbcavuYl6t0Abyhh7KqCCOzc6DS3PRPWRWltqYT2hqeGHWEZ 0DagVzCHpElTjlrcyQ6Kyd3TL+qH4y6LbnpLU36D+hINaJcUUa8vJg3QBqWMu3FUpWAZ BJJI1PSSZDAbJzBVpcqDohe3VLQROsRazhP5ihojxWY+/ucPbU/9lTtLRD9rssWvMDuG qbWpW9e2n+iR1k1aWmBB/kcxYsLE4WTbVp4cArKsCkclPpfH/CRLOyJXLFF1gedvWvqb /t5A== 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: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=NGIG9w9TOwnup0QIYbq4P7+ZLX886wMFpsnZL6dqftM=; b=e1mKN6NOxO+h9XqVmWr7Y4xOkAjVDJ7ne/YrxELGHKbR3+i+QZHQZQAmvc2Hnth2w5 DXbllNgeliXWPkXyO1JXI5bvAYW+yf5IDRf15crDhgwHh1a6nBSR6MTQwS7PYZ3sL8e5 OzgBhfUQWuwS0I5+DPVC4W/PkcGaIXSDNnUODGjR9W1lCUpq+dL2TEqPYes7tgSaRNGb JDWJpdqhqUJHRBfXKlDNB9L+FgfFUMAxli2u0SDFHH38LMNaH1ICnXrj+XK6xjNrJSNx iP6Tz+lXnLVCfXN+O6oVtv8JHsna5w44MspQBYKCnOGzwXDEzg6/eItIufeofSH5Lv9u 2SXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=hs5gf1NO; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p30si1656424wmi.85.2018.02.23.09.46.16; Fri, 23 Feb 2018 09:46:18 -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=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=hs5gf1NO; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E769568A687; Fri, 23 Feb 2018 19:46:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBCBA68A62D for ; Fri, 23 Feb 2018 19:46:04 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id m5so14931568wrg.1 for ; Fri, 23 Feb 2018 09:46:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=1VOC1zEHuu5geNiuKMzDhvOB810Ro/24ji6086F6ePI=; b=hs5gf1NOhHqOldLSdXyEt+1YTQNgvU44isbEKWLotghJxLyzFia7puzPfv+wmBc2D6 SNyViqWQzNCaYeScQJFEMcMAErxQ9AKeVqa4QXzOtXc2Ak8SQI1DPqyYomlCoL2w5OLX wwfhOqXTgm53Z0+4p4XPzbTx12ho/BuYOJ33KSfvkTYno2AhMfM/h88IDyV68FyTrfLc iFcSTZRLETcxq/lh6KjBDBaE0Vh2zzQ+jTYqcjzc8NnpAeDnwtII/GLddxCrzyQYjg44 hvT5ndnnS8tHIxuM1STf7/HD1VeYwrjoyulrq3YOAzfTOpyowGYm6gbgla1T8JTCpDiX otGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=1VOC1zEHuu5geNiuKMzDhvOB810Ro/24ji6086F6ePI=; b=O8Zh86hixGf9KuQgw8AyIsXedmW6Pe357SOvzepNDyfubMSuWhuHmU8u1N4R4BXeg/ oJzANXtcrbJBWOeVgozC5spkeyXqAEbU8q0RWA09xdLTIRf7ChrrPWUqIzE8CKCYcjHW 2D5NnC6Aa9ohIpXjJqOdxeWdD3e52UNMTw1zMXPsMJB3tXE+ap7CPbEniJigbyWY0K57 +8z3TMw/pkLGBhrxvG5RGk35AHxi2vJ2WHN8HSO2OAW4XEutRy3BGFD0yGBcjCUhaxmK H3qhUQPDERSFOxZA12xFRSuFu1fAz2o7kO5L7ESt4UELmXEgdPniwGExBU/ZerPueHm3 SwIw== X-Gm-Message-State: APf1xPAIsPY77067ELCkplqXGjCkvOiv5vD+UV+7PzQOOGrTnSJLo9FV 2+sTPTdtQzoHtZ7FQ7A95FHQQ8cC X-Received: by 10.223.164.153 with SMTP id g25mr2526616wrb.79.1519407967120; Fri, 23 Feb 2018 09:46:07 -0800 (PST) Received: from Ifrit.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id 204sm2593659wmx.0.2018.02.23.09.46.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Feb 2018 09:46:06 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2018 18:33:44 +0100 Message-Id: <20180223173345.2105-2-jdarnley@obe.tv> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180223173345.2105-1-jdarnley@obe.tv> References: <20180223173345.2105-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/vc2enc: do not write an End Sequence after the first field of field-separated pictures 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" A lax or tolerant decoder may support an End Sequence between fields of the same frame but the spec. says this is not allowed. 2012 spec. 10.3.2, 2017 spec. 10.4.3: Where pictures are fields, a sequence shall comprise a whole number of frames (i.e., an even number of fields) and shall begin and end with a whole frame/field-pair. --- libavcodec/vc2enc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index b7adcd3d36..9a5a4765c8 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -988,7 +988,13 @@ static int encode_frame(VC2EncContext *s, AVPacket *avpkt, const AVFrame *frame, encode_slices(s); /* End sequence */ - encode_parse_info(s, DIRAC_PCODE_END_SEQ); + /* 2012 spec. 10.3.2, 2017 spec. 10.4.3: + * Where pictures are fields, a sequence shall comprise a whole number of + * frames (i.e., an even number of fields) and shall begin and end with a + * whole frame/field-pair. */ + if (field != 1) { + encode_parse_info(s, DIRAC_PCODE_END_SEQ); + } return 0; }