* [FFmpeg-devel] [PATCH v3] decklink: Add support for compressed AC-3 output over SDI
@ 2023-03-27 16:08 Devin Heitmueller
0 siblings, 0 replies; 4+ messages in thread
From: Devin Heitmueller @ 2023-03-27 16:08 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Devin Heitmueller
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.
Thanks to Marton Balint for providing feedback.
Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
---
libavdevice/decklink_enc.cpp | 94 ++++++++++++++++++++++++++++++------
1 file changed, 79 insertions(+), 15 deletions(-)
diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp
index 8d423f6b6e..a63aeaa088 100644
--- a/libavdevice/decklink_enc.cpp
+++ b/libavdevice/decklink_enc.cpp
@@ -32,6 +32,7 @@ extern "C" {
extern "C" {
#include "libavformat/avformat.h"
+#include "libavcodec/bytestream.h"
#include "libavutil/internal.h"
#include "libavutil/imgutils.h"
#include "avdevice.h"
@@ -243,19 +244,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 +280,45 @@ 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, 48000);
ctx->audio = 1;
return 0;
}
+static int create_s337_payload(AVPacket *pkt, enum AVCodecID codec_id, uint8_t **outbuf, int *outsize)
+{
+ int payload_size = pkt->size + 8;
+ uint16_t bitcount = pkt->size * 8;
+ uint8_t *s337_payload;
+ PutByteContext pb;
+
+ if (codec_id != AV_CODEC_ID_AC3)
+ return AVERROR(EINVAL);
+
+ /* Sanity check: According to SMPTE ST 340:2015 Sec 4.1, the AC-3 sync frame will
+ exactly match the 1536 samples of baseband (PCM) audio that it represents. */
+ if (pkt->size > 1536)
+ return AVERROR(EINVAL);
+
+ /* Encapsulate AC3 syncframe into SMPTE 337 packet */
+ s337_payload = (uint8_t *) av_malloc(payload_size);
+ if (s337_payload == NULL)
+ return AVERROR(ENOMEM);
+ bytestream2_init_writer(&pb, s337_payload, payload_size);
+ bytestream2_put_le16u(&pb, 0xf872); /* Sync word 1 */
+ bytestream2_put_le16u(&pb, 0x4e1f); /* Sync word 1 */
+ bytestream2_put_le16u(&pb, 0x0001); /* Burst Info, including data type (1=ac3) */
+ bytestream2_put_le16u(&pb, bitcount); /* Length code */
+ for (int i = 0; i < pkt->size; i += 2)
+ bytestream2_put_le16u(&pb, (pkt->data[i] << 8) | pkt->data[i+1]);
+
+ *outsize = payload_size;
+ *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 +576,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 < 0)
+ 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" {
--
2.35.1.655.ga68dfadae5
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* [FFmpeg-devel] [PATCH v3] decklink: Add support for compressed AC-3 output over SDI
@ 2023-03-27 16:47 Devin Heitmueller
2023-03-28 19:36 ` Marton Balint
0 siblings, 1 reply; 4+ messages in thread
From: Devin Heitmueller @ 2023-03-27 16:47 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Devin Heitmueller
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.
Thanks to Marton Balint for providing feedback.
Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
---
libavdevice/decklink_enc.cpp | 94 ++++++++++++++++++++++++++++++------
1 file changed, 79 insertions(+), 15 deletions(-)
diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp
index 8d423f6b6e..a63aeaa088 100644
--- a/libavdevice/decklink_enc.cpp
+++ b/libavdevice/decklink_enc.cpp
@@ -32,6 +32,7 @@ extern "C" {
extern "C" {
#include "libavformat/avformat.h"
+#include "libavcodec/bytestream.h"
#include "libavutil/internal.h"
#include "libavutil/imgutils.h"
#include "avdevice.h"
@@ -243,19 +244,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 +280,45 @@ 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, 48000);
ctx->audio = 1;
return 0;
}
+static int create_s337_payload(AVPacket *pkt, enum AVCodecID codec_id, uint8_t **outbuf, int *outsize)
+{
+ int payload_size = pkt->size + 8;
+ uint16_t bitcount = pkt->size * 8;
+ uint8_t *s337_payload;
+ PutByteContext pb;
+
+ if (codec_id != AV_CODEC_ID_AC3)
+ return AVERROR(EINVAL);
+
+ /* Sanity check: According to SMPTE ST 340:2015 Sec 4.1, the AC-3 sync frame will
+ exactly match the 1536 samples of baseband (PCM) audio that it represents. */
+ if (pkt->size > 1536)
+ return AVERROR(EINVAL);
+
+ /* Encapsulate AC3 syncframe into SMPTE 337 packet */
+ s337_payload = (uint8_t *) av_malloc(payload_size);
+ if (s337_payload == NULL)
+ return AVERROR(ENOMEM);
+ bytestream2_init_writer(&pb, s337_payload, payload_size);
+ bytestream2_put_le16u(&pb, 0xf872); /* Sync word 1 */
+ bytestream2_put_le16u(&pb, 0x4e1f); /* Sync word 1 */
+ bytestream2_put_le16u(&pb, 0x0001); /* Burst Info, including data type (1=ac3) */
+ bytestream2_put_le16u(&pb, bitcount); /* Length code */
+ for (int i = 0; i < pkt->size; i += 2)
+ bytestream2_put_le16u(&pb, (pkt->data[i] << 8) | pkt->data[i+1]);
+
+ *outsize = payload_size;
+ *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 +576,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 < 0)
+ 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" {
--
2.35.1.655.ga68dfadae5
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v3] decklink: Add support for compressed AC-3 output over SDI
2023-03-27 16:47 Devin Heitmueller
@ 2023-03-28 19:36 ` Marton Balint
2023-03-29 13:13 ` Devin Heitmueller
0 siblings, 1 reply; 4+ messages in thread
From: Marton Balint @ 2023-03-28 19:36 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Mon, 27 Mar 2023, Devin Heitmueller wrote:
> +static int create_s337_payload(AVPacket *pkt, enum AVCodecID codec_id, uint8_t **outbuf, int *outsize)
> +{
> + int payload_size = pkt->size + 8;
> + uint16_t bitcount = pkt->size * 8;
> + uint8_t *s337_payload;
> + PutByteContext pb;
> +
> + if (codec_id != AV_CODEC_ID_AC3)
> + return AVERROR(EINVAL);
The codec check might be overkill here, after all you are calling this
only from code which already checked this. Or later you extend this
somehow?
> +
> + /* Sanity check: According to SMPTE ST 340:2015 Sec 4.1, the AC-3 sync frame will
> + exactly match the 1536 samples of baseband (PCM) audio that it represents. */
> + if (pkt->size > 1536)
> + return AVERROR(EINVAL);
> +
> + /* Encapsulate AC3 syncframe into SMPTE 337 packet */
> + s337_payload = (uint8_t *) av_malloc(payload_size);
> + if (s337_payload == NULL)
> + return AVERROR(ENOMEM);
> + bytestream2_init_writer(&pb, s337_payload, payload_size);
> + bytestream2_put_le16u(&pb, 0xf872); /* Sync word 1 */
> + bytestream2_put_le16u(&pb, 0x4e1f); /* Sync word 1 */
> + bytestream2_put_le16u(&pb, 0x0001); /* Burst Info, including data type (1=ac3) */
> + bytestream2_put_le16u(&pb, bitcount); /* Length code */
> + for (int i = 0; i < pkt->size; i += 2)
> + bytestream2_put_le16u(&pb, (pkt->data[i] << 8) | pkt->data[i+1]);
This can overread/ovewrite 1 byte if pkt->size is odd.
Regards,
Marton
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH v3] decklink: Add support for compressed AC-3 output over SDI
2023-03-28 19:36 ` Marton Balint
@ 2023-03-29 13:13 ` Devin Heitmueller
0 siblings, 0 replies; 4+ messages in thread
From: Devin Heitmueller @ 2023-03-29 13:13 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Hi Marton,
Thanks for reviewing!
On Tue, Mar 28, 2023 at 3:37 PM Marton Balint <cus@passwd.hu> wrote:
> > + if (codec_id != AV_CODEC_ID_AC3)
> > + return AVERROR(EINVAL);
>
> The codec check might be overkill here, after all you are calling this
> only from code which already checked this. Or later you extend this
> somehow?
S337 encapsulation supports a number of different codecs, but I wanted to
be clear to any developers who looked at the code that this version
currently only supports AC-3. That said, you're right that you would never
fail this check without further code changes, so I can just change this to
a comment in case somebody comes along and wants to add support for other
codecs.
> > +
> > + /* Sanity check: According to SMPTE ST 340:2015 Sec 4.1, the AC-3
sync frame will
> > + exactly match the 1536 samples of baseband (PCM) audio that it
represents. */
> > + if (pkt->size > 1536)
> > + return AVERROR(EINVAL);
> > +
> > + /* Encapsulate AC3 syncframe into SMPTE 337 packet */
> > + s337_payload = (uint8_t *) av_malloc(payload_size);
> > + if (s337_payload == NULL)
> > + return AVERROR(ENOMEM);
> > + bytestream2_init_writer(&pb, s337_payload, payload_size);
> > + bytestream2_put_le16u(&pb, 0xf872); /* Sync word 1 */
> > + bytestream2_put_le16u(&pb, 0x4e1f); /* Sync word 1 */
> > + bytestream2_put_le16u(&pb, 0x0001); /* Burst Info, including data
type (1=ac3) */
> > + bytestream2_put_le16u(&pb, bitcount); /* Length code */
> > + for (int i = 0; i < pkt->size; i += 2)
> > + bytestream2_put_le16u(&pb, (pkt->data[i] << 8) |
pkt->data[i+1]);
>
> This can overread/ovewrite 1 byte if pkt->size is odd.
Fair point. I'll adjust the loop to write one fewer and handle the
remainder if present.
Devin
--
Devin Heitmueller, Senior Software Engineer
LTN Global Communications
o: +1 (301) 363-1001
w: https://ltnglobal.com e: devin.heitmueller@ltnglobal.com
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-29 13:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-27 16:08 [FFmpeg-devel] [PATCH v3] decklink: Add support for compressed AC-3 output over SDI Devin Heitmueller
2023-03-27 16:47 Devin Heitmueller
2023-03-28 19:36 ` Marton Balint
2023-03-29 13:13 ` Devin Heitmueller
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git