From patchwork Mon Nov 5 00:10:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10922 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7C5F744C5DE for ; Mon, 5 Nov 2018 02:16:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA06C68A748; Mon, 5 Nov 2018 02:16:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51D7168A3E8 for ; Mon, 5 Nov 2018 02:16:12 +0200 (EET) Received: by mail-wr1-f51.google.com with SMTP id r10-v6so7564875wrv.6 for ; Sun, 04 Nov 2018 16:16:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7u6Zdq58VbCH/lchMzDVToBYOhen0eodKVOJkO1ZVzg=; b=ko+tXir4BBG/jnGV27Mv7r1WvzYvghjpEgzjLby+41QNg41hbbVp9VdJlyZWRRg1jy kSNMLtuA1Ln6lJ+3XywB/U8T/W+LClhCIMS5Hgss3pENHsrALByid5lUZwe2qArCmCw6 /Fb+GdVtcIi8lfqncEAQyy3UpOWe+vYgtuJDQVhgbnPY4lNe7mzbSA0QdilzBb31B7Fc GUvzI8NK/OOwoO46DQIWe/Xtt6OZb9vtAkmFh35bDhUYOt6nOVSoRpnH3+s8BhoJz+6Q iK2kjbC6pkGL+wUqom6LhUJT7ZWn/SbfTnaZ7isf6WKVMQZzCDa7OWGCuyG+SX82Ks+e kSwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7u6Zdq58VbCH/lchMzDVToBYOhen0eodKVOJkO1ZVzg=; b=sPnW7Z5sia/SgTHk/Nu1H+Xw+/VSujwLpEWUuymLBdNGDZFzpJ9qJVFnRClEcToJ2u AXCRl0bJ7+G6GW/iLss/8ZEh0sehZBC9iR/bxUIMKRXF1MAXp1dsyg2hVO+QScCsC+Z+ BViyBVGtrBYPVqVwdyrPYOwqSeDpbRJ16T9DqjSrEkc/h8z4xijkEyYNA+fQ9Wp5PnHX e75A86tR3p+kUD39ECTsGO7mqhnjk510LRRp7fPGccVMP5PSIWvQCC/WC5VSxexueWTw R4TiYtnZzPPgmjMaMPBR9POww5o+3GTCJvhamOch6Zf0UAOt4aC5ZFDQmumKe9JvsMUj KOfg== X-Gm-Message-State: AGRZ1gIbXHzxrMAZwQpMEKVgR0y/+W7DyNMTFMzwIiTkqBAiVysshWTL tjzI3E1AXeumZF4MnVAeliUfnnK5+6Y= X-Google-Smtp-Source: AJdET5cTCXf+qWltwhrCkel468YsaY5KdRdQyf8sYb2E00NxC2l7OVzK5qrwpqHCu+HSrhLb8amSKg== X-Received: by 2002:adf:a409:: with SMTP id d9-v6mr16954132wra.190.1541376650258; Sun, 04 Nov 2018 16:10:50 -0800 (PST) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id z3-v6sm2342428wma.6.2018.11.04.16.10.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Nov 2018 16:10:49 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Nov 2018 00:10:43 +0000 Message-Id: <20181105001045.24545-1-sw@jkqxz.net> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] cbs_av1: Fix header writing when already aligned 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" --- Previously it lost the trailing bits byte but did include it in the OBU size, completely breaking the stream. libavcodec/cbs_av1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 9bac9dde09..1c49d90f51 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -1179,7 +1179,7 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, if (err < 0) return err; end_pos = put_bits_count(pbc); - obu->obu_size = (end_pos - start_pos + 7) / 8; + obu->obu_size = header_size = (end_pos - start_pos + 7) / 8; } else { // Empty OBU. obu->obu_size = 0;