From patchwork Wed Sep 11 10:56:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: martin schitter X-Patchwork-Id: 51505 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:14c:b0:48e:c0f8:d0de with SMTP id h12csp209760vqi; Wed, 11 Sep 2024 03:06:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWEdGwBJpIhdUjFD0pxUj8VEaGXM8HdNm8D7tZlFndLNxWx9nBcNe263Fk1hoxt7YsbrHAZOlJl2M7tV7oJxmlA@gmail.com X-Google-Smtp-Source: AGHT+IEufguoP0pPURIKiLZKGNPEbJoyeF499pP25L4vX3F3YXEpwGpiJMmwRwEobUZKoeNeGX5m X-Received: by 2002:a05:6402:50cb:b0:5c2:524b:7711 with SMTP id 4fb4d7f45d1cf-5c40bc5d02fmr1885822a12.33.1726049169104; Wed, 11 Sep 2024 03:06:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726049169; cv=none; d=google.com; s=arc-20240605; b=A4ynhcU7sTJgwppaIq5ZipPv8fe2lbG7QQkoZN7V4OEujQ1A0VZDR1x9925uYS3lbe DrYgXlwUQWaTke5S9ithMiSr3awZ6nNOMzDtzNjqI89pIvEZKQ6TcWJgWSQgp+eKHIiU wb50n4Zw8A++hf//TQtt4HSsy9eGhw6Md7l1rXnE96G32KkPzJ/nGlItbXJOo7LkgD4f kKQs07CYIftb+oVBx8EbO+X6O0LtWxYmdw8mPBhgOBMytFfeRuWpUH3CuQ27RUWggulG lzi7xihtpDmoDmUPdLgHb8Qmy5Gbkbd6DH/A/5w88MV8D4SX0GEne+G/KRY95Jg+m4zY iYSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=VxEqIZAPVegUejbAn1ffCPyHNAGfXgasga0G5RShqio=; fh=igg3JDwkSkAbPTwY6V0OsEq0RUkG4DKWC8fVJg4GhMY=; b=D2oocYIX/SyPDd8oZ0MHsAX2hNpZVl0ma2huUhYsem5m+YENOXo4hYoZhpYaYMw0gX jV3BSp7RJ7VUmaZdx5IJq1/abI1oAtm9pChwSej3Pp+sO74awoF6qvG87LDKrwSeJ6gF FzSFNpdpzZRcif8a64IitjoA/8hwq/1Aznq9/Lg0/nfOdqe7ZCdIkSFNaALjBnOGrzhk MDGznqtQkHAo5IcInn9kKBP2H/a6nF3gCdDD1N4x3pD/hmIRtgywQX6PN+kkkxVoD3K+ X/+BH3qo2AosNJosw+d8E3gO5IcPUVR/RMFR4jSGGyFb/sAuPIuhL9idZd69BXRSYvns hqUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@mur.at header.s=dkim2 header.b=RJ3aWqVx; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mur.at Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c3ebda9a0csi6447070a12.545.2024.09.11.03.06.08; Wed, 11 Sep 2024 03:06:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@mur.at header.s=dkim2 header.b=RJ3aWqVx; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mur.at Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4ED7768E087; Wed, 11 Sep 2024 13:06:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from efeu.mur.at (efeu.mur.at [89.106.208.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49D8268DEFD for ; Wed, 11 Sep 2024 13:05:57 +0300 (EEST) Received: from localhost.localdomain (lan1.raspi.ma39.ffgraz.net [10.12.1.243]) by efeu.mur.at (Postfix) with ESMTPSA id E9CB04622A; Wed, 11 Sep 2024 12:05:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mur.at; s=dkim2; t=1726049156; bh=pcucNgWXu55Mj+YKP37R2z3RceON2t8aaWKdAXaPYNY=; h=From:To:Cc:Subject:Date:From; b=RJ3aWqVx8rkmF43VBmK3wSwdNPdjzrzwGMleN2/CRVR1vPvsSaqn/0lyK9WiVkGdN Aa0W750rOqs54dC8UQNtRxie98CnIebluER1yCQm5twqN0gVP2Br7iTa8UwUZ+URlN XfAwnPXrRhC6N6oM4uqGBq+NQwnvWaQHZVq9lIsvLX0ucxFt01i7Mk8dDY+oLIMVRw YAklVDR2v6K6tuT+VP1ZFBq3KOkzD45QZ9p2fNbC/9EZTs8/hUajOrUY6rnwp+tbmi 7hQUFW/HzrJKmK0HwEqBGsjWRpHhfrFFgKiEDx4fGwJ6oodRidrwVitG7DaAv2rcOC YaoQltRvMczbuQ8KModcHjLa9PSIz1+l7oMzvltQNbeGtWEZSjM8SqQn3NQ/oyRmh4 ID7/qqWe52mcefDk/0KMHqNj3EHQnx2CrsVNMl75JP1lJ7BImBOD6ZQ2sn4I8Ua63H cj20GgW6anJ6UaeQKd8sOj0oKWU3MpM9dKOQ9xP5+b9qET352k/ From: Martin Schitter To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Sep 2024 12:56:14 +0200 Message-ID: <20240911105616.849239-2-ms+git@mur.at> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/4] libavcodec/dnxuc_parser: DNxUncompressed essence 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 Cc: Martin Schitter Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tAvUsw5OQM4y This time only small corrections... --- libavcodec/dnxuc_parser.c | 124 ++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 2 files changed, 125 insertions(+) create mode 100644 libavcodec/dnxuc_parser.c diff --git a/libavcodec/dnxuc_parser.c b/libavcodec/dnxuc_parser.c new file mode 100644 index 0000000..55d5763 --- /dev/null +++ b/libavcodec/dnxuc_parser.c @@ -0,0 +1,124 @@ +/* + * Avid DNxUncomressed / SMPTE RDD 50 parser + * Copyright (c) 2024 Martin Schitter + * + * 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 + */ + +/* + This parser for DNxUncompressed video data is mostly based on + reverse engineering of output generated by DaVinci Resolve 19 + but was later also checked against the SMPTE RDD 50 specification. + + Limitations: Multiple image planes are not supported. +*/ + +#include "avcodec.h" +#include "libavutil/intreadwrite.h" + +typedef struct DNxUcParseContext { + uint32_t fourcc_tag; + uint32_t width; + uint32_t height; + uint32_t nr_bytes; +} DNxUcParseContext; + +/* +DNxUncompressed frame data comes wrapped in nested boxes of metadata +(box structure: len + fourcc marker + data): + +[0-4] len of outer essence unit box (typically 37 bytes of header + frame data) +[4-7] fourcc 'pack' + +[8-11] len of "signal info box" (always 21) +[12-15] fourcc 'sinf' +[16-19] frame width / line packing size +[20-23] frame hight / nr of lines +[24-27] fourcc pixel format indicator +[28] frame_layout (0: progressive, 1: interlaced) + +[29-32] len of "signal data box" (nr of frame data bytes + 8) +[33-36] fourcc 'sdat' +[37-..] frame data + +A sequence of 'signal info'+'signal data' box pairs wrapped in +'icmp'(=image component) boxes can be utilized to compose more +complex multi plane images. +This feature is only partially supported in the present implementation. +We never pick more than the first pair of info and image data enclosed +in this way. +*/ + +static int dnxuc_parse(AVCodecParserContext *s, + AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + char fourcc_buf[5]; + const int HEADER_SIZE = 37; + int icmp_offset = 0; + + DNxUcParseContext *pc; + pc = (DNxUcParseContext *) s->priv_data; + + if (!buf_size) { + return 0; + } + if (buf_size > 16 && MKTAG('i','c','m','p') == AV_RL32(buf+12)){ + icmp_offset += 8; + } + if ( buf_size < 37 + icmp_offset /* check metadata structure expectations */ + || MKTAG('p','a','c','k') != AV_RL32(buf+4+icmp_offset) + || MKTAG('s','i','n','f') != AV_RL32(buf+12+icmp_offset) + || MKTAG('s','d','a','t') != AV_RL32(buf+33+icmp_offset)){ + av_log(avctx, AV_LOG_ERROR, "can't read DNxUncompressed metadata.\n"); + *poutbuf_size = 0; + return buf_size; + } + + pc->fourcc_tag = AV_RL32(buf+24+icmp_offset); + pc->width = AV_RL32(buf+16+icmp_offset); + pc->height = AV_RL32(buf+20+icmp_offset); + pc->nr_bytes = AV_RL32(buf+29+icmp_offset) - 8; + + if (!avctx->codec_tag) { + av_fourcc_make_string(fourcc_buf, pc->fourcc_tag); + av_log(avctx, AV_LOG_INFO, "dnxuc_parser: '%s' %dx%d %dbpp %d\n", + fourcc_buf, + pc->width, pc->height, + (pc->nr_bytes*8)/(pc->width*pc->height), + pc->nr_bytes); + avctx->codec_tag = pc->fourcc_tag; + } + + if (pc->nr_bytes > buf_size - HEADER_SIZE + icmp_offset){ + av_log(avctx, AV_LOG_ERROR, "Insufficient size of image essence data.\n"); + *poutbuf_size = 0; + return buf_size; + } + + *poutbuf = buf + HEADER_SIZE + icmp_offset; + *poutbuf_size = pc->nr_bytes; + + return buf_size; +} + +const AVCodecParser ff_dnxuc_parser = { + .codec_ids = { AV_CODEC_ID_DNXUC }, + .priv_data_size = sizeof(DNxUcParseContext), + .parser_parse = dnxuc_parse, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index 5128009..8bfd2db 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -35,6 +35,7 @@ extern const AVCodecParser ff_cri_parser; extern const AVCodecParser ff_dca_parser; extern const AVCodecParser ff_dirac_parser; extern const AVCodecParser ff_dnxhd_parser; +extern const AVCodecParser ff_dnxuc_parser; extern const AVCodecParser ff_dolby_e_parser; extern const AVCodecParser ff_dpx_parser; extern const AVCodecParser ff_dvaudio_parser;