#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
+#include "libavcodec/ac3_parser_internal.h"
#include "libavcodec/internal.h"
#include "avformat.h"
/* For Opus */
int opus_queued_samples;
int opus_pending_trim_start;
+
+ DVBAC3Descriptor *dvb_ac3_desc;
} MpegTSWriteStream;
static void mpegts_write_pat(AVFormatContext *s)
case AV_CODEC_ID_DVB_TELETEXT:
stream_type = STREAM_TYPE_PRIVATE_DATA;
break;
+ case AV_CODEC_ID_SMPTE_KLV:
+ if (st->codecpar->profile == FF_PROFILE_KLVA_SYNC) {
+ stream_type = STREAM_TYPE_METADATA;
+ } else {
+ stream_type = STREAM_TYPE_PRIVATE_DATA;
+ }
+ break;
default:
av_log_once(s, AV_LOG_WARNING, AV_LOG_DEBUG, &ts_st->data_st_warning,
"Stream %d, codec %s, is muxed as a private data stream "
AVStream *st = s->streams[i];
MpegTSWriteStream *ts_st = st->priv_data;
AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
+ enum AVCodecID codec_id = st->codecpar->codec_id;
if (s->nb_programs) {
int k, found = 0;
/* write optional descriptors here */
switch (st->codecpar->codec_type) {
case AVMEDIA_TYPE_AUDIO:
- if (st->codecpar->codec_id==AV_CODEC_ID_AC3 && (ts->flags & MPEGTS_FLAG_SYSTEM_B)) {
- *q++=0x6a; // AC3 descriptor see A038 DVB SI
- *q++=1; // 1 byte, all flags sets to 0
- *q++=0; // omit all fields...
- }
- if (st->codecpar->codec_id==AV_CODEC_ID_EAC3 && (ts->flags & MPEGTS_FLAG_SYSTEM_B)) {
- *q++=0x7a; // EAC3 descriptor see A038 DVB SI
- *q++=1; // 1 byte, all flags sets to 0
- *q++=0; // omit all fields...
+ if (ts->flags & MPEGTS_FLAG_SYSTEM_B) {
+ if (codec_id == AV_CODEC_ID_AC3) {
+ DVBAC3Descriptor *dvb_ac3_desc = ts_st->dvb_ac3_desc;
+
+ *q++=0x6a; // AC3 descriptor see A038 DVB SI
+ if (dvb_ac3_desc) {
+ int len = 1 +
+ !!(dvb_ac3_desc->component_type_flag) +
+ !!(dvb_ac3_desc->bsid_flag) +
+ !!(dvb_ac3_desc->mainid_flag) +
+ !!(dvb_ac3_desc->asvc_flag);
+
+ *q++ = len;
+ *q++ = dvb_ac3_desc->component_type_flag << 7 | dvb_ac3_desc->bsid_flag << 6 |
+ dvb_ac3_desc->mainid_flag << 5 | dvb_ac3_desc->asvc_flag << 4;
+
+ if (dvb_ac3_desc->component_type_flag) *q++ = dvb_ac3_desc->component_type;
+ if (dvb_ac3_desc->bsid_flag) *q++ = dvb_ac3_desc->bsid;
+ if (dvb_ac3_desc->mainid_flag) *q++ = dvb_ac3_desc->mainid;
+ if (dvb_ac3_desc->asvc_flag) *q++ = dvb_ac3_desc->asvc;
+ } else {
+ *q++=1; // 1 byte, all flags sets to 0
+ *q++=0; // omit all fields...
+ }
+ } else if (codec_id == AV_CODEC_ID_EAC3) {
+ *q++=0x7a; // EAC3 descriptor see A038 DVB SI
+ *q++=1; // 1 byte, all flags sets to 0
+ *q++=0; // omit all fields...
+ }
}
- if (st->codecpar->codec_id==AV_CODEC_ID_S302M)
+ if (codec_id == AV_CODEC_ID_S302M)
put_registration_descriptor(&q, MKTAG('B', 'S', 'S', 'D'));
- if (st->codecpar->codec_id==AV_CODEC_ID_OPUS) {
+ if (codec_id == AV_CODEC_ID_OPUS) {
/* 6 bytes registration descriptor, 4 bytes Opus audio descriptor */
if (q - data > SECTION_LENGTH - 6 - 4) {
err = 1;
const char default_language[] = "und";
const char *language = lang && strlen(lang->value) >= 3 ? lang->value : default_language;
- if (st->codecpar->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
+ if (codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
uint8_t *len_ptr;
int extradata_copied = 0;
}
*len_ptr = q - len_ptr - 1;
- } else if (st->codecpar->codec_id == AV_CODEC_ID_DVB_TELETEXT) {
+ } else if (codec_id == AV_CODEC_ID_DVB_TELETEXT) {
uint8_t *len_ptr = NULL;
int extradata_copied = 0;
}
break;
case AVMEDIA_TYPE_DATA:
- if (st->codecpar->codec_id == AV_CODEC_ID_SMPTE_KLV) {
+ if (codec_id == AV_CODEC_ID_SMPTE_KLV) {
put_registration_descriptor(&q, MKTAG('K', 'L', 'V', 'A'));
- } else if (st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) {
+ } else if (codec_id == AV_CODEC_ID_TIMED_ID3) {
const char *tag = "ID3 ";
*q++ = 0x26; /* metadata descriptor */
*q++ = 13;
is_dvb_teletext = 0;
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
if (st->codecpar->codec_id == AV_CODEC_ID_DIRAC)
- *q++ = 0xfd;
+ *q++ = STREAM_ID_EXTENDED_STREAM_ID;
else
- *q++ = 0xe0;
+ *q++ = STREAM_ID_VIDEO_STREAM_0;
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
(st->codecpar->codec_id == AV_CODEC_ID_MP2 ||
st->codecpar->codec_id == AV_CODEC_ID_MP3 ||
st->codecpar->codec_id == AV_CODEC_ID_AAC)) {
- *q++ = 0xc0;
+ *q++ = STREAM_ID_AUDIO_STREAM_0;
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
st->codecpar->codec_id == AV_CODEC_ID_AC3 &&
ts->m2ts_mode) {
- *q++ = 0xfd;
+ *q++ = STREAM_ID_EXTENDED_STREAM_ID;
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA &&
st->codecpar->codec_id == AV_CODEC_ID_TIMED_ID3) {
- *q++ = 0xbd;
+ *q++ = STREAM_ID_PRIVATE_STREAM_1;
} else if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA) {
- *q++ = stream_id != -1 ? stream_id : 0xfc;
+ *q++ = stream_id != -1 ? stream_id : STREAM_ID_METADATA_STREAM;
- if (stream_id == 0xbd) /* asynchronous KLV */
+ if (stream_id == STREAM_ID_PRIVATE_STREAM_1) /* asynchronous KLV */
pts = dts = AV_NOPTS_VALUE;
} else {
- *q++ = 0xbd;
+ *q++ = STREAM_ID_PRIVATE_STREAM_1;
if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) {
if (st->codecpar->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
is_dvb_subtitle = 1;
if (ts->m2ts_mode &&
st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
st->codecpar->codec_id == AV_CODEC_ID_AC3) {
- /* set PES_extension_flag */
- pes_extension = 1;
- flags |= 0x01;
- header_len += 3;
+ /* set PES_extension_flag */
+ pes_extension = 1;
+ flags |= 0x01;
+ header_len += 3;
}
if (is_dvb_teletext) {
pes_header_stuffing_bytes = 0x24 - header_len;
*q++ = 0x00 | 0x60;
}
/* For Blu-ray AC3 Audio Setting extended flags */
- if (ts->m2ts_mode &&
- pes_extension &&
- st->codecpar->codec_id == AV_CODEC_ID_AC3) {
- flags = 0x01; /* set PES_extension_flag_2 */
- *q++ = flags;
- *q++ = 0x80 | 0x01; /* marker bit + extension length */
- *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
- }
+ if (ts->m2ts_mode &&
+ pes_extension &&
+ st->codecpar->codec_id == AV_CODEC_ID_AC3) {
+ flags = 0x01; /* set PES_extension_flag_2 */
+ *q++ = flags;
+ *q++ = 0x80 | 0x01; /* marker bit + extension length */
+ *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
+ }
if (is_dvb_subtitle) {
* need to count the samples of that too! */
av_log(s, AV_LOG_WARNING, "Got MPEG-TS formatted Opus data, unhandled");
}
+ } else if (st->codecpar->codec_id == AV_CODEC_ID_AC3 && !ts_st->dvb_ac3_desc) {
+ AC3HeaderInfo *hdr = NULL;
+
+ if (avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) >= 0) {
+ uint8_t number_of_channels_flag;
+ uint8_t service_type_flag;
+ uint8_t full_service_flag = 1;
+ DVBAC3Descriptor *dvb_ac3_desc;
+
+ dvb_ac3_desc = av_mallocz(sizeof(*dvb_ac3_desc));
+ if (!dvb_ac3_desc) {
+ av_free(hdr);
+ return AVERROR(ENOMEM);
+ }
+
+ service_type_flag = hdr->bitstream_mode;
+ switch (hdr->channel_mode) {
+ case AC3_CHMODE_DUALMONO:
+ number_of_channels_flag = 1;
+ break;
+ case AC3_CHMODE_MONO:
+ number_of_channels_flag = 0;
+ break;
+ case AC3_CHMODE_STEREO:
+ if (hdr->dolby_surround_mode == AC3_DSURMOD_ON)
+ number_of_channels_flag = 3;
+ else
+ number_of_channels_flag = 2;
+ break;
+ case AC3_CHMODE_3F:
+ case AC3_CHMODE_2F1R:
+ case AC3_CHMODE_3F1R:
+ case AC3_CHMODE_2F2R:
+ case AC3_CHMODE_3F2R:
+ number_of_channels_flag = 4;
+ break;
+ default: /* reserved */
+ number_of_channels_flag = 7;
+ break;
+ }
+
+ if (service_type_flag == 1 || service_type_flag == 4 ||
+ (service_type_flag == 7 && !number_of_channels_flag))
+ full_service_flag = 0;
+
+ dvb_ac3_desc->component_type_flag = 1;
+ dvb_ac3_desc->component_type = (full_service_flag << 6) |
+ ((service_type_flag & 0x7) << 3) |
+ (number_of_channels_flag & 0x7);
+ dvb_ac3_desc->bsid_flag = 1;
+ dvb_ac3_desc->bsid = hdr->bitstream_id;
+ dvb_ac3_desc->mainid_flag = 0;
+ dvb_ac3_desc->asvc_flag = 0;
+
+ ts_st->dvb_ac3_desc = dvb_ac3_desc;
+ }
+ av_free(hdr);
}
if (ts_st->payload_size && (ts_st->payload_size + size > ts->pes_payload_size ||
AVStream *st = s->streams[i];
MpegTSWriteStream *ts_st = st->priv_data;
if (ts_st) {
+ av_freep(&ts_st->dvb_ac3_desc);
av_freep(&ts_st->payload);
if (ts_st->amux) {
avformat_free_context(ts_st->amux);
#define ENC AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = {
{ "mpegts_transport_stream_id", "Set transport_stream_id field.",
- OFFSET(transport_stream_id), AV_OPT_TYPE_INT,
- { .i64 = 0x0001 }, 0x0001, 0xffff, ENC },
+ OFFSET(transport_stream_id), AV_OPT_TYPE_INT, { .i64 = 0x0001 }, 0x0001, 0xffff, ENC },
{ "mpegts_original_network_id", "Set original_network_id field.",
- OFFSET(original_network_id), AV_OPT_TYPE_INT,
- { .i64 = DVB_PRIVATE_NETWORK_START }, 0x0001, 0xffff, ENC },
+ OFFSET(original_network_id), AV_OPT_TYPE_INT, { .i64 = DVB_PRIVATE_NETWORK_START }, 0x0001, 0xffff, ENC },
{ "mpegts_service_id", "Set service_id field.",
- OFFSET(service_id), AV_OPT_TYPE_INT,
- { .i64 = 0x0001 }, 0x0001, 0xffff, ENC },
+ OFFSET(service_id), AV_OPT_TYPE_INT, { .i64 = 0x0001 }, 0x0001, 0xffff, ENC },
{ "mpegts_service_type", "Set service_type field.",
- OFFSET(service_type), AV_OPT_TYPE_INT,
- { .i64 = 0x01 }, 0x01, 0xff, ENC, "mpegts_service_type" },
+ OFFSET(service_type), AV_OPT_TYPE_INT, { .i64 = 0x01 }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "digital_tv", "Digital Television.",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_DIGITAL_TV }, 0x01, 0xff,
- ENC, "mpegts_service_type" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_DIGITAL_TV }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "digital_radio", "Digital Radio.",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_DIGITAL_RADIO }, 0x01, 0xff,
- ENC, "mpegts_service_type" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_DIGITAL_RADIO }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "teletext", "Teletext.",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_TELETEXT }, 0x01, 0xff,
- ENC, "mpegts_service_type" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_TELETEXT }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "advanced_codec_digital_radio", "Advanced Codec Digital Radio.",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_RADIO }, 0x01, 0xff,
- ENC, "mpegts_service_type" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_RADIO }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "mpeg2_digital_hdtv", "MPEG2 Digital HDTV.",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_MPEG2_DIGITAL_HDTV }, 0x01, 0xff,
- ENC, "mpegts_service_type" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_MPEG2_DIGITAL_HDTV }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "advanced_codec_digital_sdtv", "Advanced Codec Digital SDTV.",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_SDTV }, 0x01, 0xff,
- ENC, "mpegts_service_type" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_SDTV }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "advanced_codec_digital_hdtv", "Advanced Codec Digital HDTV.",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_HDTV }, 0x01, 0xff,
- ENC, "mpegts_service_type" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_ADVANCED_CODEC_DIGITAL_HDTV }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "hevc_digital_hdtv", "HEVC Digital Television Service.",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_HEVC_DIGITAL_HDTV }, 0x01, 0xff,
- ENC, "mpegts_service_type" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_HEVC_DIGITAL_HDTV }, 0x01, 0xff, ENC, "mpegts_service_type" },
{ "mpegts_pmt_start_pid", "Set the first pid of the PMT.",
- OFFSET(pmt_start_pid), AV_OPT_TYPE_INT,
- { .i64 = 0x1000 }, FIRST_OTHER_PID, LAST_OTHER_PID, ENC },
+ OFFSET(pmt_start_pid), AV_OPT_TYPE_INT, { .i64 = 0x1000 }, FIRST_OTHER_PID, LAST_OTHER_PID, ENC },
{ "mpegts_start_pid", "Set the first pid.",
- OFFSET(start_pid), AV_OPT_TYPE_INT,
- { .i64 = 0x0100 }, FIRST_OTHER_PID, LAST_OTHER_PID, ENC },
- { "mpegts_m2ts_mode", "Enable m2ts mode.",
- OFFSET(m2ts_mode), AV_OPT_TYPE_BOOL,
- { .i64 = -1 }, -1, 1, ENC },
- { "muxrate", NULL,
- OFFSET(mux_rate), AV_OPT_TYPE_INT,
- { .i64 = 1 }, 0, INT_MAX, ENC },
+ OFFSET(start_pid), AV_OPT_TYPE_INT, { .i64 = 0x0100 }, FIRST_OTHER_PID, LAST_OTHER_PID, ENC },
+ { "mpegts_m2ts_mode", "Enable m2ts mode.", OFFSET(m2ts_mode), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, ENC },
+ { "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC },
{ "pes_payload_size", "Minimum PES packet payload in bytes",
- OFFSET(pes_payload_size), AV_OPT_TYPE_INT,
- { .i64 = DEFAULT_PES_PAYLOAD_SIZE }, 0, INT_MAX, ENC },
- { "mpegts_flags", "MPEG-TS muxing flags",
- OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, 0, INT_MAX,
- ENC, "mpegts_flags" },
+ OFFSET(pes_payload_size), AV_OPT_TYPE_INT, { .i64 = DEFAULT_PES_PAYLOAD_SIZE }, 0, INT_MAX, ENC },
+ { "mpegts_flags", "MPEG-TS muxing flags", OFFSET(flags), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, 0, INT_MAX, ENC, "mpegts_flags" },
{ "resend_headers", "Reemit PAT/PMT before writing the next packet",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_REEMIT_PAT_PMT }, 0, INT_MAX,
- ENC, "mpegts_flags" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_REEMIT_PAT_PMT }, 0, INT_MAX, ENC, "mpegts_flags" },
{ "latm", "Use LATM packetization for AAC",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_AAC_LATM }, 0, INT_MAX,
- ENC, "mpegts_flags" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_AAC_LATM }, 0, INT_MAX, ENC, "mpegts_flags" },
{ "pat_pmt_at_frames", "Reemit PAT and PMT at each video frame",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_PAT_PMT_AT_FRAMES}, 0, INT_MAX,
- ENC, "mpegts_flags" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_PAT_PMT_AT_FRAMES}, 0, INT_MAX, ENC, "mpegts_flags" },
{ "system_b", "Conform to System B (DVB) instead of System A (ATSC)",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_SYSTEM_B }, 0, INT_MAX,
- ENC, "mpegts_flags" },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_SYSTEM_B }, 0, INT_MAX, ENC, "mpegts_flags" },
{ "initial_discontinuity", "Mark initial packets as discontinuous",
- 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_DISCONT }, 0, INT_MAX,
- ENC, "mpegts_flags" },
- { "mpegts_copyts", "don't offset dts/pts",
- OFFSET(copyts), AV_OPT_TYPE_BOOL,
- { .i64 = -1 }, -1, 1, ENC },
- { "tables_version", "set PAT, PMT and SDT version",
- OFFSET(tables_version), AV_OPT_TYPE_INT,
- { .i64 = 0 }, 0, 31, ENC },
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_DISCONT }, 0, INT_MAX, ENC, "mpegts_flags" },
+ { "mpegts_copyts", "don't offset dts/pts", OFFSET(copyts), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, ENC },
+ { "tables_version", "set PAT, PMT and SDT version", OFFSET(tables_version), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 31, ENC },
{ "omit_video_pes_length", "Omit the PES packet length for video packets",
- OFFSET(omit_video_pes_length), AV_OPT_TYPE_BOOL,
- { .i64 = 1 }, 0, 1, ENC },
+ OFFSET(omit_video_pes_length), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, ENC },
{ "pcr_period", "PCR retransmission time in milliseconds",
- OFFSET(pcr_period_ms), AV_OPT_TYPE_INT,
- { .i64 = -1 }, -1, INT_MAX, ENC },
+ OFFSET(pcr_period_ms), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, ENC },
{ "pat_period", "PAT/PMT retransmission time limit in seconds",
- OFFSET(pat_period_us), AV_OPT_TYPE_DURATION,
- { .i64 = PAT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC },
+ OFFSET(pat_period_us), AV_OPT_TYPE_DURATION, { .i64 = PAT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC },
{ "sdt_period", "SDT retransmission time limit in seconds",
- OFFSET(sdt_period_us), AV_OPT_TYPE_DURATION,
- { .i64 = SDT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC },
+ OFFSET(sdt_period_us), AV_OPT_TYPE_DURATION, { .i64 = SDT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC },
{ NULL },
};
projects / ffmpeg / blobdiff