From patchwork Mon Apr 20 21:45:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19114 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 1157A449F63 for ; Tue, 21 Apr 2020 00:46:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2E1768B8AA; Tue, 21 Apr 2020 00:46:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AD9368B696 for ; Tue, 21 Apr 2020 00:46:51 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id m67so12425817qke.12 for ; Mon, 20 Apr 2020 14:46:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Pfzmj1GGgLblrhglQFirK1kgVg9y5MuEU4mPO/i2tU0=; b=gUJ0p6Gd0jsa1GiVlHCAOsnNH8V0inYse2uTTl5UJi5055gMYzBtcOW5b9i6K3mB3t 9LkC34CzXQoyeesDSjm+aKpIIBm5LaTs96vfAT1ybtn2s4pogIj3TeCGoX4cLJbgZToB 5+8tET73YmelLfGa0XT9NI4SLj+sL9D/Dagmq0zo7CQCk8/E6mxsIny+Ktg0u9awVKli g5aQYf8cb1aU3IaDatAdTHg31NSUj0Y912VWe14g2tcJ3/D0k4x4ptJjKqD9hoYGiI61 kZOsZntN2iIn4vOlyv50HP7RmhcvBkxbwB61V4Cj4NARdA1DBupZ3HJRulny/8BGBYPb 00ig== 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=Pfzmj1GGgLblrhglQFirK1kgVg9y5MuEU4mPO/i2tU0=; b=jH9UgQTGBD0zsotsaLGZcIZGAqQ7ePvpFc5lVk3LMdVNWW8Pyt+x7OC8ySCe7uF4ha YG+chkUAHGkaHi1kMmGyJ/83umnd0cHEU9R2ZB+70UjCTXDDvmDBXJ4Cdljlr3GnhNDI nJucQTQFDpVWyh7Z1vo9+ujdHnFJBvpamuHluAMF5DdCsYa/kyzOcgY/A9afNCYgnos+ DWXpRUMJ/7nblDbYzCCjU+rCkmxXoO6j0CvqWV176CQxj2mijsrU2MiC44ciBf4VPOMo C5lW/j0zMgtXUkimHRv7wk7oHXAMPxH3wcPUkg7xYFGA9e4v/74sYCk5MM0gneV3qyPN UZDQ== X-Gm-Message-State: AGi0PuZN/fHK5WV9AJckvgltS123FrS786ZJHRuBv+lQf1m2Y1AEyn2L +jejNRqDJJ/6aPjthBTd9GBFMc9d X-Google-Smtp-Source: APiQypJf5VPoXmiU3PzRsNkZRC4w+D/1bCLbH+9xWDxy+Y6kqdwXWlNs74Iuh0tMduQCJ8JLhQ8BpQ== X-Received: by 2002:a37:a6d4:: with SMTP id p203mr16862500qke.201.1587419209585; Mon, 20 Apr 2020 14:46:49 -0700 (PDT) Received: from localhost.localdomain ([191.83.215.190]) by smtp.gmail.com with ESMTPSA id n4sm541028qkh.38.2020.04.20.14.46.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 14:46:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Apr 2020 18:45:48 -0300 Message-Id: <20200420214551.6318-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/cbs_h265: fix writing extension_data bits 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" We only care about the right most bit. Signed-off-by: James Almer --- Fixes handling files like https://trac.ffmpeg.org/attachment/ticket/7965/puppets_with_alpha_hevc.mov Without this patch, parsing works but passing the VPS through hevc_metadata_bsf when writing fails. libavcodec/cbs_h265_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 180a045c34..85b952e64c 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -80,7 +80,7 @@ static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw, } #else for (k = 0; k < current->bit_length; k++) - xu(1, extension_data, current->data[k / 8] >> (7 - k % 8), 0, 1, 0); + xu(1, extension_data, current->data[k / 8] >> (7 - k % 8) & 1, 0, 1, 0); #endif return 0; } From patchwork Mon Apr 20 21:45:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19115 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 C5BBF449F63 for ; Tue, 21 Apr 2020 00:46:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AFBE568B8C0; Tue, 21 Apr 2020 00:46:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EFE568B696 for ; Tue, 21 Apr 2020 00:46:52 +0300 (EEST) Received: by mail-qt1-f182.google.com with SMTP id l60so9952813qtd.8 for ; Mon, 20 Apr 2020 14:46:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xh6Ui7mVJAGuQI0zoJ5hS8gmnPS8pF4CrComM9QTpyc=; b=Rxtb1pO6Iz+7XIk1nX/ji4olcu9ilx0gtDjmfQDJUCInkvyu8/1DizUbxANePR7qjo YnQKe1tScUeGoiFsHXLWugAEFAa/QuipvibdM98fvg4DZAL9ThVEMsA4xJRYfbt/A2UU H4mdAxzu9fg617ns1YoaeZbk5EhFtn2Et/QAzF/IZFI/StE0Uje9WQC5OtCtVacTXvWM /O1uIzopAjWpOgoqLSnxJB0M5skxp68/UUFha/yCgyL5QEYPxoK4uqN4l7SMPtrXSp5F zMg5KWDb5znVnMoTMDFJasLgxn5xz5GpwDLxREW7Yb+1TMO8jVOhwGwKn4AHchjHVtbf xnHg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=xh6Ui7mVJAGuQI0zoJ5hS8gmnPS8pF4CrComM9QTpyc=; b=aWuymcN8bCyvujHv5HnE137OJTbD9La9Mnk4MKCwvHt1Ga+qW4shk678WtNvNJp/Ju +DESxBUjX/n1Al9aLPNWnatxYBmL/W9d//l7B5z9JNFNHkYAJlpMo4QzYrW19CH1S6NF 5zsQlqb68OK3eZU8RD0/pd0p5k4HGCs1Vw/dmnvDCKF4Prrzimb+q6IT+cy3QuR0++lQ 8gOPDo+20JQzIm/x1ZbeTvU10b7P7kjIkixXqfu/7TCkuBhwTDRgWevcvT1KE+qqi4lB OXCg1U/3Rv3RYLJV3BNzM/DIRKxCNZJ7Dzg3bnogeuTx6bfFCW9u/PmswWQ/e9gkSGBY NsYw== X-Gm-Message-State: AGi0PubTB56rwwQEpwqKW+VY1KpVuqc3e6Qdt/Ld4uQSpjb9Z9EZJjnG OryTlpr+U2uJ/IJGLsrH3PXw5r1V X-Google-Smtp-Source: APiQypIBf3psbvv/PRLHIKUy/tDyLEZ4nTtsH52icl1+vxO0CkqNkjNDbSRcqVIdrax6gTgT82b0WA== X-Received: by 2002:aed:2dc1:: with SMTP id i59mr18155799qtd.182.1587419210700; Mon, 20 Apr 2020 14:46:50 -0700 (PDT) Received: from localhost.localdomain ([191.83.215.190]) by smtp.gmail.com with ESMTPSA id n4sm541028qkh.38.2020.04.20.14.46.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 14:46:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Apr 2020 18:45:49 -0300 Message-Id: <20200420214551.6318-2-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200420214551.6318-1-jamrial@gmail.com> References: <20200420214551.6318-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/cbs_h265: rename H265RawPSExtensionData to H265RawExtensionData 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" So that NAL types other than Parameter Set ones may use it. Signed-off-by: James Almer --- libavcodec/cbs_h265.h | 10 +++++----- libavcodec/cbs_h265_syntax_template.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index ad746bf35f..2c1e153ad9 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -182,11 +182,11 @@ typedef struct H265RawVUI { uint8_t log2_max_mv_length_vertical; } H265RawVUI; -typedef struct H265RawPSExtensionData { +typedef struct H265RawExtensionData { uint8_t *data; size_t bit_length; AVBufferRef *data_ref; -} H265RawPSExtensionData; +} H265RawExtensionData; typedef struct H265RawVPS { H265RawNALUnitHeader nal_unit_header; @@ -221,7 +221,7 @@ typedef struct H265RawVPS { H265RawHRDParameters hrd_parameters[HEVC_MAX_LAYER_SETS]; uint8_t vps_extension_flag; - H265RawPSExtensionData extension_data; + H265RawExtensionData extension_data; } H265RawVPS; typedef struct H265RawSTRefPicSet { @@ -325,7 +325,7 @@ typedef struct H265RawSPS { uint8_t sps_scc_extension_flag; uint8_t sps_extension_4bits; - H265RawPSExtensionData extension_data; + H265RawExtensionData extension_data; // Range extension. uint8_t transform_skip_rotation_enabled_flag; @@ -413,7 +413,7 @@ typedef struct H265RawPPS { uint8_t pps_scc_extension_flag; uint8_t pps_extension_4bits; - H265RawPSExtensionData extension_data; + H265RawExtensionData extension_data; // Range extension. uint8_t log2_max_transform_skip_block_size_minus2; diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 85b952e64c..fe5ffac80f 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -59,7 +59,7 @@ static int FUNC(byte_alignment)(CodedBitstreamContext *ctx, RWContext *rw) } static int FUNC(extension_data)(CodedBitstreamContext *ctx, RWContext *rw, - H265RawPSExtensionData *current) + H265RawExtensionData *current) { int err; size_t k;