From patchwork Thu Mar 9 14:08:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 40626 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp362842pzb; Thu, 9 Mar 2023 06:08:33 -0800 (PST) X-Google-Smtp-Source: AK7set+UzdBqXaVQnmWJd8DzSx2uuqcmDgLyXTWil1hSmED4NxwBrhrk2xGS1zdHpD5BQ1Hd5jLo X-Received: by 2002:aa7:ccc7:0:b0:4ac:c4ed:f1d5 with SMTP id y7-20020aa7ccc7000000b004acc4edf1d5mr18819918edt.1.1678370913682; Thu, 09 Mar 2023 06:08:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678370913; cv=none; d=google.com; s=arc-20160816; b=QGjBy54Nwc0+QAUhYioAECEP+MQRRGsx/7pTZO2uPO4eWnN8ZTqfXoagZyXd7spOjP +bPtqcFOvOo5fMxRXyBENU/sHOvKtPnC18iSqBnNN3kzfRksxNtmmZKxQumduOPInrR9 oUfLBMMBSmWnVQh6MJ1y5SNKQJvrvVlBA/TINdR0oywuVDnGOEbVdPuTKLWKFuEr5DNm xggLUSau3jpx6cXi/RjCvlto9zic+QqUHsa8If0kZG7XqaYchnTPWtffZ2Ay0LEAkh4P yrzj+JYnaJAnUTfa+fhjcorxkE0W9AK7r48Mvm2c0eJ8O4GPuFqXd2Nm/BRnxAa6MLtf oxFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=fEFUDrevDwisIr1K4+sDzG+dLDL0E0hX74SYi2KXstU=; b=FP+mjfmq0MFjX4wklh8NYcwCpuszd03RU3g6g86RyXeW1iUqb7n43SPIAxqZhwm6KZ 2i3cYUxCLynq4/vRBLKHDxRJG2Vc+7Lvx6fmwv7aWfPb5IaAlUaAwQW4lWDWY3GntcFl ZYLxkR4jTn96EXKUSb9PCseZW5EfUkuduGb2PP5HT9A0CczeKX5eaG+QmVycxmIRr1A9 1ixjA233J8V1qzucxb4U1SCvie2TBhb0RzV9nVDby1BuI9TS0J0oFJ12mYFZq7KQJDx3 NiSVT2ZXYvGP+04ej7u51xD9qq0ASfGHNOjkDq8emDTkTrXMY+ijVEpHd5igckqQAG+n lndA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=eHzzSuD0; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sh6-20020a1709076e8600b008ddf3c18313si9395914ejc.729.2023.03.09.06.08.23; Thu, 09 Mar 2023 06:08:33 -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=@ltnglobal-com.20210112.gappssmtp.com header.s=20210112 header.b=eHzzSuD0; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 175AA68BCDA; Thu, 9 Mar 2023 16:08:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53BB568BCDA for ; Thu, 9 Mar 2023 16:08:13 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id d7so1963803qtr.12 for ; Thu, 09 Mar 2023 06:08:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ltnglobal-com.20210112.gappssmtp.com; s=20210112; t=1678370892; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tiJGSjuU35jauyW6kWTu2AXsfYA7AcJkalvj8EMbFjs=; b=eHzzSuD0FYVUCQhxPOrgUAbRWbQSKozEyKbS8rGsj3MTxN2llxZEpxX8tnvoX18MXd 1bJyghAr/cH92XcGzjAkgSCV8fz1jsZNuJykEb1pf4sWCg0N77qbUIXdSXaRboM11dDm 5kw4qFu3wDGJNh4wg6FFwX0zDJRy8b10zL9RVgvKS7ogABTp/nRLS5OU1oN8H7Osw+ou /qk133SxWgsK5g4QVs1ughOSNX6TbyvQse2bvOnk9zI4LDo+qJ323zPfn8aeEBGj1iw8 YDqNjTh0KzX25oVGOOz7gUUBJKM2TFbSTpU/drznHCkxYFdKSyLhicq/geFHJv7ReNSh kkaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678370892; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tiJGSjuU35jauyW6kWTu2AXsfYA7AcJkalvj8EMbFjs=; b=hmovk/iAJN7kU33Bos8vRSsTyYDguHJt7Qy1obXWkL0huQbBfs3rumQLhgD/Q+Qfc3 zX+zINqsxecd76kP2WmUNQHV7aWap1rVdr6JAxUxXq6QDDInL44mme7svWBsHedIo1Ng nEjszFnlwewHU7P8QUXtky7VsEXK4G+rBA2JzPDsXUlAHoOyLJ+qC2+hLQAMxbHr6nnL lHeTT9XCOTlC4R+68r/l6w+GqR/XLdaNro+ELZTktVuwLsqfTzMAhNbM6RQ1oKoWBcsL MPQoKZA87jOMTdzo4/e4s4UKAYonoFK1H1OTGIN/yPjqDB/1A1MdlEIuHiLrsPrXMB8i JadQ== X-Gm-Message-State: AO0yUKVu7TQl+lm1w/Byv06W3bmE0Ely21KLlP12kVbgCG4MPvgh2gFb Bj3ZOyEzgxjz8lNStXHYbzN9320Us9/AJ/BRORY= X-Received: by 2002:ac8:5e0e:0:b0:3b9:e4cf:ce2d with SMTP id h14-20020ac85e0e000000b003b9e4cfce2dmr36538216qtx.16.1678370891682; Thu, 09 Mar 2023 06:08:11 -0800 (PST) Received: from klab-nyc-kernellabs2.localdomain (pool-71-105-132-214.nycmny.fios.verizon.net. [71.105.132.214]) by smtp.gmail.com with ESMTPSA id g12-20020ac8124c000000b003b635a5d56csm13690064qtj.30.2023.03.09.06.08.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Mar 2023 06:08:11 -0800 (PST) From: Devin Heitmueller X-Google-Original-From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Mar 2023 09:08:08 -0500 Message-Id: <20230309140808.5946-1-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.35.1.655.ga68dfadae5 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] decklink: Add support for compressed AC-3 output over SDI 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: Devin Heitmueller Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qWFhw0ALd33t Extend the decklink output to include support for compressed AC-3, encapsulated using the SMPTE ST 377:2015 standard. This functionality can be exercised by using the "copy" codec when the input audio stream is AC-3. For example: ./ffmpeg -i ~/foo.ts -codec:a copy -f decklink 'UltraStudio Mini Monitor' Note that the default behavior continues to be to do PCM output, which means without specifying the copy codec a stream containing AC-3 will be decoded and downmixed to stereo audio before output. Signed-off-by: Devin Heitmueller --- libavdevice/decklink_enc.cpp | 97 ++++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 15 deletions(-) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 8d423f6b6e..51a2bb4aad 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -243,19 +243,32 @@ static int decklink_setup_audio(AVFormatContext *avctx, AVStream *st) av_log(avctx, AV_LOG_ERROR, "Only one audio stream is supported!\n"); return -1; } - if (c->sample_rate != 48000) { - av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate!" - " Only 48kHz is supported.\n"); - return -1; - } - if (c->ch_layout.nb_channels != 2 && c->ch_layout.nb_channels != 8 && c->ch_layout.nb_channels != 16) { - av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels!" - " Only 2, 8 or 16 channels are supported.\n"); + + if (c->codec_id == AV_CODEC_ID_AC3) { + /* Regardless of the number of channels in the codec, we're only + using 2 SDI audio channels at 48000Hz */ + ctx->channels = 2; + } else if (c->codec_id == AV_CODEC_ID_PCM_S16LE) { + if (c->sample_rate != 48000) { + av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate!" + " Only 48kHz is supported.\n"); + return -1; + } + if (c->ch_layout.nb_channels != 2 && c->ch_layout.nb_channels != 8 && c->ch_layout.nb_channels != 16) { + av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels!" + " Only 2, 8 or 16 channels are supported.\n"); + return -1; + } + ctx->channels = c->ch_layout.nb_channels; + } else { + av_log(avctx, AV_LOG_ERROR, "Unsupported codec specified!" + " Only PCM_S16LE and AC-3 are supported.\n"); return -1; } + if (ctx->dlo->EnableAudioOutput(bmdAudioSampleRate48kHz, bmdAudioSampleType16bitInteger, - c->ch_layout.nb_channels, + ctx->channels, bmdAudioOutputStreamTimestamped) != S_OK) { av_log(avctx, AV_LOG_ERROR, "Could not enable audio output!\n"); return -1; @@ -266,14 +279,49 @@ static int decklink_setup_audio(AVFormatContext *avctx, AVStream *st) } /* The device expects the sample rate to be fixed. */ - avpriv_set_pts_info(st, 64, 1, c->sample_rate); - ctx->channels = c->ch_layout.nb_channels; + avpriv_set_pts_info(st, 64, 1, bmdAudioSampleRate48kHz); ctx->audio = 1; return 0; } +static int create_s337_payload(AVPacket *pkt, enum AVCodecID codec_id, uint8_t **outbuf, int *outsize) +{ + uint8_t *s337_payload; + uint8_t *s337_payload_start; + int i; + + if (codec_id != AV_CODEC_ID_AC3) + return AVERROR(EINVAL); + + /* Encapsulate AC3 syncframe into SMPTE 337 packet */ + *outsize = pkt->size + 8; + s337_payload = (uint8_t *) av_mallocz(*outsize); + if (s337_payload == NULL) + return AVERROR(ENOMEM); + + /* Construct SMPTE S337 Burst preamble */ + s337_payload[0] = 0x72; /* Sync Word 1 */ + s337_payload[1] = 0xf8; /* Sync Word 1 */ + s337_payload[2] = 0x1f; /* Sync Word 1 */ + s337_payload[3] = 0x4e; /* Sync Word 1 */ + s337_payload[4] = 0x01; /* Burst Info, including data type (1=ac3) */ + s337_payload[5] = 0x00; + uint16_t bitcount = pkt->size * 8; + s337_payload[6] = bitcount & 0xff; /* Length code */ + s337_payload[7] = bitcount >> 8; /* Length code */ + s337_payload_start = &s337_payload[8]; + for (i = 0; i < pkt->size; i += 2) { + s337_payload_start[0] = pkt->data[i+1]; + s337_payload_start[1] = pkt->data[i]; + s337_payload_start += 2; + } + + *outbuf = s337_payload; + return 0; +} + av_cold int ff_decklink_write_trailer(AVFormatContext *avctx) { struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; @@ -531,21 +579,40 @@ static int decklink_write_audio_packet(AVFormatContext *avctx, AVPacket *pkt) { struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; - int sample_count = pkt->size / (ctx->channels << 1); + AVStream *st = avctx->streams[pkt->stream_index]; + int sample_count; uint32_t buffered; + uint8_t *outbuf = NULL; + int ret = 0; ctx->dlo->GetBufferedAudioSampleFrameCount(&buffered); if (pkt->pts > 1 && !buffered) av_log(avctx, AV_LOG_WARNING, "There's no buffered audio." " Audio will misbehave!\n"); - if (ctx->dlo->ScheduleAudioSamples(pkt->data, sample_count, pkt->pts, + if (st->codecpar->codec_id == AV_CODEC_ID_AC3) { + /* Encapsulate AC3 syncframe into SMPTE 337 packet */ + int outbuf_size; + ret = create_s337_payload(pkt, st->codecpar->codec_id, + &outbuf, &outbuf_size); + if (ret) + return ret; + sample_count = outbuf_size / 4; + } else { + sample_count = pkt->size / (ctx->channels << 1); + outbuf = pkt->data; + } + + if (ctx->dlo->ScheduleAudioSamples(outbuf, sample_count, pkt->pts, bmdAudioSampleRate48kHz, NULL) != S_OK) { av_log(avctx, AV_LOG_ERROR, "Could not schedule audio samples.\n"); - return AVERROR(EIO); + ret = AVERROR(EIO); } - return 0; + if (st->codecpar->codec_id == AV_CODEC_ID_AC3) + av_freep(&outbuf); + + return ret; } extern "C" {