From patchwork Mon Apr 5 16:54:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thilo Borgmann X-Patchwork-Id: 26764 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0204544AFA2 for ; Mon, 5 Apr 2021 19:55:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9CCD689B43; Mon, 5 Apr 2021 19:55:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from shout02.mail.de (shout02.mail.de [62.201.172.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E1D9687FEC for ; Mon, 5 Apr 2021 19:54:56 +0300 (EEST) Received: from postfix01.mail.de (postfix02.bt.mail.de [10.0.121.126]) by shout02.mail.de (Postfix) with ESMTP id F3147C021F for ; Mon, 5 Apr 2021 18:54:55 +0200 (CEST) Received: from smtp04.mail.de (smtp04.bt.mail.de [10.0.121.214]) by postfix01.mail.de (Postfix) with ESMTP id DA554A005C for ; Mon, 5 Apr 2021 18:54:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mail.de; s=mailde202009; t=1617641695; bh=nzN/YVi5TzlPl7FSJ1A76ZAsUugQYCGEkAiF3AYdWhI=; h=To:From:Subject:Date:From; b=RSnrBHF2b85ROfo7UP8l5CKw/biKaliTncwqIDFVUMAODKeyE1a3Apvc0Y8IotL05 fOoD4BpOWoyBjeDmaWFRiZQ6iBJNb3UOEWKS+vp7Lc7RxYgvQtfP4yZZrrvTCyegUR V9q5j5qr3ktlkpjUI/psNcvIQnB4ZGVIVwYe/NJXDxlBskpviv7wtiPehjwDdiWA66 sNF0/yroNs9cjYUVg7fpCpr5rPQm1P5fHGaBZ8aoXEUh8md7V/GFLvdTSZ7cGhqYzi Csf/CFG3D3apDC2QS7SG9pgf+0ZA+N3Y3yz8IDncok+CTCabt8JxAj8z6YvmYM2w78 GtN0e2CGDBtoQ== Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by smtp04.mail.de (Postfix) with ESMTPSA id E9B8EC1363 for ; Mon, 5 Apr 2021 18:54:54 +0200 (CEST) To: FFmpeg development discussions and patches From: Thilo Borgmann Message-ID: <5842508d-32f6-3073-8d1f-9ea8819d92a4@mail.de> Date: Mon, 5 Apr 2021 18:54:54 +0200 MIME-Version: 1.0 Content-Language: en-US X-purgate: clean X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 4232 X-purgate-ID: 154282::1617641695-00000F4D-C8866FE4/0/0 Subject: [FFmpeg-devel] [PATCH] lavd/avfoundation: Allow to change interleaving of samples on the fly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Hi, seems like someone at Apple thought its a good idea to allow this inside the framework.... -Thilo From e44b0e0e338043660fe59f66b01cc24729cc241f Mon Sep 17 00:00:00 2001 From: Thilo Borgmann Date: Tue, 2 Mar 2021 23:23:06 +0100 Subject: [PATCH] lavd/avfoundation: Allow to change interleaving of samples on the fly --- libavdevice/avfoundation.m | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index 59d5b0af4f..20d2a3b241 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -736,7 +736,6 @@ static int get_audio_config(AVFormatContext *s) return 1; } - if (ctx->audio_non_interleaved) { CMBlockBufferRef block_buffer = CMSampleBufferGetDataBuffer(ctx->current_audio_frame); ctx->audio_buffer_size = CMBlockBufferGetDataLength(block_buffer); ctx->audio_buffer = av_malloc(ctx->audio_buffer_size); @@ -744,7 +743,6 @@ static int get_audio_config(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "error allocating audio buffer\n"); return 1; } - } CFRelease(ctx->current_audio_frame); ctx->current_audio_frame = nil; @@ -1103,12 +1101,24 @@ static int avf_read_packet(AVFormatContext *s, AVPacket *pkt) CMBlockBufferRef block_buffer = CMSampleBufferGetDataBuffer(ctx->current_audio_frame); int block_buffer_size = CMBlockBufferGetDataLength(block_buffer); + CMFormatDescriptionRef format_desc = CMSampleBufferGetFormatDescription(ctx->current_audio_frame); + AudioStreamBasicDescription *basic_desc = CMAudioFormatDescriptionGetStreamBasicDescription(format_desc); + if (!block_buffer || !block_buffer_size) { return AVERROR(EIO); } - if (ctx->audio_non_interleaved && block_buffer_size > ctx->audio_buffer_size) { - return AVERROR_BUFFER_TOO_SMALL; + if (basic_desc) { + ctx->audio_non_interleaved = basic_desc->mFormatFlags & kAudioFormatFlagIsNonInterleaved; + } + + if (block_buffer_size > ctx->audio_buffer_size) { + ctx->audio_buffer_size = block_buffer_size; + ctx->audio_buffer = av_realloc(ctx->audio_buffer, block_buffer_size); + if (!ctx->audio_buffer) { + av_log(s, AV_LOG_ERROR, "error allocating audio buffer\n"); + return 1; + } } if (av_new_packet(pkt, block_buffer_size) < 0) {