#include "libavutil/crc.h"
#include "libavcodec/mpegvideo.h"
#include "avformat.h"
+#include "internal.h"
#include "mpegts.h"
+#include "adts.h"
+
+#define PCR_TIME_BASE 27000000
/* write DVB SI sections */
int nb_services;
int onid;
int tsid;
- uint64_t cur_pcr;
- int mux_rate;
+ int64_t first_pcr;
+ int mux_rate; ///< set to 1 when VBR
} MpegTSWrite;
/* NOTE: 4 bytes must be left at the end for the crc32 */
unsigned char *q;
int first, b, len1, left;
- crc = bswap_32(av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, buf, len - 4));
+ crc = av_bswap32(av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, buf, len - 4));
buf[len - 4] = (crc >> 24) & 0xff;
buf[len - 3] = (crc >> 16) & 0xff;
buf[len - 2] = (crc >> 8) & 0xff;
b |= 0x40;
*q++ = b;
*q++ = s->pid;
- *q++ = 0x10 | s->cc;
s->cc = (s->cc + 1) & 0xf;
+ *q++ = 0x10 | s->cc;
if (first)
*q++ = 0; /* 0 offset */
len1 = TS_PACKET_SIZE - (q - packet);
buf_ptr += len1;
len -= len1;
-
- ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate;
}
}
int64_t payload_pts;
int64_t payload_dts;
uint8_t payload[DEFAULT_PES_PAYLOAD_SIZE];
+ ADTSContext *adts;
} MpegTSWriteStream;
static void mpegts_write_pat(AVFormatContext *s)
/* write optional descriptors here */
switch(st->codec->codec_type) {
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
if (lang && strlen(lang->value) == 3) {
*q++ = 0x0a; /* ISO 639 language descriptor */
*q++ = 4;
*q++ = 0; /* undefined type */
}
break;
- case CODEC_TYPE_SUBTITLE:
+ case AVMEDIA_TYPE_SUBTITLE:
{
const char *language;
language = lang && strlen(lang->value)==3 ? lang->value : "eng";
*q++ = language[1];
*q++ = language[2];
*q++ = 0x10; /* normal subtitles (0x20 = if hearing pb) */
- put16(&q, 1); /* page id */
- put16(&q, 1); /* ancillary page id */
+ if(st->codec->extradata_size == 4) {
+ memcpy(q, st->codec->extradata, 4);
+ q += 4;
+ } else {
+ put16(&q, 1); /* page id */
+ put16(&q, 1); /* ancillary page id */
+ }
}
break;
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
if (stream_type == STREAM_TYPE_VIDEO_DIRAC) {
*q++ = 0x05; /*MPEG-2 registration descriptor*/
*q++ = 4;
MpegTSWrite *ts = s->priv_data;
MpegTSWriteStream *ts_st;
MpegTSService *service;
- AVStream *st;
+ AVStream *st, *pcr_st = NULL;
AVMetadataTag *title;
- int i, total_bit_rate;
+ int i, j;
const char *service_name;
- uint64_t sdt_size, pat_pmt_size, pos;
+ int *pids;
ts->tsid = DEFAULT_TSID;
ts->onid = DEFAULT_ONID;
DEFAULT_PROVIDER_NAME, service_name);
service->pmt.write_packet = section_write_packet;
service->pmt.opaque = s;
+ service->pmt.cc = 15;
ts->pat.pid = PAT_PID;
- ts->pat.cc = 0;
+ ts->pat.cc = 15; // Initialize at 15 so that it wraps and be equal to 0 for the first packet we write
ts->pat.write_packet = section_write_packet;
ts->pat.opaque = s;
ts->sdt.pid = SDT_PID;
- ts->sdt.cc = 0;
+ ts->sdt.cc = 15;
ts->sdt.write_packet = section_write_packet;
ts->sdt.opaque = s;
+ pids = av_malloc(s->nb_streams * sizeof(*pids));
+ if (!pids)
+ return AVERROR(ENOMEM);
+
/* assign pids to each stream */
- total_bit_rate = 0;
for(i = 0;i < s->nb_streams; i++) {
st = s->streams[i];
ts_st = av_mallocz(sizeof(MpegTSWriteStream));
goto fail;
st->priv_data = ts_st;
ts_st->service = service;
- ts_st->pid = DEFAULT_START_PID + i;
+ /* MPEG pid values < 16 are reserved. Applications which set st->id in
+ * this range are assigned a calculated pid. */
+ if (st->id < 16) {
+ ts_st->pid = DEFAULT_START_PID + i;
+ } else if (st->id < 0x1FFF) {
+ ts_st->pid = st->id;
+ } else {
+ av_log(s, AV_LOG_ERROR, "Invalid stream id %d, must be less than 8191\n", st->id);
+ goto fail;
+ }
+ if (ts_st->pid == service->pmt.pid) {
+ av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid);
+ goto fail;
+ }
+ for (j = 0; j < i; j++)
+ if (pids[j] == ts_st->pid) {
+ av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid);
+ goto fail;
+ }
+ pids[i] = ts_st->pid;
ts_st->payload_pts = AV_NOPTS_VALUE;
ts_st->payload_dts = AV_NOPTS_VALUE;
ts_st->first_pts_check = 1;
+ ts_st->cc = 15;
/* update PCR pid by using the first video stream */
- if (st->codec->codec_type == CODEC_TYPE_VIDEO &&
- service->pcr_pid == 0x1fff)
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
+ service->pcr_pid == 0x1fff) {
service->pcr_pid = ts_st->pid;
- if (st->codec->rc_max_rate)
- total_bit_rate += st->codec->rc_max_rate;
- else {
- if (!st->codec->bit_rate) {
- av_log(s, AV_LOG_WARNING,
- "stream %d, bit rate is not set, this will cause problems\n",
- st->index);
- }
- total_bit_rate += st->codec->bit_rate;
+ pcr_st = st;
}
- /* PES header size */
- if (st->codec->codec_type == CODEC_TYPE_VIDEO ||
- st->codec->codec_type == CODEC_TYPE_SUBTITLE) {
- /* 1 PES per frame
- * 19 bytes of PES header
- * on average a half TS-packet (184/2) of padding-overhead every PES */
- total_bit_rate += (19 + 184/2)*8 / av_q2d(st->codec->time_base);
- } else {
- /* 1 PES per DEFAULT_PES_PAYLOAD_SIZE bytes of audio data
- * 14 bytes of PES header
- * on average a half TS-packet (184/2) of padding-overhead every PES */
- total_bit_rate += (14 + 184/2) *
- st->codec->bit_rate / DEFAULT_PES_PAYLOAD_SIZE;
+ if (st->codec->codec_id == CODEC_ID_AAC &&
+ st->codec->extradata_size > 0) {
+ ts_st->adts = av_mallocz(sizeof(*ts_st->adts));
+ if (!ts_st->adts)
+ return AVERROR(ENOMEM);
+ if (ff_adts_decode_extradata(s, ts_st->adts, st->codec->extradata,
+ st->codec->extradata_size) < 0)
+ return -1;
}
}
+ av_free(pids);
+
/* if no video stream, use the first stream as PCR */
if (service->pcr_pid == 0x1fff && s->nb_streams > 0) {
- ts_st = s->streams[0]->priv_data;
+ pcr_st = s->streams[0];
+ ts_st = pcr_st->priv_data;
service->pcr_pid = ts_st->pid;
}
- ts->mux_rate = 1; // avoid div by 0
-
- /* write info at the start of the file, so that it will be fast to
- find them */
- pos = url_ftell(s->pb);
- mpegts_write_sdt(s);
- sdt_size = url_ftell(s->pb) - pos;
- pos = url_ftell(s->pb);
- mpegts_write_pat(s);
- for(i = 0; i < ts->nb_services; i++) {
- mpegts_write_pmt(s, ts->services[i]);
+ ts->mux_rate = s->mux_rate ? s->mux_rate : 1;
+
+ if (ts->mux_rate > 1) {
+ service->pcr_packet_period = (ts->mux_rate * PCR_RETRANS_TIME) /
+ (TS_PACKET_SIZE * 8 * 1000);
+ ts->sdt_packet_period = (ts->mux_rate * SDT_RETRANS_TIME) /
+ (TS_PACKET_SIZE * 8 * 1000);
+ ts->pat_packet_period = (ts->mux_rate * PAT_RETRANS_TIME) /
+ (TS_PACKET_SIZE * 8 * 1000);
+
+ ts->first_pcr = av_rescale(s->max_delay, PCR_TIME_BASE, AV_TIME_BASE);
+ } else {
+ /* Arbitrary values, PAT/PMT could be written on key frames */
+ ts->sdt_packet_period = 200;
+ ts->pat_packet_period = 40;
+ if (pcr_st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ if (!pcr_st->codec->frame_size) {
+ av_log(s, AV_LOG_WARNING, "frame size not set\n");
+ service->pcr_packet_period =
+ pcr_st->codec->sample_rate/(10*512);
+ } else {
+ service->pcr_packet_period =
+ pcr_st->codec->sample_rate/(10*pcr_st->codec->frame_size);
+ }
+ } else {
+ // max delta PCR 0.1s
+ service->pcr_packet_period =
+ pcr_st->codec->time_base.den/(10*pcr_st->codec->time_base.num);
+ }
}
- pat_pmt_size = url_ftell(s->pb) - pos;
-
- if (total_bit_rate <= 8 * 1024)
- total_bit_rate = 8 * 1024;
-
- total_bit_rate +=
- total_bit_rate * 4 / (TS_PACKET_SIZE-4) + /* TS header size */
- 1000 * 8 * sdt_size / PAT_RETRANS_TIME + /* SDT size */
- 1000 * 8 * pat_pmt_size / SDT_RETRANS_TIME + /* PAT+PMT size */
- 1000 * 8 * 8 / PCR_RETRANS_TIME; /* PCR size */
-
- if (s->mux_rate)
- ts->mux_rate = s->mux_rate;
- else
- ts->mux_rate = total_bit_rate;
-
- service->pcr_packet_period = (ts->mux_rate * PCR_RETRANS_TIME) /
- (TS_PACKET_SIZE * 8 * 1000);
- ts->sdt_packet_period = (ts->mux_rate * SDT_RETRANS_TIME) /
- (TS_PACKET_SIZE * 8 * 1000);
- ts->pat_packet_period = (ts->mux_rate * PAT_RETRANS_TIME) /
- (TS_PACKET_SIZE * 8 * 1000);
// output a PCR as soon as possible
service->pcr_packet_count = service->pcr_packet_period;
+ ts->pat_packet_count = ts->pat_packet_period-1;
+ ts->sdt_packet_count = ts->sdt_packet_period-1;
- av_log(s, AV_LOG_DEBUG,
- "calculated bitrate %d bps, muxrate %d bps, "
+ if (ts->mux_rate == 1)
+ av_log(s, AV_LOG_INFO, "muxrate VBR, ");
+ else
+ av_log(s, AV_LOG_INFO, "muxrate %d, ", ts->mux_rate);
+ av_log(s, AV_LOG_INFO, "pcr every %d pkts, "
"sdt every %d, pat/pmt every %d pkts\n",
- total_bit_rate, ts->mux_rate, ts->sdt_packet_period,
- ts->pat_packet_period);
-
- // adjust pcr
- ts->cur_pcr /= ts->mux_rate;
+ service->pcr_packet_period,
+ ts->sdt_packet_period, ts->pat_packet_period);
put_flush_packet(s->pb);
return 0;
fail:
+ av_free(pids);
for(i = 0;i < s->nb_streams; i++) {
st = s->streams[i];
av_free(st->priv_data);
}
}
+static int64_t get_pcr(const MpegTSWrite *ts, ByteIOContext *pb)
+{
+ return av_rescale(url_ftell(pb) + 11, 8 * PCR_TIME_BASE, ts->mux_rate) +
+ ts->first_pcr;
+}
+
+static uint8_t* write_pcr_bits(uint8_t *buf, int64_t pcr)
+{
+ int64_t pcr_low = pcr % 300, pcr_high = pcr / 300;
+
+ *buf++ = pcr_high >> 25;
+ *buf++ = pcr_high >> 17;
+ *buf++ = pcr_high >> 9;
+ *buf++ = pcr_high >> 1;
+ *buf++ = ((pcr_high & 1) << 7) | (pcr_low >> 8);
+ *buf++ = pcr_low;
+
+ return buf;
+}
+
/* Write a single null transport stream packet */
static void mpegts_insert_null_packet(AVFormatContext *s)
{
*q++ = 0x10;
memset(q, 0x0FF, TS_PACKET_SIZE - (q - buf));
put_buffer(s->pb, buf, TS_PACKET_SIZE);
- ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate;
}
/* Write a single transport stream packet with a PCR and no payload */
MpegTSWrite *ts = s->priv_data;
MpegTSWriteStream *ts_st = st->priv_data;
uint8_t *q;
- uint64_t pcr = ts->cur_pcr;
uint8_t buf[TS_PACKET_SIZE];
q = buf;
*q++ = 0x10; /* Adaptation flags: PCR present */
/* PCR coded into 6 bytes */
- *q++ = pcr >> 25;
- *q++ = pcr >> 17;
- *q++ = pcr >> 9;
- *q++ = pcr >> 1;
- *q++ = (pcr & 1) << 7;
- *q++ = 0;
+ q = write_pcr_bits(q, get_pcr(ts, s->pb));
/* stuffing bytes */
memset(q, 0xFF, TS_PACKET_SIZE - (q - buf));
put_buffer(s->pb, buf, TS_PACKET_SIZE);
- ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate;
}
static void write_pts(uint8_t *q, int fourbits, int64_t pts)
write_pcr = 0;
if (ts_st->pid == ts_st->service->pcr_pid) {
- ts_st->service->pcr_packet_count++;
+ if (ts->mux_rate > 1 || is_start) // VBR pcr period is based on frames
+ ts_st->service->pcr_packet_count++;
if (ts_st->service->pcr_packet_count >=
ts_st->service->pcr_packet_period) {
ts_st->service->pcr_packet_count = 0;
}
}
- if (dts != AV_NOPTS_VALUE && (dts - (int64_t)ts->cur_pcr) > delay) {
+ if (ts->mux_rate > 1 && dts != AV_NOPTS_VALUE &&
+ (dts - get_pcr(ts, s->pb)/300) > delay) {
/* pcr insert gets priority over null packet insert */
if (write_pcr)
mpegts_insert_pcr_only(s, st);
val |= 0x40;
*q++ = val;
*q++ = ts_st->pid;
- *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0);
ts_st->cc = (ts_st->cc + 1) & 0xf;
+ *q++ = 0x10 | ts_st->cc | (write_pcr ? 0x20 : 0);
if (write_pcr) {
// add 11, pcr references the last byte of program clock reference base
- pcr = ts->cur_pcr + (4+7)*8*90000LL / ts->mux_rate;
- if (dts != AV_NOPTS_VALUE && dts < pcr)
+ if (ts->mux_rate > 1)
+ pcr = get_pcr(ts, s->pb);
+ else
+ pcr = (dts - delay)*300;
+ if (dts != AV_NOPTS_VALUE && dts < pcr / 300)
av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n");
*q++ = 7; /* AFC length */
*q++ = 0x10; /* flags: PCR present */
- *q++ = pcr >> 25;
- *q++ = pcr >> 17;
- *q++ = pcr >> 9;
- *q++ = pcr >> 1;
- *q++ = (pcr & 1) << 7;
- *q++ = 0;
+ q = write_pcr_bits(q, pcr);
}
if (is_start) {
int pes_extension = 0;
*q++ = 0x00;
*q++ = 0x01;
private_code = 0;
- if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if (st->codec->codec_id == CODEC_ID_DIRAC) {
*q++ = 0xfd;
} else
*q++ = 0xe0;
- } else if (st->codec->codec_type == CODEC_TYPE_AUDIO &&
+ } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
(st->codec->codec_id == CODEC_ID_MP2 ||
st->codec->codec_id == CODEC_ID_MP3)) {
*q++ = 0xc0;
} else {
*q++ = 0xbd;
- if (st->codec->codec_type == CODEC_TYPE_SUBTITLE) {
+ if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
private_code = 0x20;
}
}
header_len += 5;
flags |= 0x40;
}
- if (st->codec->codec_type == CODEC_TYPE_VIDEO &&
+ if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO &&
st->codec->codec_id == CODEC_ID_DIRAC) {
/* set PES_extension_flag */
pes_extension = 1;
*q++ = len;
val = 0x80;
/* data alignment indicator is required for subtitle data */
- if (st->codec->codec_type == CODEC_TYPE_SUBTITLE)
+ if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE)
val |= 0x04;
*q++ = val;
*q++ = flags;
payload += len;
payload_size -= len;
put_buffer(s->pb, buf, TS_PACKET_SIZE);
- ts->cur_pcr += TS_PACKET_SIZE*8*90000LL/ts->mux_rate;
}
put_flush_packet(s->pb);
}
uint8_t *buf= pkt->data;
uint8_t *data= NULL;
MpegTSWriteStream *ts_st = st->priv_data;
- const uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
+ const uint64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE)*2;
int64_t dts = AV_NOPTS_VALUE, pts = AV_NOPTS_VALUE;
if (pkt->pts != AV_NOPTS_VALUE)
ts_st->first_pts_check = 0;
if (st->codec->codec_id == CODEC_ID_H264) {
+ const uint8_t *p = buf, *buf_end = p+size;
+ uint32_t state = -1;
+
if (pkt->size < 5 || AV_RB32(pkt->data) != 0x0000001) {
- av_log(s, AV_LOG_ERROR, "h264 bitstream malformated\n");
+ av_log(s, AV_LOG_ERROR, "h264 bitstream malformated, "
+ "no startcode found, use -vbsf h264_mp4toannexb\n");
return -1;
}
- if (pkt->data[4] != 0x09) { // AUD NAL
+
+ do {
+ p = ff_find_start_code(p, buf_end, &state);
+ //av_log(s, AV_LOG_INFO, "nal %d\n", state & 0x1f);
+ } while (p < buf_end && (state & 0x1f) != 9 &&
+ (state & 0x1f) != 5 && (state & 0x1f) != 1);
+
+ if ((state & 0x1f) != 9) { // AUD NAL
data = av_malloc(pkt->size+6);
if (!data)
return -1;
memcpy(data+6, pkt->data, pkt->size);
AV_WB32(data, 0x00000001);
data[4] = 0x09;
- data[5] = 0xe0; // any slice type
+ data[5] = 0xf0; // any slice type (0xe) + rbsp stop one bit
buf = data;
size = pkt->size+6;
}
+ } else if (st->codec->codec_id == CODEC_ID_AAC) {
+ if (pkt->size < 2)
+ return -1;
+ if ((AV_RB16(pkt->data) & 0xfff0) != 0xfff0) {
+ ADTSContext *adts = ts_st->adts;
+ int new_size;
+ if (!adts) {
+ av_log(s, AV_LOG_ERROR, "aac bitstream not in adts format "
+ "and extradata missing\n");
+ return -1;
+ }
+ new_size = ADTS_HEADER_SIZE+adts->pce_size+pkt->size;
+ if ((unsigned)new_size >= INT_MAX)
+ return -1;
+ data = av_malloc(new_size);
+ if (!data)
+ return AVERROR(ENOMEM);
+ ff_adts_write_frame_header(adts, data, pkt->size, adts->pce_size);
+ if (adts->pce_size) {
+ memcpy(data+ADTS_HEADER_SIZE, adts->pce_data, adts->pce_size);
+ adts->pce_size = 0;
+ }
+ memcpy(data+ADTS_HEADER_SIZE+adts->pce_size, pkt->data, pkt->size);
+ buf = data;
+ size = new_size;
+ }
}
- if (st->codec->codec_type != CODEC_TYPE_AUDIO) {
+ if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO) {
// for video and subtitle, write a single pes packet
mpegts_write_pes(s, st, buf, size, pts, dts);
av_free(data);
memcpy(ts_st->payload + ts_st->payload_index, buf, size);
ts_st->payload_index += size;
+ av_free(data);
+
return 0;
}
mpegts_write_pes(s, st, ts_st->payload, ts_st->payload_index,
ts_st->payload_pts, ts_st->payload_dts);
}
+ av_freep(&ts_st->adts);
}
put_flush_packet(s->pb);
projects / ffmpeg / blobdiff