Skip to content

F
ffmpeg.wasm-core
Commit ec0b08d2 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit 'b7b1bf91' 

* commit 'b7b1bf91':
  mpegts: K&R formatting cosmetics

Conflicts:
	libavformat/mpegtsenc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c6a596f6 b7b1bf91
Show whitespace changes
Inline Side-by-side
Showing with 292 additions and 268 deletions
libavformat/mpegtsenc.c
View file @ ec0b08d2
...@@ -19,14 +19,16 @@ ...@@ -19,14 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/avassert.h"
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/avassert.h"
#include "libavcodec/internal.h" #include "libavcodec/internal.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "mpegts.h" #include "mpegts.h"
...@@ -108,7 +110,9 @@ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) ...@@ -108,7 +110,9 @@ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len)
unsigned char *q; unsigned char *q;
int first, b, len1, left; int first, b, len1, left;
crc = av_bswap32(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 - 4] = (crc >> 24) & 0xff;
buf[len - 3] = (crc >> 16) & 0xff; buf[len - 3] = (crc >> 16) & 0xff;
buf[len - 2] = (crc >> 8) & 0xff; buf[len - 2] = (crc >> 8) & 0xff;
...@@ -216,7 +220,7 @@ static void mpegts_write_pat(AVFormatContext *s) ...@@ -216,7 +220,7 @@ static void mpegts_write_pat(AVFormatContext *s)
int i; int i;
q = data; q = data;
for(i = 0; i < ts->nb_services; i++) { for (i = 0; i < ts->nb_services; i++) {
service = ts->services[i]; service = ts->services[i];
put16(&q, service->sid); put16(&q, service->sid);
put16(&q, 0xe000 | service->pmt.pid); put16(&q, 0xe000 | service->pmt.pid);
...@@ -243,11 +247,11 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) ...@@ -243,11 +247,11 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
program_info_length_ptr[0] = val >> 8; program_info_length_ptr[0] = val >> 8;
program_info_length_ptr[1] = val; program_info_length_ptr[1] = val;
for(i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
MpegTSWriteStream *ts_st = st->priv_data; MpegTSWriteStream *ts_st = st->priv_data;
AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL,0); AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
switch(st->codec->codec_id) { switch (st->codec->codec_id) {
case AV_CODEC_ID_MPEG1VIDEO: case AV_CODEC_ID_MPEG1VIDEO:
case AV_CODEC_ID_MPEG2VIDEO: case AV_CODEC_ID_MPEG2VIDEO:
stream_type = STREAM_TYPE_VIDEO_MPEG2; stream_type = STREAM_TYPE_VIDEO_MPEG2;
...@@ -272,7 +276,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) ...@@ -272,7 +276,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
stream_type = STREAM_TYPE_AUDIO_MPEG1; stream_type = STREAM_TYPE_AUDIO_MPEG1;
break; break;
case AV_CODEC_ID_AAC: case AV_CODEC_ID_AAC:
stream_type = (ts->flags & MPEGTS_FLAG_AAC_LATM) ? STREAM_TYPE_AUDIO_AAC_LATM : STREAM_TYPE_AUDIO_AAC; stream_type = (ts->flags & MPEGTS_FLAG_AAC_LATM)
? STREAM_TYPE_AUDIO_AAC_LATM
: STREAM_TYPE_AUDIO_AAC;
break; break;
case AV_CODEC_ID_AAC_LATM: case AV_CODEC_ID_AAC_LATM:
stream_type = STREAM_TYPE_AUDIO_AAC_LATM; stream_type = STREAM_TYPE_AUDIO_AAC_LATM;
...@@ -300,14 +306,14 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) ...@@ -300,14 +306,14 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
q += 2; /* patched after */ q += 2; /* patched after */
/* write optional descriptors here */ /* write optional descriptors here */
switch(st->codec->codec_type) { switch (st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
if(st->codec->codec_id==AV_CODEC_ID_EAC3){ if (st->codec->codec_id==AV_CODEC_ID_EAC3) {
*q++=0x7a; // EAC3 descriptor see A038 DVB SI *q++=0x7a; // EAC3 descriptor see A038 DVB SI
*q++=1; // 1 byte, all flags sets to 0 *q++=1; // 1 byte, all flags sets to 0
*q++=0; // omit all fields... *q++=0; // omit all fields...
} }
if(st->codec->codec_id==AV_CODEC_ID_S302M){ if (st->codec->codec_id==AV_CODEC_ID_S302M) {
*q++ = 0x05; /* MPEG-2 registration descriptor*/ *q++ = 0x05; /* MPEG-2 registration descriptor*/
*q++ = 4; *q++ = 4;
*q++ = 'B'; *q++ = 'B';
...@@ -485,7 +491,7 @@ static void mpegts_write_sdt(AVFormatContext *s) ...@@ -485,7 +491,7 @@ static void mpegts_write_sdt(AVFormatContext *s)
q = data; q = data;
put16(&q, ts->onid); put16(&q, ts->onid);
*q++ = 0xff; *q++ = 0xff;
for(i = 0; i < ts->nb_services; i++) { for (i = 0; i < ts->nb_services; i++) {
service = ts->services[i]; service = ts->services[i];
put16(&q, service->sid); put16(&q, service->sid);
*q++ = 0xfc | 0x00; /* currently no EIT info */ *q++ = 0xfc | 0x00; /* currently no EIT info */
...@@ -513,8 +519,7 @@ static void mpegts_write_sdt(AVFormatContext *s) ...@@ -513,8 +519,7 @@ static void mpegts_write_sdt(AVFormatContext *s)
data, q - data); data, q - data);
} }
static MpegTSService *mpegts_add_service(MpegTSWrite *ts, static MpegTSService *mpegts_add_service(MpegTSWrite *ts, int sid,
int sid,
const char *provider_name, const char *provider_name,
const char *name) const char *name)
{ {
...@@ -585,13 +590,17 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -585,13 +590,17 @@ static int mpegts_write_header(AVFormatContext *s)
service_name = title ? title->value : DEFAULT_SERVICE_NAME; service_name = title ? title->value : DEFAULT_SERVICE_NAME;
provider = av_dict_get(s->metadata, "service_provider", NULL, 0); provider = av_dict_get(s->metadata, "service_provider", NULL, 0);
provider_name = provider ? provider->value : DEFAULT_PROVIDER_NAME; provider_name = provider ? provider->value : DEFAULT_PROVIDER_NAME;
service = mpegts_add_service(ts, ts->service_id, provider_name, service_name); service = mpegts_add_service(ts, ts->service_id,
provider_name, service_name);
service->pmt.write_packet = section_write_packet; service->pmt.write_packet = section_write_packet;
service->pmt.opaque = s; service->pmt.opaque = s;
service->pmt.cc = 15; service->pmt.cc = 15;
ts->pat.pid = PAT_PID; ts->pat.pid = PAT_PID;
ts->pat.cc = 15; // Initialize at 15 so that it wraps and be equal to 0 for the first packet we write /* Initialize at 15 so that it wraps and is equal to 0 for the
* first packet we write. */
ts->pat.cc = 15;
ts->pat.write_packet = section_write_packet; ts->pat.write_packet = section_write_packet;
ts->pat.opaque = s; ts->pat.opaque = s;
...@@ -605,7 +614,7 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -605,7 +614,7 @@ static int mpegts_write_header(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
/* assign pids to each stream */ /* assign pids to each stream */
for(i = 0;i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i]; st = s->streams[i];
ts_st = av_mallocz(sizeof(MpegTSWriteStream)); ts_st = av_mallocz(sizeof(MpegTSWriteStream));
...@@ -631,7 +640,8 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -631,7 +640,8 @@ static int mpegts_write_header(AVFormatContext *s)
} else if (st->id < 0x1FFF) { } else if (st->id < 0x1FFF) {
ts_st->pid = st->id; ts_st->pid = st->id;
} else { } else {
av_log(s, AV_LOG_ERROR, "Invalid stream id %d, must be less than 8191\n", st->id); av_log(s, AV_LOG_ERROR,
"Invalid stream id %d, must be less than 8191\n", st->id);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
...@@ -640,12 +650,13 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -640,12 +650,13 @@ static int mpegts_write_header(AVFormatContext *s)
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
for (j = 0; j < i; j++) for (j = 0; j < i; j++) {
if (pids[j] == ts_st->pid) { if (pids[j] == ts_st->pid) {
av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid); av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", ts_st->pid);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
}
pids[i] = ts_st->pid; pids[i] = ts_st->pid;
ts_st->payload_pts = AV_NOPTS_VALUE; ts_st->payload_pts = AV_NOPTS_VALUE;
ts_st->payload_dts = AV_NOPTS_VALUE; ts_st->payload_dts = AV_NOPTS_VALUE;
...@@ -658,15 +669,16 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -658,15 +669,16 @@ static int mpegts_write_header(AVFormatContext *s)
pcr_st = st; pcr_st = st;
} }
if (st->codec->codec_id == AV_CODEC_ID_AAC && if (st->codec->codec_id == AV_CODEC_ID_AAC &&
st->codec->extradata_size > 0) st->codec->extradata_size > 0) {
{
AVStream *ast; AVStream *ast;
ts_st->amux = avformat_alloc_context(); ts_st->amux = avformat_alloc_context();
if (!ts_st->amux) { if (!ts_st->amux) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
ts_st->amux->oformat = av_guess_format((ts->flags & MPEGTS_FLAG_AAC_LATM) ? "latm" : "adts", NULL, NULL); ts_st->amux->oformat =
av_guess_format((ts->flags & MPEGTS_FLAG_AAC_LATM) ? "latm" : "adts",
NULL, NULL);
if (!ts_st->amux->oformat) { if (!ts_st->amux->oformat) {
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
...@@ -703,7 +715,7 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -703,7 +715,7 @@ static int mpegts_write_header(AVFormatContext *s)
ts->pat_packet_period = (ts->mux_rate * PAT_RETRANS_TIME) / ts->pat_packet_period = (ts->mux_rate * PAT_RETRANS_TIME) /
(TS_PACKET_SIZE * 8 * 1000); (TS_PACKET_SIZE * 8 * 1000);
if(ts->copyts < 1) if (ts->copyts < 1)
ts->first_pcr = av_rescale(s->max_delay, PCR_TIME_BASE, AV_TIME_BASE); ts->first_pcr = av_rescale(s->max_delay, PCR_TIME_BASE, AV_TIME_BASE);
} else { } else {
/* Arbitrary values, PAT/PMT will also be written on video key frames */ /* Arbitrary values, PAT/PMT will also be written on video key frames */
...@@ -713,10 +725,10 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -713,10 +725,10 @@ static int mpegts_write_header(AVFormatContext *s)
if (!pcr_st->codec->frame_size) { if (!pcr_st->codec->frame_size) {
av_log(s, AV_LOG_WARNING, "frame size not set\n"); av_log(s, AV_LOG_WARNING, "frame size not set\n");
service->pcr_packet_period = service->pcr_packet_period =
pcr_st->codec->sample_rate/(10*512); pcr_st->codec->sample_rate / (10 * 512);
} else { } else {
service->pcr_packet_period = service->pcr_packet_period =
pcr_st->codec->sample_rate/(10*pcr_st->codec->frame_size); pcr_st->codec->sample_rate / (10 * pcr_st->codec->frame_size);
} }
} else { } else {
// max delta PCR 0.1s // max delta PCR 0.1s
...@@ -724,21 +736,21 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -724,21 +736,21 @@ static int mpegts_write_header(AVFormatContext *s)
service->pcr_packet_period = service->pcr_packet_period =
ts_st->user_tb.den / (10 * ts_st->user_tb.num); ts_st->user_tb.den / (10 * ts_st->user_tb.num);
} }
if(!service->pcr_packet_period) if (!service->pcr_packet_period)
service->pcr_packet_period = 1; service->pcr_packet_period = 1;
} }
// output a PCR as soon as possible // output a PCR as soon as possible
service->pcr_packet_count = service->pcr_packet_period; service->pcr_packet_count = service->pcr_packet_period;
ts->pat_packet_count = ts->pat_packet_period-1; ts->pat_packet_count = ts->pat_packet_period - 1;
ts->sdt_packet_count = ts->sdt_packet_period-1; ts->sdt_packet_count = ts->sdt_packet_period - 1;
if (ts->mux_rate == 1) if (ts->mux_rate == 1)
av_log(s, AV_LOG_VERBOSE, "muxrate VBR, "); av_log(s, AV_LOG_VERBOSE, "muxrate VBR, ");
else else
av_log(s, AV_LOG_VERBOSE, "muxrate %d, ", ts->mux_rate); av_log(s, AV_LOG_VERBOSE, "muxrate %d, ", ts->mux_rate);
av_log(s, AV_LOG_VERBOSE, "pcr every %d pkts, " av_log(s, AV_LOG_VERBOSE,
"sdt every %d, pat/pmt every %d pkts\n", "pcr every %d pkts, sdt every %d, pat/pmt every %d pkts\n",
service->pcr_packet_period, service->pcr_packet_period,
ts->sdt_packet_period, ts->pat_packet_period); ts->sdt_packet_period, ts->pat_packet_period);
...@@ -752,9 +764,9 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -752,9 +764,9 @@ static int mpegts_write_header(AVFormatContext *s)
return 0; return 0;
fail: fail:
av_free(pids); av_free(pids);
for(i = 0;i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
MpegTSWriteStream *ts_st; MpegTSWriteStream *ts_st;
st = s->streams[i]; st = s->streams[i];
ts_st = st->priv_data; ts_st = st->priv_data;
...@@ -783,10 +795,9 @@ static void retransmit_si_info(AVFormatContext *s, int force_pat) ...@@ -783,10 +795,9 @@ static void retransmit_si_info(AVFormatContext *s, int force_pat)
if (++ts->pat_packet_count == ts->pat_packet_period || force_pat) { if (++ts->pat_packet_count == ts->pat_packet_period || force_pat) {
ts->pat_packet_count = 0; ts->pat_packet_count = 0;
mpegts_write_pat(s); mpegts_write_pat(s);
for(i = 0; i < ts->nb_services; i++) { for (i = 0; i < ts->nb_services; i++)
mpegts_write_pmt(s, ts->services[i]); mpegts_write_pmt(s, ts->services[i]);
} }
}
} }
static int write_pcr_bits(uint8_t *buf, int64_t pcr) static int write_pcr_bits(uint8_t *buf, int64_t pcr)
...@@ -892,11 +903,10 @@ static uint8_t *get_ts_payload_start(uint8_t *pkt) ...@@ -892,11 +903,10 @@ static uint8_t *get_ts_payload_start(uint8_t *pkt)
return pkt + 4; return pkt + 4;
} }
/* Add a pes header to the front of payload, and segment into an integer number of /* Add a PES header to the front of the payload, and segment into an integer
* ts packets. The final ts packet is padded using an over-sized adaptation header * number of TS packets. The final TS packet is padded using an oversized
* to exactly fill the last ts packet. * adaptation header to exactly fill the last TS packet.
* NOTE: 'payload' contains a complete PES payload. * NOTE: 'payload' contains a complete PES payload. */
*/
static void mpegts_write_pes(AVFormatContext *s, AVStream *st, static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
const uint8_t *payload, int payload_size, const uint8_t *payload, int payload_size,
int64_t pts, int64_t dts, int key) int64_t pts, int64_t dts, int key)
...@@ -928,13 +938,14 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, ...@@ -928,13 +938,14 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
} }
if (ts->mux_rate > 1 && dts != AV_NOPTS_VALUE && if (ts->mux_rate > 1 && dts != AV_NOPTS_VALUE &&
(dts - get_pcr(ts, s->pb)/300) > delay) { (dts - get_pcr(ts, s->pb) / 300) > delay) {
/* pcr insert gets priority over null packet insert */ /* pcr insert gets priority over null packet insert */
if (write_pcr) if (write_pcr)
mpegts_insert_pcr_only(s, st); mpegts_insert_pcr_only(s, st);
else else
mpegts_insert_null_packet(s); mpegts_insert_null_packet(s);
continue; /* recalculate write_pcr and possibly retransmit si_info */ /* recalculate write_pcr and possibly retransmit si_info */
continue;
} }
/* prepare packet header */ /* prepare packet header */
...@@ -961,7 +972,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, ...@@ -961,7 +972,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
if (ts->mux_rate > 1) if (ts->mux_rate > 1)
pcr = get_pcr(ts, s->pb); pcr = get_pcr(ts, s->pb);
else else
pcr = (dts - delay)*300; pcr = (dts - delay) * 300;
if (dts != AV_NOPTS_VALUE && dts < pcr / 300) if (dts != AV_NOPTS_VALUE && dts < pcr / 300)
av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n"); av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n");
extend_af(buf, write_pcr_bits(q, pcr)); extend_af(buf, write_pcr_bits(q, pcr));
...@@ -977,9 +988,9 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, ...@@ -977,9 +988,9 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
is_dvb_subtitle = 0; is_dvb_subtitle = 0;
is_dvb_teletext = 0; is_dvb_teletext = 0;
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if (st->codec->codec_id == AV_CODEC_ID_DIRAC) { if (st->codec->codec_id == AV_CODEC_ID_DIRAC)
*q++ = 0xfd; *q++ = 0xfd;
} else else
*q++ = 0xe0; *q++ = 0xe0;
} else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && } else if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO &&
(st->codec->codec_id == AV_CODEC_ID_MP2 || (st->codec->codec_id == AV_CODEC_ID_MP2 ||
...@@ -992,7 +1003,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, ...@@ -992,7 +1003,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
*q++ = 0xfd; *q++ = 0xfd;
} else { } else {
*q++ = 0xbd; *q++ = 0xbd;
if(st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
if (st->codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE) { if (st->codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {
is_dvb_subtitle = 1; is_dvb_subtitle = 1;
} else if (st->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) { } else if (st->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) {
...@@ -1016,11 +1027,9 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, ...@@ -1016,11 +1027,9 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
pes_extension = 1; pes_extension = 1;
flags |= 0x01; flags |= 0x01;
/* /* One byte for PES2 extension flag +
* One byte for PES2 extension flag +
* one byte for extension length + * one byte for extension length +
* one byte for extension id * one byte for extension id */
*/
header_len += 3; header_len += 3;
} }
/* for Blu-ray AC3 Audio the PES Extension flag should be as follow /* for Blu-ray AC3 Audio the PES Extension flag should be as follow
...@@ -1070,10 +1079,8 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st, ...@@ -1070,10 +1079,8 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
flags = 0x01; /* set PES_extension_flag_2 */ flags = 0x01; /* set PES_extension_flag_2 */
*q++ = flags; *q++ = flags;
*q++ = 0x80 | 0x01; /* marker bit + extension length */ *q++ = 0x80 | 0x01; /* marker bit + extension length */
/* /* Set the stream ID extension flag bit to 0 and
* Set the stream id extension flag bit to 0 and * write the extended stream ID. */
* write the extended stream id
*/
*q++ = 0x00 | 0x60; *q++ = 0x00 | 0x60;
} }
/* For Blu-ray AC3 Audio Setting extended flags */ /* For Blu-ray AC3 Audio Setting extended flags */
...@@ -1161,15 +1168,16 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -1161,15 +1168,16 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
{ {
AVStream *st = s->streams[pkt->stream_index]; AVStream *st = s->streams[pkt->stream_index];
int size = pkt->size; int size = pkt->size;
uint8_t *buf= pkt->data; uint8_t *buf = pkt->data;
uint8_t *data= NULL; uint8_t *data = NULL;
MpegTSWrite *ts = s->priv_data; MpegTSWrite *ts = s->priv_data;
MpegTSWriteStream *ts_st = st->priv_data; MpegTSWriteStream *ts_st = st->priv_data;
const int64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE)*2; const int64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE) * 2;
int64_t dts = pkt->dts, pts = pkt->pts; int64_t dts = pkt->dts, pts = pkt->pts;
if (ts->reemit_pat_pmt) { if (ts->reemit_pat_pmt) {
av_log(s, AV_LOG_WARNING, "resend_headers option is deprecated, use -mpegts_flags resend_headers\n"); av_log(s, AV_LOG_WARNING,
"resend_headers option is deprecated, use -mpegts_flags resend_headers\n");
ts->reemit_pat_pmt = 0; ts->reemit_pat_pmt = 0;
ts->flags |= MPEGTS_FLAG_REEMIT_PAT_PMT; ts->flags |= MPEGTS_FLAG_REEMIT_PAT_PMT;
} }
...@@ -1180,7 +1188,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -1180,7 +1188,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
ts->flags &= ~MPEGTS_FLAG_REEMIT_PAT_PMT; ts->flags &= ~MPEGTS_FLAG_REEMIT_PAT_PMT;
} }
if(ts->copyts < 1){ if (ts->copyts < 1) {
if (pts != AV_NOPTS_VALUE) if (pts != AV_NOPTS_VALUE)
pts += delay; pts += delay;
if (dts != AV_NOPTS_VALUE) if (dts != AV_NOPTS_VALUE)
...@@ -1194,7 +1202,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -1194,7 +1202,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
ts_st->first_pts_check = 0; ts_st->first_pts_check = 0;
if (st->codec->codec_id == AV_CODEC_ID_H264) { if (st->codec->codec_id == AV_CODEC_ID_H264) {
const uint8_t *p = buf, *buf_end = p+size; const uint8_t *p = buf, *buf_end = p + size;
uint32_t state = -1; uint32_t state = -1;
int ret = ff_check_h264_startcode(s, st, pkt); int ret = ff_check_h264_startcode(s, st, pkt);
if (ret < 0) if (ret < 0)
...@@ -1207,15 +1215,15 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -1207,15 +1215,15 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
(state & 0x1f) != 5 && (state & 0x1f) != 1); (state & 0x1f) != 5 && (state & 0x1f) != 1);
if ((state & 0x1f) != 9) { // AUD NAL if ((state & 0x1f) != 9) { // AUD NAL
data = av_malloc(pkt->size+6); data = av_malloc(pkt->size + 6);
if (!data) if (!data)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
memcpy(data+6, pkt->data, pkt->size); memcpy(data + 6, pkt->data, pkt->size);
AV_WB32(data, 0x00000001); AV_WB32(data, 0x00000001);
data[4] = 0x09; data[4] = 0x09;
data[5] = 0xf0; // any slice type (0xe) + rbsp stop one bit data[5] = 0xf0; // any slice type (0xe) + rbsp stop one bit
buf = data; buf = data;
size = pkt->size+6; size = pkt->size + 6;
} }
} else if (st->codec->codec_id == AV_CODEC_ID_AAC) { } else if (st->codec->codec_id == AV_CODEC_ID_AAC) {
if (pkt->size < 2) { if (pkt->size < 2) {
...@@ -1237,6 +1245,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -1237,6 +1245,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
pkt2.size = pkt->size; pkt2.size = pkt->size;
av_assert0(pkt->dts != AV_NOPTS_VALUE); av_assert0(pkt->dts != AV_NOPTS_VALUE);
pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base); pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base);
ret = avio_open_dyn_buf(&ts_st->amux->pb); ret = avio_open_dyn_buf(&ts_st->amux->pb);
if (ret < 0) if (ret < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
...@@ -1256,11 +1265,11 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -1256,11 +1265,11 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if (pkt->dts != AV_NOPTS_VALUE) { if (pkt->dts != AV_NOPTS_VALUE) {
int i; int i;
for(i=0; i<s->nb_streams; i++){ for(i=0; i<s->nb_streams; i++) {
AVStream *st2 = s->streams[i]; AVStream *st2 = s->streams[i];
MpegTSWriteStream *ts_st2 = st2->priv_data; MpegTSWriteStream *ts_st2 = st2->priv_data;
if( ts_st2->payload_size if ( ts_st2->payload_size
&& (ts_st2->payload_dts == AV_NOPTS_VALUE || dts - ts_st2->payload_dts > delay/2)){ && (ts_st2->payload_dts == AV_NOPTS_VALUE || dts - ts_st2->payload_dts > delay/2)) {
mpegts_write_pes(s, st2, ts_st2->payload, ts_st2->payload_size, mpegts_write_pes(s, st2, ts_st2->payload, ts_st2->payload_size,
ts_st2->payload_pts, ts_st2->payload_dts, ts_st2->payload_pts, ts_st2->payload_dts,
ts_st2->payload_flags & AV_PKT_FLAG_KEY); ts_st2->payload_flags & AV_PKT_FLAG_KEY);
...@@ -1279,7 +1288,8 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt) ...@@ -1279,7 +1288,8 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO || size > ts->pes_payload_size) { if (st->codec->codec_type != AVMEDIA_TYPE_AUDIO || size > ts->pes_payload_size) {
av_assert0(!ts_st->payload_size); av_assert0(!ts_st->payload_size);
// for video and subtitle, write a single pes packet // for video and subtitle, write a single pes packet
mpegts_write_pes(s, st, buf, size, pts, dts, pkt->flags & AV_PKT_FLAG_KEY); mpegts_write_pes(s, st, buf, size, pts, dts,
pkt->flags & AV_PKT_FLAG_KEY);
av_free(data); av_free(data);
return 0; return 0;
} }
...@@ -1303,7 +1313,7 @@ static void mpegts_write_flush(AVFormatContext *s) ...@@ -1303,7 +1313,7 @@ static void mpegts_write_flush(AVFormatContext *s)
int i; int i;
/* flush current packets */ /* flush current packets */
for(i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
MpegTSWriteStream *ts_st = st->priv_data; MpegTSWriteStream *ts_st = st->priv_data;
if (ts_st->payload_size > 0) { if (ts_st->payload_size > 0) {
...@@ -1333,7 +1343,7 @@ static int mpegts_write_end(AVFormatContext *s) ...@@ -1333,7 +1343,7 @@ static int mpegts_write_end(AVFormatContext *s)
mpegts_write_flush(s); mpegts_write_flush(s);
for(i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
MpegTSWriteStream *ts_st = st->priv_data; MpegTSWriteStream *ts_st = st->priv_data;
av_freep(&ts_st->payload); av_freep(&ts_st->payload);
...@@ -1343,7 +1353,7 @@ static int mpegts_write_end(AVFormatContext *s) ...@@ -1343,7 +1353,7 @@ static int mpegts_write_end(AVFormatContext *s)
} }
} }
for(i = 0; i < ts->nb_services; i++) { for (i = 0; i < ts->nb_services; i++) {
service = ts->services[i]; service = ts->services[i];
av_freep(&service->provider_name); av_freep(&service->provider_name);
av_freep(&service->name); av_freep(&service->name);
...@@ -1356,40 +1366,54 @@ static int mpegts_write_end(AVFormatContext *s) ...@@ -1356,40 +1366,54 @@ static int mpegts_write_end(AVFormatContext *s)
static const AVOption options[] = { static const AVOption options[] = {
{ "mpegts_transport_stream_id", "Set transport_stream_id field.", { "mpegts_transport_stream_id", "Set transport_stream_id field.",
offsetof(MpegTSWrite, transport_stream_id), AV_OPT_TYPE_INT, {.i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, transport_stream_id), AV_OPT_TYPE_INT,
{ .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM },
{ "mpegts_original_network_id", "Set original_network_id field.", { "mpegts_original_network_id", "Set original_network_id field.",
offsetof(MpegTSWrite, original_network_id), AV_OPT_TYPE_INT, {.i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, original_network_id), AV_OPT_TYPE_INT,
{ .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM },
{ "mpegts_service_id", "Set service_id field.", { "mpegts_service_id", "Set service_id field.",
offsetof(MpegTSWrite, service_id), AV_OPT_TYPE_INT, {.i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, service_id), AV_OPT_TYPE_INT,
{ .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM },
{ "mpegts_pmt_start_pid", "Set the first pid of the PMT.", { "mpegts_pmt_start_pid", "Set the first pid of the PMT.",
offsetof(MpegTSWrite, pmt_start_pid), AV_OPT_TYPE_INT, {.i64 = 0x1000 }, 0x0010, 0x1f00, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, pmt_start_pid), AV_OPT_TYPE_INT,
{ .i64 = 0x1000 }, 0x0010, 0x1f00, AV_OPT_FLAG_ENCODING_PARAM },
{ "mpegts_start_pid", "Set the first pid.", { "mpegts_start_pid", "Set the first pid.",
offsetof(MpegTSWrite, start_pid), AV_OPT_TYPE_INT, {.i64 = 0x0100 }, 0x0100, 0x0f00, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, start_pid), AV_OPT_TYPE_INT,
{"mpegts_m2ts_mode", "Enable m2ts mode.", { .i64 = 0x0100 }, 0x0100, 0x0f00, AV_OPT_FLAG_ENCODING_PARAM },
offsetof(MpegTSWrite, m2ts_mode), AV_OPT_TYPE_INT, {.i64 = -1 }, { "mpegts_m2ts_mode", "Enable m2ts mode.",
-1,1, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, m2ts_mode), AV_OPT_TYPE_INT,
{ "muxrate", NULL, offsetof(MpegTSWrite, mux_rate), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, { .i64 = -1 }, -1, 1, AV_OPT_FLAG_ENCODING_PARAM },
{ "muxrate", NULL,
offsetof(MpegTSWrite, mux_rate), AV_OPT_TYPE_INT,
{ .i64 = 1 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
{ "pes_payload_size", "Minimum PES packet payload in bytes", { "pes_payload_size", "Minimum PES packet payload in bytes",
offsetof(MpegTSWrite, pes_payload_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT_PES_PAYLOAD_SIZE}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, pes_payload_size), AV_OPT_TYPE_INT,
{ "mpegts_flags", "MPEG-TS muxing flags", offsetof(MpegTSWrite, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, INT_MAX, { .i64 = DEFAULT_PES_PAYLOAD_SIZE }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
{ "mpegts_flags", "MPEG-TS muxing flags",
offsetof(MpegTSWrite, flags), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, 0, INT_MAX,
AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags" }, AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags" },
{ "resend_headers", "Reemit PAT/PMT before writing the next packet", { "resend_headers", "Reemit PAT/PMT before writing the next packet",
0, AV_OPT_TYPE_CONST, {.i64 = MPEGTS_FLAG_REEMIT_PAT_PMT}, 0, INT_MAX, 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_REEMIT_PAT_PMT }, 0, INT_MAX,
AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags"}, AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags" },
{ "latm", "Use LATM packetization for AAC", { "latm", "Use LATM packetization for AAC",
0, AV_OPT_TYPE_CONST, {.i64 = MPEGTS_FLAG_AAC_LATM}, 0, INT_MAX, 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_FLAG_AAC_LATM }, 0, INT_MAX,
AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags"}, AV_OPT_FLAG_ENCODING_PARAM, "mpegts_flags" },
// backward compatibility // backward compatibility
{ "resend_headers", "Reemit PAT/PMT before writing the next packet", { "resend_headers", "Reemit PAT/PMT before writing the next packet",
offsetof(MpegTSWrite, reemit_pat_pmt), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, reemit_pat_pmt), AV_OPT_TYPE_INT,
{ .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
{ "mpegts_copyts", "don't offset dts/pts", { "mpegts_copyts", "don't offset dts/pts",
offsetof(MpegTSWrite, copyts), AV_OPT_TYPE_INT, {.i64=-1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, copyts), AV_OPT_TYPE_INT,
{ .i64 = -1 }, -1, 1, AV_OPT_FLAG_ENCODING_PARAM },
{ "tables_version", "set PAT, PMT and SDT version", { "tables_version", "set PAT, PMT and SDT version",
offsetof(MpegTSWrite, tables_version), AV_OPT_TYPE_INT, {.i64=0}, 0, 31, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, tables_version), AV_OPT_TYPE_INT,
{ .i64 = 0 }, 0, 31, AV_OPT_FLAG_ENCODING_PARAM },
{ "omit_video_pes_length", "Omit the PES packet length for video packets", { "omit_video_pes_length", "Omit the PES packet length for video packets",
offsetof(MpegTSWrite, omit_video_pes_length), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, offsetof(MpegTSWrite, omit_video_pes_length), AV_OPT_TYPE_INT,
{ .i64 = 1 }, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
{ "pcr_period", "PCR retransmission time", { "pcr_period", "PCR retransmission time",
offsetof(MpegTSWrite, pcr_period), AV_OPT_TYPE_INT, { .i64 = PCR_RETRANS_TIME }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM }, offsetof(MpegTSWrite, pcr_period), AV_OPT_TYPE_INT,
{ .i64 = PCR_RETRANS_TIME }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
{ NULL }, { NULL },
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment