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 ESMTPS id 0AAEA4BB1A for ; Sun, 27 Apr 2025 23:42:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 205FF68B5E2; Mon, 28 Apr 2025 02:42:31 +0300 (EEST) Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B57B687C99 for ; Mon, 28 Apr 2025 02:42:25 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-b0da25f5216so2514007a12.1 for ; Sun, 27 Apr 2025 16:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745797343; x=1746402143; 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=sNQJo5nVxUpUmeATKfQ+e+J9tPuJuLbk4HKYYP4Xri0=; b=SHmlMDw21MXUs3RFQgeYY+ASPxyGBsMr5aCS6Z9jn48qkyXmDxrHROpNbKaJ+x/Yjv FHcAIRFbHRIth96i59+IwzTXMUB75yiM+vG2AHjoTl3IiMZ4HxlnxE6SOaA9pt+GHdhC N3nUHwhCxjzDfX/RVXZoxLUEgfmPBoUyleWqLxlvVItvvoK+PewMUXexwCEGZdebKVdg XXUWiMJG2PDCHh9UECIOH6pAqr3PFFvC99A/woc7ClReP09uBr8moemK2gtX7M6AHqqB 2U6/T1abSVu3tdn+YAlB2OO5FTME6YKV8ApHh/y1qpzzQPyhgxOtS+A5CUvrmYwBqJ5R ticA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745797343; x=1746402143; 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=sNQJo5nVxUpUmeATKfQ+e+J9tPuJuLbk4HKYYP4Xri0=; b=RJaUSXG7IxPVzbSXMmk+GRKdmqzVgMCdR3uh2XKcklvha6jaHK94EcTqi9g9xsmyP7 0BdMOVKIhrwCsRX9AulSzWfEE+DjYnC8qv7I0PwQk70BWpzWIPsD+/NzDHu2SfRvfA9R dYzyHgUzhqTr1LBEsF1RsuwEKhkdXyNBVZw9TKB5IFgsWEUy5fCA/L9bUYmCH+OH85x3 xKeMiSlJA/WSTrkpF9F61ESxzYAGBh7noJJ4Xi139xq6NRPVzO0R0hzpQmt7LneVggKB lmfnqrbpojy45PWQam1cD4zQ7Vx6qOq3iu5ChCh33/XWkZDe/suqbKV7job5917xMVNI 8xBg== X-Gm-Message-State: AOJu0Yxr3SopulagNS9po8EQJRV9khvuqamTYhuvY9FBgbI/UHjJ92l5 YOf1VQdvrRfm0SBnfAe1H77dIpqwBDOZdVx0ZElIcF+D7d3a2EI6qwH1KA== X-Gm-Gg: ASbGncv9vh7GCu/FOi4KjHsKBMLgfyeZliAXoThPvltx06r+PmyYPADzL+URdrgM/L9 LcBwXhRSNqviyj375ydr7QFT5Fdr2Cm+kXlmdF67l1sfH71IyHPNxXfrJwzijwibS1iYuEMD0xb ubIPWlnmzGBQl8fblLS5CNJ6kwoIQ8SzIOaH5m+e28BBo+QBp/UPT3Mznz6cnXTDEiFhpAT0GHK gnr1+GU8svg/mXk/cmM0c+FZhCMbGNVfluZ/cTMl8480GNFasMxhJBmS+x/Smy9VxSuR1DkTZK7 JIchidgFFGCTvSWDfv3QHvWjxiVZoLJopJROXRuUi/sRpCbKS+ipvtwDzUwK X-Google-Smtp-Source: AGHT+IHAiRpuHGA+fqyqGTq4hPdVddyShaz4WJ5PnxyuDN18N4rQ9QDYSjSto0g8zL2v8rD+7MU7Tg== X-Received: by 2002:a05:6a20:c991:b0:1f5:839e:ece8 with SMTP id adf61e73a8af0-2046a3abdc1mr9689799637.2.1745797342703; Sun, 27 Apr 2025 16:42:22 -0700 (PDT) Received: from localhost.localdomain ([2800:2121:b000:82e:c1aa:b2fa:e6cb:56a1]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25967aedsm6653058b3a.83.2025.04.27.16.42.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Apr 2025 16:42:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Apr 2025 20:39:35 -0300 Message-ID: <20250427233935.11116-1-jamrial@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250427211541.10631-1-jamrial@gmail.com> References: <20250427211541.10631-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec: add an APV parser 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: Signed-off-by: James Almer --- Now working if the first AU is not a primary frame. configure | 1 + libavcodec/Makefile | 1 + libavcodec/apv_parser.c | 133 ++++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 4 files changed, 136 insertions(+) create mode 100644 libavcodec/apv_parser.c diff --git a/configure b/configure index ee270b770c..d8c2786dc8 100755 --- a/configure +++ b/configure @@ -3483,6 +3483,7 @@ vvc_qsv_decoder_select="vvc_mp4toannexb_bsf qsvdec" # parsers aac_parser_select="adts_header mpeg4audio" +apv_parser_select="cbs_apv" av1_parser_select="cbs_av1" evc_parser_select="evcparse" ffv1_parser_select="rangecoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e674671460..cc142bbae2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1198,6 +1198,7 @@ OBJS-$(CONFIG_AC3_PARSER) += aac_ac3_parser.o ac3tab.o \ ac3_channel_layout_tab.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o OBJS-$(CONFIG_AMR_PARSER) += amr_parser.o +OBJS-$(CONFIG_APV_PARSER) += apv_parser.o OBJS-$(CONFIG_AV1_PARSER) += av1_parser.o av1_parse.o OBJS-$(CONFIG_AVS2_PARSER) += avs2.o avs2_parser.o OBJS-$(CONFIG_AVS3_PARSER) += avs3_parser.o diff --git a/libavcodec/apv_parser.c b/libavcodec/apv_parser.c new file mode 100644 index 0000000000..bd1894146c --- /dev/null +++ b/libavcodec/apv_parser.c @@ -0,0 +1,133 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" +#include "apv.h" +#include "cbs.h" +#include "cbs_apv.h" + +typedef struct APVParseContext { + CodedBitstreamContext *cbc; + CodedBitstreamFragment au; +} APVParseContext; + +static const enum AVPixelFormat apv_format_table[5][5] = { + { AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16 }, + { 0 }, // 4:2:0 is not valid. + { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV422P16 }, + { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV444P16 }, + { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUVA444P16 }, +}; + +static int parse(AVCodecParserContext *s, + AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + APVParseContext *p = s->priv_data; + CodedBitstreamFragment *au = &p->au; + int ret; + + *poutbuf = buf; + *poutbuf_size = buf_size; + + p->cbc->log_ctx = avctx; + + ret = ff_cbs_read(p->cbc, au, buf, buf_size); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to parse access unit.\n"); + goto end; + } + + s->key_frame = 1; + s->pict_type = AV_PICTURE_TYPE_I; + s->field_order = AV_FIELD_UNKNOWN; + s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + + for (int i = 0; i < au->nb_units; i++) { + const CodedBitstreamUnit *pbu = &au->units[i]; + + switch (pbu->type) { + case APV_PBU_PRIMARY_FRAME: { + const APVRawFrame *frame = pbu->content; + const APVRawFrameHeader *header = &frame->frame_header; + const APVRawFrameInfo *info = &header->frame_info; + int bit_depth = info->bit_depth_minus8 + 8; + + if (bit_depth < 8 || bit_depth > 16 || bit_depth % 2) + break; + + s->width = info->frame_width; + s->height = info->frame_height; + s->format = apv_format_table[info->chroma_format_idc][bit_depth - 4 >> 2]; + avctx->profile = info->profile_idc; + avctx->level = info->level_idc; + avctx->chroma_sample_location = AVCHROMA_LOC_TOPLEFT; + avctx->color_primaries = header->color_primaries; + avctx->color_trc = header->transfer_characteristics; + avctx->colorspace = header->matrix_coefficients; + avctx->color_range = header->full_range_flag ? AVCOL_RANGE_JPEG + : AVCOL_RANGE_MPEG; + goto end; + } + default: + break; + } + } + +end: + ff_cbs_fragment_reset(au); + p->cbc->log_ctx = NULL; + + return buf_size; +} + +static const CodedBitstreamUnitType decompose_unit_types[] = { + APV_PBU_PRIMARY_FRAME, +}; + +static av_cold int init(AVCodecParserContext *s) +{ + APVParseContext *p = s->priv_data; + int ret; + + ret = ff_cbs_init(&p->cbc, AV_CODEC_ID_APV, NULL); + if (ret < 0) + return ret; + + p->cbc->decompose_unit_types = decompose_unit_types; + p->cbc->nb_decompose_unit_types = FF_ARRAY_ELEMS(decompose_unit_types); + + return 0; +} + +static void close(AVCodecParserContext *s) +{ + APVParseContext *p = s->priv_data; + + ff_cbs_fragment_free(&p->au); + ff_cbs_close(&p->cbc); +} + +const AVCodecParser ff_apv_parser = { + .codec_ids = { AV_CODEC_ID_APV }, + .priv_data_size = sizeof(APVParseContext), + .parser_init = init, + .parser_parse = parse, + .parser_close = close, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index 5387351fd0..21164f3751 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -25,6 +25,7 @@ extern const AVCodecParser ff_aac_latm_parser; extern const AVCodecParser ff_ac3_parser; extern const AVCodecParser ff_adx_parser; extern const AVCodecParser ff_amr_parser; +extern const AVCodecParser ff_apv_parser; extern const AVCodecParser ff_av1_parser; extern const AVCodecParser ff_avs2_parser; extern const AVCodecParser ff_avs3_parser; -- 2.49.0 _______________________________________________ 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".