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 3CA8E4965B for ; Thu, 16 May 2024 14:59:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 753EC68D44C; Thu, 16 May 2024 17:59:04 +0300 (EEST) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DC81868D2A7 for ; Thu, 16 May 2024 17:58:57 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6f44b296e02so213522b3a.2 for ; Thu, 16 May 2024 07:58:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715871535; x=1716476335; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=iv/FvOUCIWnxHrtZa/sp1v0iXnsfBY1WwOs3KmmxpMI=; b=Bjhc4i+LfABhUj1uR5FZCZx4/5fSfNwbyxn3yHFP10GB09+LNBxBnPQc/JR1r3170E drHzmLIia+3lCrMIofghyJ/CFaFSU2Chh4MoBRZM4moPItCm5B3QF0bk88kJI7I3c1Os bQvhVPqmwIDnhyb/+nCBA5x4VpbTyB6Hf7c5+echOzA9tJmBeQgKj9In72Ew2hP0L8kX ayQAvo9Msy+Zysc/v6u+X3MYvCWR2mCJ/SNkpEfkl230uFlaDnSVPtp4wutXtSlNhTyU aQCeVn7T7M3szfUgukB2vKoYFLOCu9CnQKpIBg2iv9u6JGEaS2bJEAljEOasG4eTa1tF glmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715871535; x=1716476335; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iv/FvOUCIWnxHrtZa/sp1v0iXnsfBY1WwOs3KmmxpMI=; b=MxTZ1PeNAT/bTArPKjuBK9LSeB7D8KDhV2cBd5zfbOF1lcVkjtCoKLT6ZmElXuE8Hz CEgmBkNX1NcsjGn85M0pZD8x0Ge+z3upFvQJ/PRf5mhr+m7aGGppNXkHRyyHRY490jzt 5RCsw/tekQVAtXR0w0x0u01Apf4dnhudgyyV+5fGBEPvlBxlyTR6VbJTbPu7/1OsZVOw qMacfz6mNa4AOuspbEhT7AHtDHxvbOUoJGpAI1AbFv55g9L31gEepyoLOsJLWy2VJVJt Zin2yNK7lz5v+2ulb5o0F6cG4QZWaWpytOfTwqsRwahEv2KgsXt85XNkWFTy4jdnQNKy Ze3g== X-Gm-Message-State: AOJu0YygBEGULp21Xv8U9uDKD5arTs/ycatACKTxRsVsTzU2wMVvHJNW nDvH5/c/MbweTHvLK2f15xgkExxk7y6JU1XmG/ZTrG/RtqBWqO8D5s5RCA== X-Google-Smtp-Source: AGHT+IHH2CRImvvjY/8ynf0a2dKqr1TNC8n4Vt6odDBV3dz2TxznMwtPoZyo/r4+yAkQubeT1rogEQ== X-Received: by 2002:a05:6a20:914f:b0:1af:af89:ed71 with SMTP id adf61e73a8af0-1afde0d3affmr20732399637.19.1715871534710; Thu, 16 May 2024 07:58:54 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f4d2a81ca7sm13157487b3a.77.2024.05.16.07.58.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 07:58:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 May 2024 11:58:13 -0300 Message-ID: <20240516145814.6895-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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 | 33 ++++++++++++++++----------------- tests/ref/fate/source | 1 + 4 files changed, 19 insertions(+), 18 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..f4b8195948 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" @@ -45,7 +46,7 @@ typedef struct VVCPTLRecord { uint8_t general_level_idc; uint8_t ptl_frame_only_constraint_flag; uint8_t ptl_multilayer_enabled_flag; - uint8_t general_constraint_info[9]; + uint8_t general_constraint_info[64]; uint8_t ptl_sublayer_level_present_flag[VVC_MAX_SUBLAYERS - 1]; uint8_t sublayer_level_idc[VVC_MAX_SUBLAYERS - 1]; uint8_t ptl_num_sub_profiles; @@ -138,10 +139,6 @@ 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 +577,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 +598,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 +729,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 +764,16 @@ 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); + put_bits(&pbc, 6, vvcc->ptl.general_constraint_info[vvcc->ptl.num_bytes_constraint_info - 1]); + } 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".