From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8A0E34875E for ; Thu, 16 May 2024 17:28:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FE7B68D44C; Thu, 16 May 2024 20:28:23 +0300 (EEST) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18D7968D378 for ; Thu, 16 May 2024 20:28:17 +0300 (EEST) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6f4521ad6c0so426235b3a.0 for ; Thu, 16 May 2024 10:28:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715880494; x=1716485294; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OqElDM88hRIfOvX72B0wCmUsCPdryg87l/MuW5CAdqo=; b=Fl/V3DhLvroaFA4igXMEwfkDC1nN0jY3AprGAcAPVIuLKq8WPVMXSSqNCdIBlGU5aY dxSW2uW6t3PGmvYWy+ZFLrYe2nC7cDvEgyTULxhq9buRVlynlugkviBRSzuPNRJTC5kb SfdOjAR8L8blo49QZJB74wQacrl7aoqgmf3HXFIjXNMoEEmh6XAniO08mj5kJijOMP7Z cUG0JMl4c20ORChf1vIS3daQfB5xp1600EU1/IcVluI83QyUSqviWk9d8FbqMt0uhvim hGL3z4U3fJ66qEq/qthLFZkJAdfyYDl/uIndLsSTiCXhurOt/+SXKny9b7K7ti2vkbi+ gOow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715880494; x=1716485294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OqElDM88hRIfOvX72B0wCmUsCPdryg87l/MuW5CAdqo=; b=pYCBupwAmT5G94Q3ixStX9JLrOYLaE8yCALYN5D4zCktbSnIT3fhAv6yGtDMCIidHK Z2Mg3A9EtRtXsCM4Yyobe4je5Yei+ASRjd3Xj53Wgjk5njtiJVeEQtyAbX/YXhjSLC4K c6kLUAAKZ3mcM0IB1YRR9+ZeT01dIXUXLAxnzQHMKtUDf8utta9sVao9ir2k6kzmrTCi ifw8eaMXb681FpAUIonW2y2JTv+v/alwsT1XuhOEnlNgEiXhlI28TddXk8C5J4GpePQR i2rVbbAA0Bkgk4U2mM0jsP5/3qPk7OsfKAywSyC07UhHbahKR5KLuZNp5nIVSvjbjuOM 8zcQ== X-Gm-Message-State: AOJu0YzD0XDhGCnvkON9tEBH4Ge3oCCjsOkfS3FCGxA9WIkhw7r4c7QH drCjvUFhJ8ekSkcP6kOxn97XvVCyu5V6XbMG0zG3yUVSKWsdSoNXyYpTMQ== X-Google-Smtp-Source: AGHT+IHe5scXyGgnQv1Qmx2w9rZ5IGgcgPDjY51hAlw1MXfqblrO9P0/azvKIZkRRf44dEU+W7pn4A== X-Received: by 2002:a05:6a00:9290:b0:6f3:e6e0:d9f3 with SMTP id d2e1a72fcca58-6f4e0385654mr20427093b3a.31.1715880494005; Thu, 16 May 2024 10:28:14 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f676b08e4esm3543431b3a.79.2024.05.16.10.28.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 10:28:13 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 May 2024 14:27:53 -0300 Message-ID: <20240516172753.6986-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240516145814.6895-1-jamrial@gmail.com> References: <20240516145814.6895-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/vvc: fix writing general_constraint_info bytes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: The existing implementation was completely broken. Signed-off-by: James Almer --- libavformat/Makefile | 2 +- libavformat/bitstream.c | 1 + libavformat/vvc.c | 28 ++++++++++++++-------------- tests/ref/fate/source | 1 + 4 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 libavformat/bitstream.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 2d4e0e0c95..211ccf45e5 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -727,7 +727,7 @@ OBJS-$(CONFIG_LIBSSH_PROTOCOL) += libssh.o OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o # Objects duplicated from other libraries for shared builds -SHLIBOBJS += log2_tab.o to_upper4.o +SHLIBOBJS += log2_tab.o to_upper4.o bitstream.o SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o diff --git a/libavformat/bitstream.c b/libavformat/bitstream.c new file mode 100644 index 0000000000..2afda37c30 --- /dev/null +++ b/libavformat/bitstream.c @@ -0,0 +1 @@ +#include "libavcodec/bitstream.c" diff --git a/libavformat/vvc.c b/libavformat/vvc.c index 3123cd8d83..36d387f295 100644 --- a/libavformat/vvc.c +++ b/libavformat/vvc.c @@ -21,6 +21,7 @@ */ #include "libavcodec/get_bits.h" +#include "libavcodec/put_bits.h" #include "libavcodec/golomb.h" #include "libavcodec/vvc.h" #include "libavutil/intreadwrite.h" @@ -138,9 +139,7 @@ static void vvcc_update_ptl(VVCDecoderConfigurationRecord *vvcc, vvcc->ptl.num_bytes_constraint_info = 9; memcpy(&vvcc->ptl.general_constraint_info[0], &ptl->gci_general_constraints[0], sizeof(uint8_t) * 9); - } else { - vvcc->ptl.num_bytes_constraint_info = 1; memset(&vvcc->ptl.general_constraint_info[0], 0, sizeof(uint8_t) * 9); } @@ -580,8 +579,6 @@ static void vvcc_init(VVCDecoderConfigurationRecord *vvcc) memset(vvcc, 0, sizeof(VVCDecoderConfigurationRecord)); vvcc->lengthSizeMinusOne = 3; // 4 bytes - vvcc->ptl.num_bytes_constraint_info = 1; - vvcc->ptl_present_flag = 1; } @@ -603,7 +600,6 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) { uint8_t i; uint16_t j, vps_count = 0, sps_count = 0, pps_count = 0; - unsigned char *buf = NULL; /* * It's unclear how to properly compute these fields, so * let's always set them to values meaning 'unspecified'. @@ -735,6 +731,10 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) avio_w8(pb, vvcc->lengthSizeMinusOne << 1 | vvcc->ptl_present_flag | 0xf8); if (vvcc->ptl_present_flag) { + uint8_t buf[64]; + PutBitContext pbc; + + init_put_bits(&pbc, buf, sizeof(buf)); /* * unsigned int(9) ols_idx; * unsigned int(3) num_sublayers; @@ -766,15 +766,15 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc) * unsigned int (1) ptl_frame_only_constraint_flag * unsigned int (1) ptl_multilayer_enabled_flag * unsigned int (8*num_bytes_constraint_info -2) general_constraint_info */ - buf = - (unsigned char *) malloc(sizeof(unsigned char) * - vvcc->ptl.num_bytes_constraint_info); - *buf = vvcc->ptl.ptl_frame_only_constraint_flag << vvcc->ptl. - num_bytes_constraint_info * 8 - 1 | vvcc->ptl. - ptl_multilayer_enabled_flag << vvcc->ptl.num_bytes_constraint_info * - 8 - 2 | *vvcc->ptl.general_constraint_info >> 2; - avio_write(pb, buf, vvcc->ptl.num_bytes_constraint_info); - free(buf); + put_bits(&pbc, 1, vvcc->ptl.ptl_frame_only_constraint_flag); + put_bits(&pbc, 1, vvcc->ptl.ptl_multilayer_enabled_flag); + if (vvcc->ptl.num_bytes_constraint_info) { + ff_copy_bits(&pbc, vvcc->ptl.general_constraint_info, (vvcc->ptl.num_bytes_constraint_info - 1) * 8); + put_bits(&pbc, 6, vvcc->ptl.general_constraint_info[vvcc->ptl.num_bytes_constraint_info - 1] & 0x3f); + } else + put_bits(&pbc, 6, 0); + flush_put_bits(&pbc); + avio_write(pb, buf, FFMAX(vvcc->ptl.num_bytes_constraint_info, 1)); if (vvcc->num_sublayers > 1) { uint8_t ptl_sublayer_level_present_flags = 0; diff --git a/tests/ref/fate/source b/tests/ref/fate/source index 7b5f14b4f0..d8d4224145 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -10,6 +10,7 @@ libavdevice/reverse.c libavfilter/af_arnndn.c libavfilter/file_open.c libavfilter/log2_tab.c +libavformat/bitstream.c libavformat/file_open.c libavformat/golomb_tab.c libavformat/log2_tab.c -- 2.45.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".