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 C01A9400CF for ; Sun, 19 Dec 2021 16:41:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B50268AED4; Sun, 19 Dec 2021 18:41:12 +0200 (EET) Received: from mail-ua1-f46.google.com (mail-ua1-f46.google.com [209.85.222.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3633268A92E for ; Sun, 19 Dec 2021 18:41:03 +0200 (EET) Received: by mail-ua1-f46.google.com with SMTP id p37so13632042uae.8 for ; Sun, 19 Dec 2021 08:41:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=/n/z4zoZVONij4uyfwESBnRqp+kkL8WYFZfN6nBoPX0=; b=jE+8HxKNKLlzU/lqfCtSTXmmhOeC1FxuoaMbeGMe56VpKrSiEvGC8TAnFI5dLk4zmj tiCYzljX/PRcFqqyBcFKEBrybT0a9GabhyEbU2JRKISjmE6/pEQz5GlVJwZ9H+S2IIg3 plR5yWT7zavi9uyykCjTl+v7+Fqq9tY8shmreO1wgnN1zINSbdXeA4xvwKYUEwPzgeIr pNn7vY0NwF5Tbjc2Y7Xm6Mho1BLjY9tomL7JpyfBXLO/CTItKSjkPJA4tE/dkbQi1Ev/ GtGU+I56L9Vg+LoZyZQ87HC3Ru+1Bsi9gI3vKPjYumtX8WsLpU2271ScueyOLR5Q+Iaq 7xvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=/n/z4zoZVONij4uyfwESBnRqp+kkL8WYFZfN6nBoPX0=; b=XS4W3pl9mfJKVjBAwZyQppoqQ5zpL9WMoLFUxXdHVvKqqJkkqcax95qaJwRyKThbLP 5Rg/TYQs02Ul5pvcfpd0SYUPscOxXPgHIL1xk7mSZDv9q5RzHxJGSPRSjKlN0tcHqE3T PIv6QKSBUUMhSfawek0vxP2n5Hm2DIIWcUZvtWmhU2fFk32y1UwD+H9BdUjhGZFbnGCc Ho1KUIuN/bCWzG83hkuzcPkG4wkLDvLcJ/bWRk6HpjD0WUi9Py5x2IZ41R3WRUBgnMk3 0Wia+zQ3+N+EdYx8T7ws799aBLYC2A6WLQOXcb42mS1VDu0uy0eY1wzVvWR+iFii1y8F 9CcQ== X-Gm-Message-State: AOAM530pyNOvoedQdKINwottAjqsX//sITxQifi2IzrmSJxSCxRqwEdh 4OFDcgOqGofehrb/qwnSDmK0+aMNFSj+jzZdWaqK3L2PZiM= X-Google-Smtp-Source: ABdhPJwQs1C+cwq02YrugOWHD1/OGEHq6MRTI+RNq9/T7/Q0SnsWqG/e28ziOqiszgITmAx9CZPsGZj0aV+YAxCLvfg= X-Received: by 2002:a05:6102:3910:: with SMTP id e16mr3833537vsu.0.1639932061708; Sun, 19 Dec 2021 08:41:01 -0800 (PST) MIME-Version: 1.0 References: <20211217001215.75135-1-rcombs@rcombs.me> <20211217001215.75135-8-rcombs@rcombs.me> In-Reply-To: <20211217001215.75135-8-rcombs@rcombs.me> From: Rick Kern Date: Sun, 19 Dec 2021 11:40:49 -0500 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [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 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: On Thu, Dec 16, 2021 at 7:13 PM rcombs wrote: > --- > 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); > The declaration should be at the beginning of the block. > + > + 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) { > -- > 2.33.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". > _______________________________________________ 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".