From patchwork Fri Dec 29 18:12:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 7017 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp10786237jad; Fri, 29 Dec 2017 10:13:56 -0800 (PST) X-Google-Smtp-Source: ACJfBovGmcJetEKYNna1+IY+ZoihyeeQcR6300okvEUitzYvhAb12Zv8Yv1JiQ0w973JjRlXPlpd X-Received: by 10.28.209.77 with SMTP id i74mr29599422wmg.53.1514571236487; Fri, 29 Dec 2017 10:13:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514571236; cv=none; d=google.com; s=arc-20160816; b=l6R9o7Vulsa2VKpqrle7zXcQb7C0ac2B0JFFl81DfIvmva3YUAAYI5Oq0ly8CKjDmf EXeqcA2el1yWUEhqMqsGFbg7e4omhTdm9Gy+xAsxgx0pXtyRUdYPPawxZ23B0sbSNNO5 WEdIj5JZWWLpYKGg1ccwoE0Sd9RVRhbMc2m/53r1Qhy+oMVh+bOmKvHYgplgTSRMZSCB d7pUAjyhY5wt2qOjDLz5xK/Hy7dk0x20yIgbjr7bRHk2b/70YYjBR8ob2Nks2xMZRF5R YSLLlrveg4HA+05cYHTuK88QhJpGzxzgV0MkGXLHW9WetANEwtGppvfVjaJh2cpmPAAD Feeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=q+r41ztqzRFhOeTYmjLKEGRoNw1pIQC808VDy3N/djo=; b=X3HPprte6bKh7jf4UYmGfOJzibesSKkaHG+gRaYv8sOh5IH7tKxJ52HZ/aSXs2ruxi TXY2yYlmcMw94mn3Kc5QJIdcQzo6TWTZSFQtjdWUUKbINlynjlhuQQI4yXwxBl7ZBZpg hSpoPs/kMUapsh4/ti9LK/U0rW+VW0dEyPsXDI8O6raigCjOZAw7zIBvLxcC1xSxBpYA W+RULvbsMQYNF8DRfAO90q5jlt0NB5Zu4kKT8QXDzjN0wLk3Ac3fsceMdcJhNh6r2i8h qq0WS4NI0qevfVLd5u7GdJN2pOaAdVaidlmHQglA1zHK1NliwrE5I8305kt8MRckDvHr nXsA== ARC-Authentication-Results: i=1; mx.google.com; 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 d124si16376634wmc.90.2017.12.29.10.13.56; Fri, 29 Dec 2017 10:13:56 -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; 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 3740B689C48; Fri, 29 Dec 2017 20:12:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from was-smtp1.livetimenet.net (50-206-97-56-static.hfc.comcastbusiness.net [50.206.97.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A27E1689C17 for ; Fri, 29 Dec 2017 20:12:45 +0200 (EET) Received: by was-smtp1.livetimenet.net with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.84_2) (envelope-from ) id 1eUz9N-0002Cw-SC; Fri, 29 Dec 2017 13:12:59 -0500 From: Devin Heitmueller To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Dec 2017 13:12:30 -0500 Message-Id: <20171229181230.99473-9-dheitmueller@ltnglobal.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171229181230.99473-1-dheitmueller@ltnglobal.com> References: <20171229181230.99473-1-dheitmueller@ltnglobal.com> X-Spam-Score: -1.9 (-) Subject: [FFmpeg-devel] [PATCH 8/8] decklink: Add support for compressed AC-3 output over SDI 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 Cc: jgreen@ltnglobal.com, Devin Heitmueller MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 | 101 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 86 insertions(+), 15 deletions(-) diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 59a4181e19..aca3c13861 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -224,19 +224,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->channels != 2 && c->channels != 8 && c->channels != 16) { - av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels!" - " Only 2, 8 or 16 channels are supported.\n"); + + if (st->codecpar->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 (st->codecpar->codec_id == AV_CODEC_ID_PCM_S16LE) { + if (c->channels != 2 && c->channels != 8 && c->channels != 16) { + av_log(avctx, AV_LOG_ERROR, "Unsupported number of channels!" + " Only 2, 8 or 16 channels are supported.\n"); + return -1; + } + if (c->sample_rate != bmdAudioSampleRate48kHz) { + av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate!" + " Only 48kHz is supported.\n"); + return -1; + } + ctx->channels = c->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->channels, + ctx->channels, bmdAudioOutputStreamTimestamped) != S_OK) { av_log(avctx, AV_LOG_ERROR, "Could not enable audio output!\n"); return -1; @@ -247,8 +260,7 @@ 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->channels; + avpriv_set_pts_info(st, 64, 1, bmdAudioSampleRate48kHz); ctx->audio = 1; @@ -536,25 +548,84 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt) 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; + + /* Encapsulate AC3 syncframe into SMPTE 337 packet */ + *outsize = (pkt->size + 4) * sizeof(uint16_t); + s337_payload = (uint8_t *) av_mallocz(*outsize); + if (s337_payload == NULL) + return AVERROR(ENOMEM); + + *outbuf = s337_payload; + + /* 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 */ + + if (codec_id == AV_CODEC_ID_AC3) { + s337_payload[4] = 0x01; + } else { + return AVERROR(EINVAL); + } + + 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; + } + + return 0; +} + 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; buffercount_type 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 */ + ret = create_s337_payload(pkt, st->codecpar->codec_id, + &outbuf, &sample_count); + if (ret != 0) + goto done; + } 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); + goto done; } - return 0; +done: + if (st->codecpar->codec_id == AV_CODEC_ID_AC3) + av_free(outbuf); + + return ret; } extern "C" {