/*
- * IEC958 muxer
+ * IEC 61937 muxer
* Copyright (c) 2009 Bartlomiej Wolowiec
* Copyright (c) 2010 Anssi Hannula
* Copyright (c) 2010 Carl Eugen Hoyos
/*
* Terminology used in specification:
- * data-burst - IEC958 frame, contains header and encapsuled frame
- * burst-preambule - IEC958 frame header, contains 16-bits words named Pa, Pb, Pc and Pd
+ * data-burst - IEC61937 frame, contains header and encapsuled frame
+ * burst-preambule - IEC61937 frame header, contains 16-bits words named Pa, Pb, Pc and Pd
* burst-payload - encapsuled frame
* Pa, Pb - syncword - 0xF872, 0x4E1F
* Pc - burst-info, contains data-type (bits 0-6), error flag (bit 7), data-type-dependent info (bits 8-12)
* data-type - determines type of encapsuled frames
* Pd - length code (number of bits or bytes of encapsuled frame - according to data_type)
*
- * IEC958 frames at normal usage start every specific count of bytes,
+ * IEC 61937 frames at normal usage start every specific count of bytes,
* dependent from data-type (spaces between packets are filled by zeros)
*/
#include "libavcodec/dca.h"
#include "libavcodec/aacadtsdec.h"
-typedef struct IEC958Context {
- enum IEC958DataType data_type; ///< burst info - reference to type of payload of the data-burst
+typedef struct IEC61937Context {
+ enum IEC61937DataType data_type;///< burst info - reference to type of payload of the data-burst
int length_code; ///< length code in bits or bytes, depending on data type
int pkt_offset; ///< data burst repetition period in bytes
uint8_t *buffer; ///< allocated buffer, used for swap bytes
uint8_t *out_buf; ///< pointer to the outgoing data before byte-swapping
int out_bytes; ///< amount of outgoing bytes
+ int use_preamble; ///< preamble enabled (disabled for exactly pre-padded DTS)
int extra_bswap; ///< extra bswap for payload (for LE DTS => standard BE DTS)
uint8_t *hd_buf; ///< allocated buffer to concatenate hd audio frames
/// function, which generates codec dependent header information.
/// Sets data_type and pkt_offset, and length_code, out_bytes, out_buf if necessary
int (*header_info) (AVFormatContext *s, AVPacket *pkt);
-} IEC958Context;
+} IEC61937Context;
static int spdif_header_ac3(AVFormatContext *s, AVPacket *pkt)
{
- IEC958Context *ctx = s->priv_data;
- int bitstream_mode = pkt->data[6] & 0x7;
+ IEC61937Context *ctx = s->priv_data;
+ int bitstream_mode = pkt->data[5] & 0x7;
- ctx->data_type = IEC958_AC3 | (bitstream_mode << 8);
+ ctx->data_type = IEC61937_AC3 | (bitstream_mode << 8);
ctx->pkt_offset = AC3_FRAME_SIZE << 2;
return 0;
}
static int spdif_header_eac3(AVFormatContext *s, AVPacket *pkt)
{
- IEC958Context *ctx = s->priv_data;
+ IEC61937Context *ctx = s->priv_data;
static const uint8_t eac3_repeat[4] = {6, 3, 2, 1};
int repeat = 1;
ctx->pkt_offset = 0;
return 0;
}
- ctx->data_type = IEC958_EAC3;
+ ctx->data_type = IEC61937_EAC3;
ctx->pkt_offset = 24576;
ctx->out_buf = ctx->hd_buf;
ctx->out_bytes = ctx->hd_buf_filled;
static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt)
{
- IEC958Context *ctx = s->priv_data;
+ IEC61937Context *ctx = s->priv_data;
uint32_t syncword_dts = AV_RB32(pkt->data);
int blocks;
}
blocks++;
switch (blocks) {
- case 512 >> 5: ctx->data_type = IEC958_DTS1; break;
- case 1024 >> 5: ctx->data_type = IEC958_DTS2; break;
- case 2048 >> 5: ctx->data_type = IEC958_DTS3; break;
+ case 512 >> 5: ctx->data_type = IEC61937_DTS1; break;
+ case 1024 >> 5: ctx->data_type = IEC61937_DTS2; break;
+ case 2048 >> 5: ctx->data_type = IEC61937_DTS3; break;
default:
av_log(s, AV_LOG_ERROR, "%i samples in DTS frame not supported\n",
blocks << 5);
}
ctx->pkt_offset = blocks << 7;
+ if (ctx->out_bytes == ctx->pkt_offset) {
+ /* The DTS stream fits exactly into the output stream, so skip the
+ * preamble as it would not fit in there. This is the case for dts
+ * discs and dts-in-wav. */
+ ctx->use_preamble = 0;
+ }
+
return 0;
}
-static const enum IEC958DataType mpeg_data_type[2][3] = {
+static const enum IEC61937DataType mpeg_data_type[2][3] = {
// LAYER1 LAYER2 LAYER3
- { IEC958_MPEG2_LAYER1_LSF, IEC958_MPEG2_LAYER2_LSF, IEC958_MPEG2_LAYER3_LSF }, //MPEG2 LSF
- { IEC958_MPEG1_LAYER1, IEC958_MPEG1_LAYER23, IEC958_MPEG1_LAYER23 }, //MPEG1
+ { IEC61937_MPEG2_LAYER1_LSF, IEC61937_MPEG2_LAYER2_LSF, IEC61937_MPEG2_LAYER3_LSF },//MPEG2 LSF
+ { IEC61937_MPEG1_LAYER1, IEC61937_MPEG1_LAYER23, IEC61937_MPEG1_LAYER23 }, //MPEG1
};
static int spdif_header_mpeg(AVFormatContext *s, AVPacket *pkt)
{
- IEC958Context *ctx = s->priv_data;
+ IEC61937Context *ctx = s->priv_data;
int version = (pkt->data[1] >> 3) & 3;
int layer = 3 - ((pkt->data[1] >> 1) & 3);
int extension = pkt->data[2] & 1;
}
av_log(s, AV_LOG_DEBUG, "version: %i layer: %i extension: %i\n", version, layer, extension);
if (version == 2 && extension) {
- ctx->data_type = IEC958_MPEG2_EXT;
+ ctx->data_type = IEC61937_MPEG2_EXT;
ctx->pkt_offset = 4608;
} else {
ctx->data_type = mpeg_data_type [version & 1][layer];
static int spdif_header_aac(AVFormatContext *s, AVPacket *pkt)
{
- IEC958Context *ctx = s->priv_data;
+ IEC61937Context *ctx = s->priv_data;
AACADTSHeaderInfo hdr;
GetBitContext gbc;
int ret;
ctx->pkt_offset = hdr.samples << 2;
switch (hdr.num_aac_frames) {
case 1:
- ctx->data_type = IEC958_MPEG2_AAC;
+ ctx->data_type = IEC61937_MPEG2_AAC;
break;
case 2:
- ctx->data_type = IEC958_MPEG2_AAC_LSF_2048;
+ ctx->data_type = IEC61937_MPEG2_AAC_LSF_2048;
break;
case 4:
- ctx->data_type = IEC958_MPEG2_AAC_LSF_4096;
+ ctx->data_type = IEC61937_MPEG2_AAC_LSF_4096;
break;
default:
av_log(s, AV_LOG_ERROR, "%i samples in AAC frame not supported\n",
static int spdif_header_truehd(AVFormatContext *s, AVPacket *pkt)
{
- IEC958Context *ctx = s->priv_data;
+ IEC61937Context *ctx = s->priv_data;
int mat_code_length = 0;
const char mat_end_code[16] = { 0xC3, 0xC2, 0xC0, 0xC4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x97, 0x11 };
memcpy(&ctx->hd_buf[MAT_FRAME_SIZE - sizeof(mat_end_code)], mat_end_code, sizeof(mat_end_code));
ctx->hd_buf_count = 0;
- ctx->data_type = IEC958_TRUEHD;
+ ctx->data_type = IEC61937_TRUEHD;
ctx->pkt_offset = 61440;
ctx->out_buf = ctx->hd_buf;
ctx->out_bytes = MAT_FRAME_SIZE;
static int spdif_write_header(AVFormatContext *s)
{
- IEC958Context *ctx = s->priv_data;
+ IEC61937Context *ctx = s->priv_data;
switch (s->streams[0]->codec->codec_id) {
case CODEC_ID_AC3:
static int spdif_write_trailer(AVFormatContext *s)
{
- IEC958Context *ctx = s->priv_data;
+ IEC61937Context *ctx = s->priv_data;
av_freep(&ctx->buffer);
av_freep(&ctx->hd_buf);
return 0;
static int spdif_write_packet(struct AVFormatContext *s, AVPacket *pkt)
{
- IEC958Context *ctx = s->priv_data;
+ IEC61937Context *ctx = s->priv_data;
int ret, padding;
ctx->out_buf = pkt->data;
ctx->out_bytes = pkt->size;
ctx->length_code = FFALIGN(pkt->size, 2) << 3;
+ ctx->use_preamble = 1;
ctx->extra_bswap = 0;
ret = ctx->header_info(s, pkt);
if (!ctx->pkt_offset)
return 0;
- padding = (ctx->pkt_offset - BURST_HEADER_SIZE - ctx->out_bytes) >> 1;
+ padding = (ctx->pkt_offset - ctx->use_preamble * BURST_HEADER_SIZE - ctx->out_bytes) & ~1;
if (padding < 0) {
av_log(s, AV_LOG_ERROR, "bitrate is too high\n");
return AVERROR(EINVAL);
}
- put_le16(s->pb, SYNCWORD1); //Pa
- put_le16(s->pb, SYNCWORD2); //Pb
- put_le16(s->pb, ctx->data_type); //Pc
- put_le16(s->pb, ctx->length_code);//Pd
+ if (ctx->use_preamble) {
+ put_le16(s->pb, SYNCWORD1); //Pa
+ put_le16(s->pb, SYNCWORD2); //Pb
+ put_le16(s->pb, ctx->data_type); //Pc
+ put_le16(s->pb, ctx->length_code);//Pd
+ }
if (HAVE_BIGENDIAN ^ ctx->extra_bswap) {
put_buffer(s->pb, ctx->out_buf, ctx->out_bytes & ~1);
if (ctx->out_bytes & 1)
put_be16(s->pb, ctx->out_buf[ctx->out_bytes - 1]);
- for (; padding > 0; padding--)
- put_be16(s->pb, 0);
+ put_nbyte(s->pb, 0, padding);
av_log(s, AV_LOG_DEBUG, "type=%x len=%i pkt_offset=%i\n",
ctx->data_type, ctx->out_bytes, ctx->pkt_offset);
return 0;
}
-AVOutputFormat spdif_muxer = {
+AVOutputFormat ff_spdif_muxer = {
"spdif",
- NULL_IF_CONFIG_SMALL("IEC958 - S/PDIF (IEC-61937)"),
+ NULL_IF_CONFIG_SMALL("IEC 61937 (used on S/PDIF - IEC958)"),
NULL,
"spdif",
- sizeof(IEC958Context),
+ sizeof(IEC61937Context),
CODEC_ID_AC3,
CODEC_ID_NONE,
spdif_write_header,
projects / ffmpeg / blobdiff