From patchwork Fri Dec 17 00:12:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 32675 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp1002374iog; Thu, 16 Dec 2021 16:13:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+qJDjk/s4I4nEakrWPevhAH/8sWjTu3QFoiDCpCqWPC5CG5Xo70KOqAo8sXY6Uy1bQzT5 X-Received: by 2002:a17:906:4407:: with SMTP id x7mr393331ejo.51.1639700023034; Thu, 16 Dec 2021 16:13:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639700023; cv=none; d=google.com; s=arc-20160816; b=C1wHmLFiSMNV99d6LAUAkFv7Z7QT+IIbzKGU+fUBfM1nauw421EtaQkf40AI4nH/+p AwI0Wqjmw9BJ1WrOKdCn3trgZDZD/2uxlwmvj4wZxwCmO4dLtbmmO/xH30/GgPL6wtDi H52pKjjIIA7Vut65eLw5EfR8sU9O7Ggsc+yw8GZs5prOIsm2BafW3GBt3FjjZl6EkrZO fy6kfDVQiYn6rn+rVPjxGClmFWumyyAXPJ6DROHdrPl5wtSdzXFZBPTGjstcjnR90NEj pymtQ8Q9STEC+vd/cvdyN2bzm8sU5TojaQ1EiQYN9Q3tehzqcmFtTZVy5QnYGX9ho4an BvfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=/H+PKXIqiLTEWJkXSJ3UU3KO9HFzwzeR+AtKBLtsUNY=; b=rt553IciUWzvBcfp6XbMxmHgZSwDmnX9uOGlLbHUk8zlaSHbha/gV0PpD/kqHMh/I9 yjGH0mZwowAU9wiQJofjW59tjtqeQQ3kG8hkWrdeU+KmelqNlsHxElPEwn9knEefB70B 9feikMZpopbw5fEVK77g83WAJbwwTwcT64T/lqFikClOemWKskvncwD9RdATTEPGfKlG LBvO0LHA30qJYzk7rm3kv01vetFuo3W80diwDItsdq0pPKKc6RpMihAmEbwn+5KvFNgz iL2xG8UD1XuFLf4agO6saZZ0z1p89E3kLzgUWZ8a03W2EHVQBevjF8z5xY9KSU/zh20H EkzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rcombs.me header.s=google header.b="E5Zz/G1Z"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x10si4163670ejv.557.2021.12.16.16.13.42; Thu, 16 Dec 2021 16:13:43 -0800 (PST) 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=@rcombs.me header.s=google header.b="E5Zz/G1Z"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=rcombs.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59E5C68AFEC; Fri, 17 Dec 2021 02:12:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f176.google.com (mail-il1-f176.google.com [209.85.166.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0588168AFE1 for ; Fri, 17 Dec 2021 02:12:26 +0200 (EET) Received: by mail-il1-f176.google.com with SMTP id f17so363076ilj.11 for ; Thu, 16 Dec 2021 16:12:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=T5kmcBHkq5HZ0nAIuQYmOiwY79tms9x+PW3nVfBKsw0=; b=E5Zz/G1Zt6Jf7SDl+mqd2SSRc9jCxxXqCWZWv3PkaXjmKNHhbpBlQE44dV9WiKmsoT IFLZ2s7XBtw59aLPkGuCV2Ei45Pr7LbEQ+SMuYhrFiqsjuseYa4DkFzUNG9ON2J3aOrh NLd5hakqY7f2BhgbOz4lASeLquhdmn58fM7OaY40lORgQFjPW9eBW+8D8zrEytZ0rx/U 04dwKMYa+IM+mUl5whfG/h85djXpm3HJjP/Rxe8qpxUtr0zIN1shFhh5siYFGZHoYx1U XBcOL1+JxlA8CbRqJ6BrpShWO+SL77CEMiw/ZGQXs/NgS/F6H6KO+aHMEX5NhOLreBV0 IWzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T5kmcBHkq5HZ0nAIuQYmOiwY79tms9x+PW3nVfBKsw0=; b=zr2SnQHeiynZDlZU0246w5uLU2oJkXNxGiNSEPbZlcHlTnDlwGK6pBRj52H+sa/0q3 f97J79FnyzWCEQ4EDLH+3g1MCvfYweSplMUEN0+jnwL7Z9vi63T1EakDvcRdUSkCPeMz t/E6EamyfRwbKMpoJlOWlOVt+XX/wpQQ8ivPmromEdvyu9BZmfvba/o6pkuMTCZKtYyd 19o/Pz6EksmHFgugSMzTBaIXJkgHA7jJvlV/2p+D7TdXhW6HJc1ZaVU1o9tH+HI1NriR kK42+po0fkMQF19lYQyn/aDXfJrzOFmWzu6h0U5sj+n1o9gEiUekDJjtuf69SO6CpduM /JFA== X-Gm-Message-State: AOAM530u4O4YKa+s9sCDZnEkQuUrioq38yWXDHKWh255fAAkdWqtS5Yy eWmgaJ8ETREMb1jmP8tgqdmXbSYbVeVtB80= X-Received: by 2002:a92:d58a:: with SMTP id a10mr263576iln.81.1639699944355; Thu, 16 Dec 2021 16:12:24 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:1163:bda5:7473:fab3]) by smtp.gmail.com with ESMTPSA id z13sm1571257iln.43.2021.12.16.16.12.23 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Dec 2021 16:12:24 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Dec 2021 18:12:12 -0600 Message-Id: <20211217001215.75135-8-rcombs@rcombs.me> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211217001215.75135-1-rcombs@rcombs.me> References: <20211217001215.75135-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10] lavc/videotoolboxenc: add handling for non-NAL-based codecs 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o3lTPoN8tlCK --- libavcodec/videotoolboxenc.c | 149 +++++++++++++++++++++-------------- 1 file changed, 92 insertions(+), 57 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 82e01fbe29..67bb563639 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -549,6 +549,7 @@ static int copy_param_sets( static int set_extradata(AVCodecContext *avctx, CMSampleBufferRef sample_buffer) { + VTEncContext *vtctx = avctx->priv_data; CMVideoFormatDescriptionRef vid_fmt; size_t total_size; int status; @@ -559,23 +560,37 @@ static int set_extradata(AVCodecContext *avctx, CMSampleBufferRef sample_buffer) return AVERROR_EXTERNAL; } - status = get_params_size(avctx, vid_fmt, &total_size); - if (status) { - av_log(avctx, AV_LOG_ERROR, "Could not get parameter sets.\n"); - return status; - } + if (vtctx->get_param_set_func) { + status = get_params_size(avctx, vid_fmt, &total_size); + if (status) { + av_log(avctx, AV_LOG_ERROR, "Could not get parameter sets.\n"); + return status; + } - avctx->extradata = av_mallocz(total_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!avctx->extradata) { - return AVERROR(ENOMEM); - } - avctx->extradata_size = total_size; + avctx->extradata = av_mallocz(total_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!avctx->extradata) { + return AVERROR(ENOMEM); + } + avctx->extradata_size = total_size; - status = copy_param_sets(avctx, vid_fmt, avctx->extradata, total_size); + status = copy_param_sets(avctx, vid_fmt, avctx->extradata, total_size); - if (status) { - av_log(avctx, AV_LOG_ERROR, "Could not copy param sets.\n"); - return status; + if (status) { + av_log(avctx, AV_LOG_ERROR, "Could not copy param sets.\n"); + return status; + } + } else { + CFDataRef data = CMFormatDescriptionGetExtension(vid_fmt, kCMFormatDescriptionExtension_VerbatimSampleDescription); + if (data && CFGetTypeID(data) == CFDataGetTypeID()) { + CFIndex size = CFDataGetLength(data); + + avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!avctx->extradata) + return AVERROR(ENOMEM); + avctx->extradata_size = size; + + CFDataGetBytes(data, CFRangeMake(0, size), avctx->extradata); + } } return 0; @@ -1938,62 +1953,82 @@ static int vtenc_cm_to_avpacket( CMTime dts; CMVideoFormatDescriptionRef vid_fmt; - vtenc_get_frame_info(sample_buffer, &is_key_frame); - status = get_length_code_size(avctx, sample_buffer, &length_code_size); - if (status) return status; - add_header = is_key_frame && !(avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER); + if (vtctx->get_param_set_func) { + status = get_length_code_size(avctx, sample_buffer, &length_code_size); + if (status) return status; - if (add_header) { - vid_fmt = CMSampleBufferGetFormatDescription(sample_buffer); - if (!vid_fmt) { - av_log(avctx, AV_LOG_ERROR, "Cannot get format description.\n"); - return AVERROR_EXTERNAL; + add_header = is_key_frame && !(avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER); + + if (add_header) { + vid_fmt = CMSampleBufferGetFormatDescription(sample_buffer); + if (!vid_fmt) { + av_log(avctx, AV_LOG_ERROR, "Cannot get format description.\n"); + return AVERROR_EXTERNAL; + } + + int status = get_params_size(avctx, vid_fmt, &header_size); + if (status) return status; } - int status = get_params_size(avctx, vid_fmt, &header_size); - if (status) return status; - } + status = count_nalus(length_code_size, sample_buffer, &nalu_count); + if(status) + return status; - status = count_nalus(length_code_size, sample_buffer, &nalu_count); - if(status) - return status; + if (sei) { + size_t msg_size = get_sei_msg_bytes(sei, + SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35); - if (sei) { - size_t msg_size = get_sei_msg_bytes(sei, - SEI_TYPE_USER_DATA_REGISTERED_ITU_T_T35); + sei_nalu_size = sizeof(start_code) + 1 + msg_size + 1; + } - sei_nalu_size = sizeof(start_code) + 1 + msg_size + 1; - } + in_buf_size = CMSampleBufferGetTotalSampleSize(sample_buffer); + out_buf_size = header_size + + in_buf_size + + sei_nalu_size + + nalu_count * ((int)sizeof(start_code) - (int)length_code_size); - in_buf_size = CMSampleBufferGetTotalSampleSize(sample_buffer); - out_buf_size = header_size + - in_buf_size + - sei_nalu_size + - nalu_count * ((int)sizeof(start_code) - (int)length_code_size); + status = ff_get_encode_buffer(avctx, pkt, out_buf_size, 0); + if (status < 0) + return status; - status = ff_get_encode_buffer(avctx, pkt, out_buf_size, 0); - if (status < 0) - return status; + if (add_header) { + status = copy_param_sets(avctx, vid_fmt, pkt->data, out_buf_size); + if(status) return status; + } - if (add_header) { - status = copy_param_sets(avctx, vid_fmt, pkt->data, out_buf_size); - if(status) return status; - } + status = copy_replace_length_codes( + avctx, + length_code_size, + sample_buffer, + sei, + pkt->data + header_size, + pkt->size - header_size + ); - status = copy_replace_length_codes( - avctx, - length_code_size, - sample_buffer, - sei, - pkt->data + header_size, - pkt->size - header_size - ); + if (status) { + av_log(avctx, AV_LOG_ERROR, "Error copying packet data: %d\n", status); + return status; + } + } else { + CMBlockBufferRef buf = CMSampleBufferGetDataBuffer(sample_buffer); + if (!buf) { + av_log(avctx, AV_LOG_ERROR, "Error getting block buffer\n"); + return AVERROR_EXTERNAL; + } - if (status) { - av_log(avctx, AV_LOG_ERROR, "Error copying packet data: %d\n", status); - return status; + size_t len = CMBlockBufferGetDataLength(buf); + + status = ff_get_encode_buffer(avctx, pkt, len, 0); + if (status < 0) + return status; + + status = CMBlockBufferCopyDataBytes(buf, 0, len, pkt->data); + if (status) { + av_log(avctx, AV_LOG_ERROR, "Error copying packet data: %d\n", status); + return AVERROR_EXTERNAL; + } } if (is_key_frame) {