* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-//#define USE_SYNCPOINT_SEARCH
-
+#include "libavutil/buffer.h"
#include "libavutil/crc.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/log.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "libavcodec/bytestream.h"
+#include "libavcodec/get_bits.h"
+#include "libavcodec/opus.h"
#include "avformat.h"
#include "mpegts.h"
#include "internal.h"
#include "avio_internal.h"
-#include "seek.h"
#include "mpeg.h"
#include "isom.h"
/* maximum size in which we look for synchronisation if
- synchronisation is lost */
+ * synchronisation is lost */
#define MAX_RESYNC_SIZE 65536
-#define MAX_PES_PAYLOAD 200*1024
+#define MAX_PES_PAYLOAD 200 * 1024
+
+#define MAX_MP4_DESCR_COUNT 16
+
+#define MOD_UNLIKELY(modulus, dividend, divisor, prev_dividend) \
+ do { \
+ if ((prev_dividend) == 0 || (dividend) - (prev_dividend) != (divisor)) \
+ (modulus) = (dividend) % (divisor); \
+ (prev_dividend) = (dividend); \
+ } while (0)
enum MpegTSFilterType {
MPEGTS_PES,
typedef struct MpegTSFilter MpegTSFilter;
-typedef int PESCallback(MpegTSFilter *f, const uint8_t *buf, int len, int is_start, int64_t pos);
+typedef int PESCallback (MpegTSFilter *f, const uint8_t *buf, int len,
+ int is_start, int64_t pos);
typedef struct MpegTSPESFilter {
PESCallback *pes_cb;
void *opaque;
} MpegTSPESFilter;
-typedef void SectionCallback(MpegTSFilter *f, const uint8_t *buf, int len);
+typedef void SectionCallback (MpegTSFilter *f, const uint8_t *buf, int len);
-typedef void SetServiceCallback(void *opaque, int ret);
+typedef void SetServiceCallback (void *opaque, int ret);
typedef struct MpegTSSectionFilter {
int section_index;
int section_h_size;
+ int last_ver;
uint8_t *section_buf;
- unsigned int check_crc:1;
- unsigned int end_of_section_reached:1;
+ unsigned int check_crc : 1;
+ unsigned int end_of_section_reached : 1;
SectionCallback *section_cb;
void *opaque;
} MpegTSSectionFilter;
struct MpegTSFilter {
int pid;
+ int es_id;
int last_cc; /* last cc code (-1 if first packet) */
enum MpegTSFilterType type;
union {
#define MAX_PIDS_PER_PROGRAM 64
struct Program {
- unsigned int id; //program id/service id
+ unsigned int id; // program id/service id
unsigned int nb_pids;
unsigned int pids[MAX_PIDS_PER_PROGRAM];
};
const AVClass *class;
/* user data */
AVFormatContext *stream;
- /** raw packet size, including FEC if present */
+ /** raw packet size, including FEC if present */
int raw_packet_size;
int pos47;
+ /** position corresponding to pos47, or 0 if pos47 invalid */
+ int64_t pos;
- /** if true, all pids are analyzed to find streams */
+ /** if true, all pids are analyzed to find streams */
int auto_guess;
- /** compute exact PCR for each transport stream packet */
+ /** compute exact PCR for each transport stream packet */
int mpeg2ts_compute_pcr;
- int64_t cur_pcr; /**< used to estimate the exact PCR */
- int pcr_incr; /**< used to estimate the exact PCR */
+ int64_t cur_pcr; /**< used to estimate the exact PCR */
+ int pcr_incr; /**< used to estimate the exact PCR */
/* data needed to handle file based ts */
- /** stop parsing loop */
+ /** stop parsing loop */
int stop_parse;
- /** packet containing Audio/Video data */
+ /** packet containing Audio/Video data */
AVPacket *pkt;
- /** to detect seek */
+ /** to detect seek */
int64_t last_pos;
+ int resync_size;
+
/******************************************/
/* private mpegts data */
/* scan context */
- /** structure to keep track of Program->pids mapping */
+ /** structure to keep track of Program->pids mapping */
unsigned int nb_prg;
struct Program *prg;
-
/** filters for various streams specified by PMT + for the PAT and PMT */
MpegTSFilter *pids[NB_PID_MAX];
};
+#define MPEGTS_OPTIONS \
+ { "resync_size", "Size limit for looking up a new syncronization.", offsetof(MpegTSContext, resync_size), AV_OPT_TYPE_INT, { .i64 = MAX_RESYNC_SIZE}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }
+
static const AVOption options[] = {
- {"compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), FF_OPT_TYPE_INT,
- {.dbl = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+ MPEGTS_OPTIONS,
+ { NULL },
+};
+
+static const AVClass mpegts_class = {
+ .class_name = "mpegts demuxer",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+static const AVOption raw_options[] = {
+ MPEGTS_OPTIONS,
+ { "compute_pcr", "Compute exact PCR for each transport stream packet.",
+ offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT,
+ { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+ { "ts_packetsize", "Output option carrying the raw packet size.",
+ offsetof(MpegTSContext, raw_packet_size), AV_OPT_TYPE_INT,
+ { .i64 = 0 }, 0, 0,
+ AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY },
{ NULL },
};
static const AVClass mpegtsraw_class = {
.class_name = "mpegtsraw demuxer",
.item_name = av_default_item_name,
- .option = options,
+ .option = raw_options,
.version = LIBAVUTIL_VERSION_INT,
};
int64_t pts, dts;
int64_t ts_packet_pos; /**< position of first TS packet of this PES packet */
uint8_t header[MAX_PES_HEADER_SIZE];
- uint8_t *buffer;
+ AVBufferRef *buffer;
+ SLConfigDescr sl;
} PESContext;
extern AVInputFormat ff_mpegts_demuxer;
{
int i;
- for(i=0; i<ts->nb_prg; i++)
- if(ts->prg[i].id == programid)
+ for (i = 0; i < ts->nb_prg; i++)
+ if (ts->prg[i].id == programid)
ts->prg[i].nb_pids = 0;
}
static void clear_programs(MpegTSContext *ts)
{
av_freep(&ts->prg);
- ts->nb_prg=0;
+ ts->nb_prg = 0;
}
static void add_pat_entry(MpegTSContext *ts, unsigned int programid)
{
struct Program *p;
- void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(struct Program));
- if(!tmp)
+ if (av_reallocp_array(&ts->prg, ts->nb_prg + 1, sizeof(*ts->prg)) < 0) {
+ ts->nb_prg = 0;
return;
- ts->prg = tmp;
+ }
p = &ts->prg[ts->nb_prg];
p->id = programid;
p->nb_pids = 0;
ts->nb_prg++;
}
-static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid, unsigned int pid)
+static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid,
+ unsigned int pid)
{
int i;
struct Program *p = NULL;
- for(i=0; i<ts->nb_prg; i++) {
- if(ts->prg[i].id == programid) {
+ for (i = 0; i < ts->nb_prg; i++) {
+ if (ts->prg[i].id == programid) {
p = &ts->prg[i];
break;
}
}
- if(!p)
+ if (!p)
return;
- if(p->nb_pids >= MAX_PIDS_PER_PROGRAM)
+ if (p->nb_pids >= MAX_PIDS_PER_PROGRAM)
return;
p->pids[p->nb_pids++] = pid;
}
int i, j, k;
int used = 0, discarded = 0;
struct Program *p;
- for(i=0; i<ts->nb_prg; i++) {
+
+ /* If none of the programs have .discard=AVDISCARD_ALL then there's
+ * no way we have to discard this packet */
+ for (k = 0; k < ts->stream->nb_programs; k++)
+ if (ts->stream->programs[k]->discard == AVDISCARD_ALL)
+ break;
+ if (k == ts->stream->nb_programs)
+ return 0;
+
+ for (i = 0; i < ts->nb_prg; i++) {
p = &ts->prg[i];
- for(j=0; j<p->nb_pids; j++) {
- if(p->pids[j] != pid)
+ for (j = 0; j < p->nb_pids; j++) {
+ if (p->pids[j] != pid)
continue;
- //is program with id p->id set to be discarded?
- for(k=0; k<ts->stream->nb_programs; k++) {
- if(ts->stream->programs[k]->id == p->id) {
- if(ts->stream->programs[k]->discard == AVDISCARD_ALL)
+ // is program with id p->id set to be discarded?
+ for (k = 0; k < ts->stream->nb_programs; k++) {
+ if (ts->stream->programs[k]->id == p->id) {
+ if (ts->stream->programs[k]->discard == AVDISCARD_ALL)
discarded++;
else
used++;
* Assemble PES packets out of TS packets, and then call the "section_cb"
* function when they are complete.
*/
-static void write_section_data(AVFormatContext *s, MpegTSFilter *tss1,
+static void write_section_data(MpegTSContext *ts, MpegTSFilter *tss1,
const uint8_t *buf, int buf_size, int is_start)
{
MpegTSSectionFilter *tss = &tss1->u.section_filter;
tss->section_h_size = len;
}
- if (tss->section_h_size != -1 && tss->section_index >= tss->section_h_size) {
+ if (tss->section_h_size != -1 &&
+ tss->section_index >= tss->section_h_size) {
tss->end_of_section_reached = 1;
if (!tss->check_crc ||
av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1,
}
}
-static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, unsigned int pid,
- SectionCallback *section_cb, void *opaque,
- int check_crc)
-
+static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts,
+ unsigned int pid,
+ SectionCallback *section_cb,
+ void *opaque,
+ int check_crc)
{
MpegTSFilter *filter;
MpegTSSectionFilter *sec;
- av_dlog(ts->stream, "Filter: pid=0x%x\n", pid);
+ av_log(ts->stream, AV_LOG_TRACE, "Filter: pid=0x%x\n", pid);
if (pid >= NB_PID_MAX || ts->pids[pid])
return NULL;
if (!filter)
return NULL;
ts->pids[pid] = filter;
- filter->type = MPEGTS_SECTION;
- filter->pid = pid;
+
+ filter->type = MPEGTS_SECTION;
+ filter->pid = pid;
+ filter->es_id = -1;
filter->last_cc = -1;
+
sec = &filter->u.section_filter;
- sec->section_cb = section_cb;
- sec->opaque = opaque;
+ sec->section_cb = section_cb;
+ sec->opaque = opaque;
sec->section_buf = av_malloc(MAX_SECTION_SIZE);
- sec->check_crc = check_crc;
+ sec->check_crc = check_crc;
+ sec->last_ver = -1;
+
if (!sec->section_buf) {
av_free(filter);
return NULL;
}
static MpegTSFilter *mpegts_open_pes_filter(MpegTSContext *ts, unsigned int pid,
- PESCallback *pes_cb,
- void *opaque)
+ PESCallback *pes_cb,
+ void *opaque)
{
MpegTSFilter *filter;
MpegTSPESFilter *pes;
filter = av_mallocz(sizeof(MpegTSFilter));
if (!filter)
return NULL;
+
ts->pids[pid] = filter;
- filter->type = MPEGTS_PES;
- filter->pid = pid;
+ filter->type = MPEGTS_PES;
+ filter->pid = pid;
+ filter->es_id = -1;
filter->last_cc = -1;
+
pes = &filter->u.pes_filter;
pes->pes_cb = pes_cb;
pes->opaque = opaque;
av_freep(&filter->u.section_filter.section_buf);
else if (filter->type == MPEGTS_PES) {
PESContext *pes = filter->u.pes_filter.opaque;
- av_freep(&pes->buffer);
+ av_buffer_unref(&pes->buffer);
/* referenced private data will be freed later in
- * av_close_input_stream */
+ * avformat_close_input */
if (!((PESContext *)filter->u.pes_filter.opaque)->st) {
av_freep(&filter->u.pes_filter.opaque);
}
ts->pids[pid] = NULL;
}
-static int analyze(const uint8_t *buf, int size, int packet_size, int *index){
+static int analyze(const uint8_t *buf, int size, int packet_size, int *index,
+ int probe)
+{
int stat[TS_MAX_PACKET_SIZE];
int i;
- int x=0;
- int best_score=0;
+ int x = 0;
+ int best_score = 0;
- memset(stat, 0, packet_size*sizeof(int));
+ memset(stat, 0, packet_size * sizeof(int));
- for(x=i=0; i<size-3; i++){
- if(buf[i] == 0x47 && !(buf[i+1] & 0x80) && (buf[i+3] & 0x30)){
+ for (x = i = 0; i < size - 3; i++) {
+ if (buf[i] == 0x47 &&
+ (!probe || (!(buf[i + 1] & 0x80) && (buf[i + 3] & 0x30)))) {
stat[x]++;
- if(stat[x] > best_score){
- best_score= stat[x];
- if(index) *index= x;
+ if (stat[x] > best_score) {
+ best_score = stat[x];
+ if (index)
+ *index = x;
}
}
x++;
- if(x == packet_size) x= 0;
+ if (x == packet_size)
+ x = 0;
}
return best_score;
int score, fec_score, dvhs_score;
if (size < (TS_FEC_PACKET_SIZE * 5 + 1))
- return -1;
-
- score = analyze(buf, size, TS_PACKET_SIZE, NULL);
- dvhs_score = analyze(buf, size, TS_DVHS_PACKET_SIZE, NULL);
- fec_score= analyze(buf, size, TS_FEC_PACKET_SIZE, NULL);
-// av_log(NULL, AV_LOG_DEBUG, "score: %d, dvhs_score: %d, fec_score: %d \n", score, dvhs_score, fec_score);
-
- if (score > fec_score && score > dvhs_score) return TS_PACKET_SIZE;
- else if(dvhs_score > score && dvhs_score > fec_score) return TS_DVHS_PACKET_SIZE;
- else if(score < fec_score && dvhs_score < fec_score) return TS_FEC_PACKET_SIZE;
- else return -1;
+ return AVERROR_INVALIDDATA;
+
+ score = analyze(buf, size, TS_PACKET_SIZE, NULL, 0);
+ dvhs_score = analyze(buf, size, TS_DVHS_PACKET_SIZE, NULL, 0);
+ fec_score = analyze(buf, size, TS_FEC_PACKET_SIZE, NULL, 0);
+ av_log(NULL, AV_LOG_TRACE, "score: %d, dvhs_score: %d, fec_score: %d \n",
+ score, dvhs_score, fec_score);
+
+ if (score > fec_score && score > dvhs_score)
+ return TS_PACKET_SIZE;
+ else if (dvhs_score > score && dvhs_score > fec_score)
+ return TS_DVHS_PACKET_SIZE;
+ else if (score < fec_score && dvhs_score < fec_score)
+ return TS_FEC_PACKET_SIZE;
+ else
+ return AVERROR_INVALIDDATA;
}
typedef struct SectionHeader {
p = *pp;
if (p >= p_end)
- return -1;
- c = *p++;
+ return AVERROR_INVALIDDATA;
+ c = *p++;
*pp = p;
return c;
}
p = *pp;
if ((p + 1) >= p_end)
- return -1;
- c = AV_RB16(p);
- p += 2;
+ return AVERROR_INVALIDDATA;
+ c = AV_RB16(p);
+ p += 2;
*pp = p;
return c;
}
-/* read and allocate a DVB string preceeded by its length */
+/* read and allocate a DVB string preceded by its length */
static char *getstr8(const uint8_t **pp, const uint8_t *p_end)
{
int len;
const uint8_t *p;
char *str;
- p = *pp;
+ p = *pp;
len = get8(&p, p_end);
if (len < 0)
return NULL;
return NULL;
memcpy(str, p, len);
str[len] = '\0';
- p += len;
+ p += len;
*pp = p;
return str;
}
val = get8(pp, p_end);
if (val < 0)
- return -1;
+ return val;
h->tid = val;
*pp += 2;
- val = get16(pp, p_end);
+ val = get16(pp, p_end);
if (val < 0)
- return -1;
+ return val;
h->id = val;
val = get8(pp, p_end);
if (val < 0)
- return -1;
+ return val;
h->version = (val >> 1) & 0x1f;
val = get8(pp, p_end);
if (val < 0)
- return -1;
+ return val;
h->sec_num = val;
val = get8(pp, p_end);
if (val < 0)
- return -1;
+ return val;
h->last_sec_num = val;
return 0;
}
-typedef struct {
+typedef struct StreamType {
uint32_t stream_type;
enum AVMediaType codec_type;
- enum CodecID codec_id;
+ enum AVCodecID codec_id;
} StreamType;
static const StreamType ISO_types[] = {
- { 0x01, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO },
- { 0x02, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG2VIDEO },
- { 0x03, AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3 },
- { 0x04, AVMEDIA_TYPE_AUDIO, CODEC_ID_MP3 },
- { 0x0f, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC },
- { 0x10, AVMEDIA_TYPE_VIDEO, CODEC_ID_MPEG4 },
- { 0x11, AVMEDIA_TYPE_AUDIO, CODEC_ID_AAC_LATM }, /* LATM syntax */
- { 0x1b, AVMEDIA_TYPE_VIDEO, CODEC_ID_H264 },
- { 0xd1, AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC },
- { 0xea, AVMEDIA_TYPE_VIDEO, CODEC_ID_VC1 },
+ { 0x01, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG2VIDEO },
+ { 0x02, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG2VIDEO },
+ { 0x03, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP3 },
+ { 0x04, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_MP3 },
+ { 0x0f, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC },
+ { 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 },
+ { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM }, /* LATM syntax */
+ { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 },
+ { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000 },
+ { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC },
+ { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS },
+ { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC },
+ { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 },
{ 0 },
};
static const StreamType HDMV_types[] = {
- { 0x80, AVMEDIA_TYPE_AUDIO, CODEC_ID_PCM_BLURAY },
- { 0x81, AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 },
- { 0x82, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS },
- { 0x83, AVMEDIA_TYPE_AUDIO, CODEC_ID_TRUEHD },
- { 0x84, AVMEDIA_TYPE_AUDIO, CODEC_ID_EAC3 },
- { 0x90, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_HDMV_PGS_SUBTITLE },
+ { 0x80, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_PCM_BLURAY },
+ { 0x81, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 },
+ { 0x82, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
+ { 0x83, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_TRUEHD },
+ { 0x84, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 },
+ { 0x85, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, /* DTS HD */
+ { 0x86, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS }, /* DTS HD MASTER*/
+ { 0x90, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_HDMV_PGS_SUBTITLE },
{ 0 },
};
/* ATSC ? */
static const StreamType MISC_types[] = {
- { 0x81, AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 },
- { 0x8a, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS },
+ { 0x81, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 },
+ { 0x8a, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
{ 0 },
};
static const StreamType REGD_types[] = {
- { MKTAG('d','r','a','c'), AVMEDIA_TYPE_VIDEO, CODEC_ID_DIRAC },
- { MKTAG('A','C','-','3'), AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 },
- { MKTAG('B','S','S','D'), AVMEDIA_TYPE_AUDIO, CODEC_ID_S302M },
+ { MKTAG('d', 'r', 'a', 'c'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC },
+ { MKTAG('A', 'C', '-', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 },
+ { MKTAG('B', 'S', 'S', 'D'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_S302M },
+ { MKTAG('D', 'T', 'S', '1'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
+ { MKTAG('D', 'T', 'S', '2'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
+ { MKTAG('D', 'T', 'S', '3'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
+ { MKTAG('H', 'E', 'V', 'C'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC },
+ { MKTAG('V', 'C', '-', '1'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 },
+ { MKTAG('O', 'p', 'u', 's'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_OPUS },
{ 0 },
};
/* descriptor present */
static const StreamType DESC_types[] = {
- { 0x6a, AVMEDIA_TYPE_AUDIO, CODEC_ID_AC3 }, /* AC-3 descriptor */
- { 0x7a, AVMEDIA_TYPE_AUDIO, CODEC_ID_EAC3 }, /* E-AC-3 descriptor */
- { 0x7b, AVMEDIA_TYPE_AUDIO, CODEC_ID_DTS },
- { 0x56, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVB_TELETEXT },
- { 0x59, AVMEDIA_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */
+ { 0x6a, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AC3 }, /* AC-3 descriptor */
+ { 0x7a, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_EAC3 }, /* E-AC-3 descriptor */
+ { 0x7b, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
+ { 0x56, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_TELETEXT },
+ { 0x59, AVMEDIA_TYPE_SUBTITLE, AV_CODEC_ID_DVB_SUBTITLE }, /* subtitling descriptor */
{ 0 },
};
static void mpegts_find_stream_type(AVStream *st,
- uint32_t stream_type, const StreamType *types)
+ uint32_t stream_type,
+ const StreamType *types)
{
- for (; types->stream_type; types++) {
+ for (; types->stream_type; types++)
if (stream_type == types->stream_type) {
st->codec->codec_type = types->codec_type;
st->codec->codec_id = types->codec_id;
return;
}
- }
}
static int mpegts_set_stream_info(AVStream *st, PESContext *pes,
uint32_t stream_type, uint32_t prog_reg_desc)
{
- av_set_pts_info(st, 33, 1, 90000);
- st->priv_data = pes;
+ avpriv_set_pts_info(st, 33, 1, 90000);
+ st->priv_data = pes;
st->codec->codec_type = AVMEDIA_TYPE_DATA;
- st->codec->codec_id = CODEC_ID_NONE;
- st->need_parsing = AVSTREAM_PARSE_FULL;
- pes->st = st;
+ st->codec->codec_id = AV_CODEC_ID_NONE;
+ st->need_parsing = AVSTREAM_PARSE_FULL;
+ pes->st = st;
pes->stream_type = stream_type;
av_log(pes->stream, AV_LOG_DEBUG,
"stream=%d stream_type=%x pid=%x prog_reg_desc=%.4s\n",
- st->index, pes->stream_type, pes->pid, (char*)&prog_reg_desc);
+ st->index, pes->stream_type, pes->pid, (char *)&prog_reg_desc);
st->codec->codec_tag = pes->stream_type;
mpegts_find_stream_type(st, pes->stream_type, ISO_types);
if (prog_reg_desc == AV_RL32("HDMV") &&
- st->codec->codec_id == CODEC_ID_NONE) {
+ st->codec->codec_id == AV_CODEC_ID_NONE) {
mpegts_find_stream_type(st, pes->stream_type, HDMV_types);
if (pes->stream_type == 0x83) {
// HDMV TrueHD streams also contain an AC3 coded version of the
return AVERROR(ENOMEM);
memcpy(sub_pes, pes, sizeof(*sub_pes));
- sub_st = av_new_stream(pes->stream, pes->pid);
+ sub_st = avformat_new_stream(pes->stream, NULL);
if (!sub_st) {
av_free(sub_pes);
return AVERROR(ENOMEM);
}
- av_set_pts_info(sub_st, 33, 1, 90000);
- sub_st->priv_data = sub_pes;
+ sub_st->id = pes->pid;
+ avpriv_set_pts_info(sub_st, 33, 1, 90000);
+ sub_st->priv_data = sub_pes;
sub_st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
- sub_st->codec->codec_id = CODEC_ID_AC3;
- sub_st->need_parsing = AVSTREAM_PARSE_FULL;
- sub_pes->sub_st = pes->sub_st = sub_st;
+ sub_st->codec->codec_id = AV_CODEC_ID_AC3;
+ sub_st->need_parsing = AVSTREAM_PARSE_FULL;
+ sub_pes->sub_st = pes->sub_st = sub_st;
}
}
- if (st->codec->codec_id == CODEC_ID_NONE)
+ if (st->codec->codec_id == AV_CODEC_ID_NONE)
mpegts_find_stream_type(st, pes->stream_type, MISC_types);
return 0;
{
av_init_packet(pkt);
- pkt->destruct = av_destruct_packet;
- pkt->data = pes->buffer;
+ pkt->buf = pes->buffer;
+ pkt->data = pes->buffer->data;
pkt->size = pes->data_index;
- if(pes->total_size != MAX_PES_PAYLOAD &&
- pes->pes_header_size + pes->data_index != pes->total_size + 6) {
+ if (pes->total_size != MAX_PES_PAYLOAD &&
+ pes->pes_header_size + pes->data_index != pes->total_size +
+ PES_START_SIZE) {
av_log(pes->stream, AV_LOG_WARNING, "PES packet size mismatch\n");
pes->flags |= AV_PKT_FLAG_CORRUPT;
}
- memset(pkt->data+pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+ memset(pkt->data + pkt->size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
// Separate out the AC3 substream from an HDMV combined TrueHD/AC3 PID
if (pes->sub_st && pes->stream_type == 0x83 && pes->extended_stream_id == 0x76)
pkt->pts = pes->pts;
pkt->dts = pes->dts;
/* store position of first TS packet of this PES packet */
- pkt->pos = pes->ts_packet_pos;
+ pkt->pos = pes->ts_packet_pos;
pkt->flags = pes->flags;
/* reset pts values */
- pes->pts = AV_NOPTS_VALUE;
- pes->dts = AV_NOPTS_VALUE;
- pes->buffer = NULL;
+ pes->pts = AV_NOPTS_VALUE;
+ pes->dts = AV_NOPTS_VALUE;
+ pes->buffer = NULL;
pes->data_index = 0;
- pes->flags = 0;
+ pes->flags = 0;
+}
+
+static int read_sl_header(PESContext *pes, SLConfigDescr *sl,
+ const uint8_t *buf, int buf_size)
+{
+ GetBitContext gb;
+ int au_start_flag = 0, au_end_flag = 0, ocr_flag = 0, idle_flag = 0;
+ int padding_flag = 0, padding_bits = 0, inst_bitrate_flag = 0;
+ int dts_flag = -1, cts_flag = -1;
+ int64_t dts = AV_NOPTS_VALUE, cts = AV_NOPTS_VALUE;
+ init_get_bits(&gb, buf, buf_size * 8);
+
+ if (sl->use_au_start)
+ au_start_flag = get_bits1(&gb);
+ if (sl->use_au_end)
+ au_end_flag = get_bits1(&gb);
+ if (!sl->use_au_start && !sl->use_au_end)
+ au_start_flag = au_end_flag = 1;
+ if (sl->ocr_len > 0)
+ ocr_flag = get_bits1(&gb);
+ if (sl->use_idle)
+ idle_flag = get_bits1(&gb);
+ if (sl->use_padding)
+ padding_flag = get_bits1(&gb);
+ if (padding_flag)
+ padding_bits = get_bits(&gb, 3);
+
+ if (!idle_flag && (!padding_flag || padding_bits != 0)) {
+ if (sl->packet_seq_num_len)
+ skip_bits_long(&gb, sl->packet_seq_num_len);
+ if (sl->degr_prior_len)
+ if (get_bits1(&gb))
+ skip_bits(&gb, sl->degr_prior_len);
+ if (ocr_flag)
+ skip_bits_long(&gb, sl->ocr_len);
+ if (au_start_flag) {
+ if (sl->use_rand_acc_pt)
+ get_bits1(&gb);
+ if (sl->au_seq_num_len > 0)
+ skip_bits_long(&gb, sl->au_seq_num_len);
+ if (sl->use_timestamps) {
+ dts_flag = get_bits1(&gb);
+ cts_flag = get_bits1(&gb);
+ }
+ }
+ if (sl->inst_bitrate_len)
+ inst_bitrate_flag = get_bits1(&gb);
+ if (dts_flag == 1)
+ dts = get_bits64(&gb, sl->timestamp_len);
+ if (cts_flag == 1)
+ cts = get_bits64(&gb, sl->timestamp_len);
+ if (sl->au_len > 0)
+ skip_bits_long(&gb, sl->au_len);
+ if (inst_bitrate_flag)
+ skip_bits_long(&gb, sl->inst_bitrate_len);
+ }
+
+ if (dts != AV_NOPTS_VALUE)
+ pes->dts = dts;
+ if (cts != AV_NOPTS_VALUE)
+ pes->pts = cts;
+
+ if (sl->timestamp_len && sl->timestamp_res)
+ avpriv_set_pts_info(pes->st, sl->timestamp_len, 1, sl->timestamp_res);
+
+ return (get_bits_count(&gb) + 7) >> 3;
}
/* return non zero if a packet could be constructed */
const uint8_t *buf, int buf_size, int is_start,
int64_t pos)
{
- PESContext *pes = filter->u.pes_filter.opaque;
+ PESContext *pes = filter->u.pes_filter.opaque;
MpegTSContext *ts = pes->ts;
const uint8_t *p;
int len, code;
- if(!ts->pkt)
+ if (!ts->pkt)
return 0;
if (is_start) {
new_pes_packet(pes, ts->pkt);
ts->stop_parse = 1;
}
- pes->state = MPEGTS_HEADER;
- pes->data_index = 0;
+ pes->state = MPEGTS_HEADER;
+ pes->data_index = 0;
pes->ts_packet_pos = pos;
}
p = buf;
while (buf_size > 0) {
- switch(pes->state) {
+ switch (pes->state) {
case MPEGTS_HEADER:
len = PES_START_SIZE - pes->data_index;
if (len > buf_size)
buf_size -= len;
if (pes->data_index == PES_START_SIZE) {
/* we got all the PES or section header. We can now
- decide */
+ * decide */
if (pes->header[0] == 0x00 && pes->header[1] == 0x00 &&
pes->header[2] == 0x01) {
/* it must be an mpeg2 PES stream */
code = pes->header[3] | 0x100;
- av_dlog(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
+ av_log(pes->stream, AV_LOG_TRACE, "pid=%x pes_code=%#x\n", pes->pid,
+ code);
- if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
+ if ((pes->st && pes->st->discard == AVDISCARD_ALL &&
+ (!pes->sub_st ||
+ pes->sub_st->discard == AVDISCARD_ALL)) ||
code == 0x1be) /* padding_stream */
goto skip;
/* stream not present in PMT */
if (!pes->st) {
- pes->st = av_new_stream(ts->stream, pes->pid);
+ pes->st = avformat_new_stream(ts->stream, NULL);
if (!pes->st)
return AVERROR(ENOMEM);
+ pes->st->id = pes->pid;
mpegts_set_stream_info(pes->st, pes, 0, 0);
}
pes->total_size = AV_RB16(pes->header + 4);
/* NOTE: a zero total size means the PES size is
- unbounded */
+ * unbounded */
if (!pes->total_size)
pes->total_size = MAX_PES_PAYLOAD;
/* allocate pes buffer */
- pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
+ pes->buffer = av_buffer_alloc(pes->total_size +
+ AV_INPUT_BUFFER_PADDING_SIZE);
if (!pes->buffer)
return AVERROR(ENOMEM);
code != 0x1ff && code != 0x1f2 && /* program_stream_directory, DSMCC_stream */
code != 0x1f8) { /* ITU-T Rec. H.222.1 type E stream */
pes->state = MPEGTS_PESHEADER;
- if (pes->st->codec->codec_id == CODEC_ID_NONE) {
- av_dlog(pes->stream, "pid=%x stream_type=%x probing\n",
- pes->pid, pes->stream_type);
- pes->st->codec->codec_id = CODEC_ID_PROBE;
+ if (pes->st->codec->codec_id == AV_CODEC_ID_NONE) {
+ av_log(pes->stream, AV_LOG_TRACE,
+ "pid=%x stream_type=%x probing\n",
+ pes->pid,
+ pes->stream_type);
+ pes->st->codec->codec_id = AV_CODEC_ID_PROBE;
}
} else {
- pes->state = MPEGTS_PAYLOAD;
+ pes->state = MPEGTS_PAYLOAD;
pes->data_index = 0;
}
} else {
/* otherwise, it should be a table */
/* skip packet */
- skip:
+skip:
pes->state = MPEGTS_SKIP;
continue;
}
}
break;
- /**********************************************/
- /* PES packing parsing */
+ /**********************************************/
+ /* PES packing parsing */
case MPEGTS_PESHEADER:
len = PES_HEADER_SIZE - pes->data_index;
if (len < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
if (len > buf_size)
len = buf_size;
memcpy(pes->header + pes->data_index, p, len);
buf_size -= len;
if (pes->data_index == PES_HEADER_SIZE) {
pes->pes_header_size = pes->header[8] + 9;
- pes->state = MPEGTS_PESHEADER_FILL;
+ pes->state = MPEGTS_PESHEADER_FILL;
}
break;
case MPEGTS_PESHEADER_FILL:
len = pes->pes_header_size - pes->data_index;
if (len < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
if (len > buf_size)
len = buf_size;
memcpy(pes->header + pes->data_index, p, len);
if (flags & 0x01) { /* PES extension */
pes_ext = *r++;
/* Skip PES private data, program packet sequence counter and P-STD buffer */
- skip = (pes_ext >> 4) & 0xb;
+ skip = (pes_ext >> 4) & 0xb;
skip += skip & 0x9;
- r += skip;
+ r += skip;
if ((pes_ext & 0x41) == 0x01 &&
(r + 2) <= (pes->header + pes->pes_header_size)) {
/* PES extension 2 */
/* we got the full header. We parse it and get the payload */
pes->state = MPEGTS_PAYLOAD;
pes->data_index = 0;
+ if (pes->stream_type == 0x12 && buf_size > 0) {
+ int sl_header_bytes = read_sl_header(pes, &pes->sl, p,
+ buf_size);
+ pes->pes_header_size += sl_header_bytes;
+ p += sl_header_bytes;
+ buf_size -= sl_header_bytes;
+ }
}
break;
case MPEGTS_PAYLOAD:
if (buf_size > 0 && pes->buffer) {
- if (pes->data_index > 0 && pes->data_index+buf_size > pes->total_size) {
+ if (pes->data_index > 0 &&
+ pes->data_index + buf_size > pes->total_size) {
new_pes_packet(pes, ts->pkt);
pes->total_size = MAX_PES_PAYLOAD;
- pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
+ pes->buffer = av_buffer_alloc(pes->total_size +
+ AV_INPUT_BUFFER_PADDING_SIZE);
if (!pes->buffer)
return AVERROR(ENOMEM);
ts->stop_parse = 1;
- } else if (pes->data_index == 0 && buf_size > pes->total_size) {
+ } else if (pes->data_index == 0 &&
+ buf_size > pes->total_size) {
// pes packet size is < ts size packet and pes data is padded with 0xff
// not sure if this is legal in ts but see issue #2392
buf_size = pes->total_size;
}
- memcpy(pes->buffer+pes->data_index, p, buf_size);
+ memcpy(pes->buffer->data + pes->data_index, p, buf_size);
pes->data_index += buf_size;
}
buf_size = 0;
* decreases demuxer delay for infrequent packets like subtitles from
* a couple of seconds to milliseconds for properly muxed files.
* total_size is the number of bytes following pes_packet_length
- * in the pes header, i.e. not counting the first 6 bytes */
+ * in the pes header, i.e. not counting the first PES_START_SIZE bytes */
if (!ts->stop_parse && pes->total_size < MAX_PES_PAYLOAD &&
- pes->pes_header_size + pes->data_index == pes->total_size + 6) {
+ pes->pes_header_size + pes->data_index == pes->total_size + PES_START_SIZE) {
ts->stop_parse = 1;
new_pes_packet(pes, ts->pkt);
}
pes = av_mallocz(sizeof(PESContext));
if (!pes)
return 0;
- pes->ts = ts;
- pes->stream = ts->stream;
- pes->pid = pid;
+ pes->ts = ts;
+ pes->stream = ts->stream;
+ pes->pid = pid;
pes->pcr_pid = pcr_pid;
- pes->state = MPEGTS_SKIP;
- pes->pts = AV_NOPTS_VALUE;
- pes->dts = AV_NOPTS_VALUE;
- tss = mpegts_open_pes_filter(ts, pid, mpegts_push_data, pes);
+ pes->state = MPEGTS_SKIP;
+ pes->pts = AV_NOPTS_VALUE;
+ pes->dts = AV_NOPTS_VALUE;
+ tss = mpegts_open_pes_filter(ts, pid, mpegts_push_data, pes);
if (!tss) {
av_free(pes);
return 0;
return pes;
}
+#define MAX_LEVEL 4
+typedef struct MP4DescrParseContext {
+ AVFormatContext *s;
+ AVIOContext pb;
+ Mp4Descr *descr;
+ Mp4Descr *active_descr;
+ int descr_count;
+ int max_descr_count;
+ int level;
+} MP4DescrParseContext;
+
+static int init_MP4DescrParseContext(MP4DescrParseContext *d, AVFormatContext *s,
+ const uint8_t *buf, unsigned size,
+ Mp4Descr *descr, int max_descr_count)
+{
+ int ret;
+ if (size > (1 << 30))
+ return AVERROR_INVALIDDATA;
+
+ if ((ret = ffio_init_context(&d->pb, (unsigned char *)buf, size, 0,
+ NULL, NULL, NULL, NULL)) < 0)
+ return ret;
+
+ d->s = s;
+ d->level = 0;
+ d->descr_count = 0;
+ d->descr = descr;
+ d->active_descr = NULL;
+ d->max_descr_count = max_descr_count;
+
+ return 0;
+}
+
+static void update_offsets(AVIOContext *pb, int64_t *off, int *len)
+{
+ int64_t new_off = avio_tell(pb);
+ (*len) -= new_off - *off;
+ *off = new_off;
+}
+
+static int parse_mp4_descr(MP4DescrParseContext *d, int64_t off, int len,
+ int target_tag);
+
+static int parse_mp4_descr_arr(MP4DescrParseContext *d, int64_t off, int len)
+{
+ while (len > 0) {
+ int ret = parse_mp4_descr(d, off, len, 0);
+ if (ret < 0)
+ return ret;
+ update_offsets(&d->pb, &off, &len);
+ }
+ return 0;
+}
+
+static int parse_MP4IODescrTag(MP4DescrParseContext *d, int64_t off, int len)
+{
+ avio_rb16(&d->pb); // ID
+ avio_r8(&d->pb);
+ avio_r8(&d->pb);
+ avio_r8(&d->pb);
+ avio_r8(&d->pb);
+ avio_r8(&d->pb);
+ update_offsets(&d->pb, &off, &len);
+ return parse_mp4_descr_arr(d, off, len);
+}
+
+static int parse_MP4ODescrTag(MP4DescrParseContext *d, int64_t off, int len)
+{
+ int id_flags;
+ if (len < 2)
+ return 0;
+ id_flags = avio_rb16(&d->pb);
+ if (!(id_flags & 0x0020)) { // URL_Flag
+ update_offsets(&d->pb, &off, &len);
+ return parse_mp4_descr_arr(d, off, len); // ES_Descriptor[]
+ } else {
+ return 0;
+ }
+}
+
+static int parse_MP4ESDescrTag(MP4DescrParseContext *d, int64_t off, int len)
+{
+ int es_id = 0;
+ if (d->descr_count >= d->max_descr_count)
+ return AVERROR_INVALIDDATA;
+ ff_mp4_parse_es_descr(&d->pb, &es_id);
+ d->active_descr = d->descr + (d->descr_count++);
+
+ d->active_descr->es_id = es_id;
+ update_offsets(&d->pb, &off, &len);
+ parse_mp4_descr(d, off, len, MP4DecConfigDescrTag);
+ update_offsets(&d->pb, &off, &len);
+ if (len > 0)
+ parse_mp4_descr(d, off, len, MP4SLDescrTag);
+ d->active_descr = NULL;
+ return 0;
+}
+
+static int parse_MP4DecConfigDescrTag(MP4DescrParseContext *d, int64_t off,
+ int len)
+{
+ Mp4Descr *descr = d->active_descr;
+ if (!descr)
+ return AVERROR_INVALIDDATA;
+ d->active_descr->dec_config_descr = av_malloc(len);
+ if (!descr->dec_config_descr)
+ return AVERROR(ENOMEM);
+ descr->dec_config_descr_len = len;
+ avio_read(&d->pb, descr->dec_config_descr, len);
+ return 0;
+}
+
+static int parse_MP4SLDescrTag(MP4DescrParseContext *d, int64_t off, int len)
+{
+ Mp4Descr *descr = d->active_descr;
+ int predefined;
+ if (!descr)
+ return AVERROR_INVALIDDATA;
+
+ predefined = avio_r8(&d->pb);
+ if (!predefined) {
+ int lengths;
+ int flags = avio_r8(&d->pb);
+ descr->sl.use_au_start = !!(flags & 0x80);
+ descr->sl.use_au_end = !!(flags & 0x40);
+ descr->sl.use_rand_acc_pt = !!(flags & 0x20);
+ descr->sl.use_padding = !!(flags & 0x08);
+ descr->sl.use_timestamps = !!(flags & 0x04);
+ descr->sl.use_idle = !!(flags & 0x02);
+ descr->sl.timestamp_res = avio_rb32(&d->pb);
+ avio_rb32(&d->pb);
+ descr->sl.timestamp_len = avio_r8(&d->pb);
+ descr->sl.ocr_len = avio_r8(&d->pb);
+ descr->sl.au_len = avio_r8(&d->pb);
+ descr->sl.inst_bitrate_len = avio_r8(&d->pb);
+ lengths = avio_rb16(&d->pb);
+ descr->sl.degr_prior_len = lengths >> 12;
+ descr->sl.au_seq_num_len = (lengths >> 7) & 0x1f;
+ descr->sl.packet_seq_num_len = (lengths >> 2) & 0x1f;
+ } else {
+ avpriv_report_missing_feature(d->s, "Predefined SLConfigDescriptor");
+ }
+ return 0;
+}
+
+static int parse_mp4_descr(MP4DescrParseContext *d, int64_t off, int len,
+ int target_tag)
+{
+ int tag;
+ int len1 = ff_mp4_read_descr(d->s, &d->pb, &tag);
+ update_offsets(&d->pb, &off, &len);
+ if (len < 0 || len1 > len || len1 <= 0) {
+ av_log(d->s, AV_LOG_ERROR,
+ "Tag %x length violation new length %d bytes remaining %d\n",
+ tag, len1, len);
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (d->level++ >= MAX_LEVEL) {
+ av_log(d->s, AV_LOG_ERROR, "Maximum MP4 descriptor level exceeded\n");
+ goto done;
+ }
+
+ if (target_tag && tag != target_tag) {
+ av_log(d->s, AV_LOG_ERROR, "Found tag %x expected %x\n", tag,
+ target_tag);
+ goto done;
+ }
+
+ switch (tag) {
+ case MP4IODescrTag:
+ parse_MP4IODescrTag(d, off, len1);
+ break;
+ case MP4ODescrTag:
+ parse_MP4ODescrTag(d, off, len1);
+ break;
+ case MP4ESDescrTag:
+ parse_MP4ESDescrTag(d, off, len1);
+ break;
+ case MP4DecConfigDescrTag:
+ parse_MP4DecConfigDescrTag(d, off, len1);
+ break;
+ case MP4SLDescrTag:
+ parse_MP4SLDescrTag(d, off, len1);
+ break;
+ }
+
+
+done:
+ d->level--;
+ avio_seek(&d->pb, off + len1, SEEK_SET);
+ return 0;
+}
+
static int mp4_read_iods(AVFormatContext *s, const uint8_t *buf, unsigned size,
- int *es_id, uint8_t **dec_config_descr,
- int *dec_config_descr_size)
+ Mp4Descr *descr, int *descr_count, int max_descr_count)
{
+ MP4DescrParseContext d;
+ int ret;
+
+ ret = init_MP4DescrParseContext(&d, s, buf, size, descr, max_descr_count);
+ if (ret < 0)
+ return ret;
+
+ ret = parse_mp4_descr(&d, avio_tell(&d.pb), size, MP4IODescrTag);
+
+ *descr_count = d.descr_count;
+ return ret;
+}
+
+static int mp4_read_od(AVFormatContext *s, const uint8_t *buf, unsigned size,
+ Mp4Descr *descr, int *descr_count, int max_descr_count)
+{
+ MP4DescrParseContext d;
+ int ret;
+
+ ret = init_MP4DescrParseContext(&d, s, buf, size, descr, max_descr_count);
+ if (ret < 0)
+ return ret;
+
+ ret = parse_mp4_descr_arr(&d, avio_tell(&d.pb), size);
+
+ *descr_count = d.descr_count;
+ return ret;
+}
+
+static void m4sl_cb(MpegTSFilter *filter, const uint8_t *section,
+ int section_len)
+{
+ MpegTSContext *ts = filter->u.section_filter.opaque;
+ MpegTSSectionFilter *tssf = &filter->u.section_filter;
+ SectionHeader h;
+ const uint8_t *p, *p_end;
AVIOContext pb;
- int tag;
- unsigned len;
-
- ffio_init_context(&pb, buf, size, 0, NULL, NULL, NULL, NULL);
-
- len = ff_mp4_read_descr(s, &pb, &tag);
- if (tag == MP4IODescrTag) {
- avio_rb16(&pb); // ID
- avio_r8(&pb);
- avio_r8(&pb);
- avio_r8(&pb);
- avio_r8(&pb);
- avio_r8(&pb);
- len = ff_mp4_read_descr(s, &pb, &tag);
- if (tag == MP4ESDescrTag) {
- ff_mp4_parse_es_descr(&pb, es_id);
- av_dlog(s, "ES_ID %#x\n", *es_id);
- len = ff_mp4_read_descr(s, &pb, &tag);
- if (tag == MP4DecConfigDescrTag) {
- *dec_config_descr = av_malloc(len);
- if (!*dec_config_descr)
- return AVERROR(ENOMEM);
- *dec_config_descr_size = len;
- avio_read(&pb, *dec_config_descr, len);
+ int mp4_descr_count = 0;
+ Mp4Descr mp4_descr[MAX_MP4_DESCR_COUNT] = { { 0 } };
+ int i, pid;
+ AVFormatContext *s = ts->stream;
+
+ p_end = section + section_len - 4;
+ p = section;
+ if (parse_section_header(&h, &p, p_end) < 0)
+ return;
+ if (h.tid != M4OD_TID)
+ return;
+ if (h.version == tssf->last_ver)
+ return;
+ tssf->last_ver = h.version;
+
+ mp4_read_od(s, p, (unsigned) (p_end - p), mp4_descr, &mp4_descr_count,
+ MAX_MP4_DESCR_COUNT);
+
+ for (pid = 0; pid < NB_PID_MAX; pid++) {
+ if (!ts->pids[pid])
+ continue;
+ for (i = 0; i < mp4_descr_count; i++) {
+ PESContext *pes;
+ AVStream *st;
+ if (ts->pids[pid]->es_id != mp4_descr[i].es_id)
+ continue;
+ if (!(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES)) {
+ av_log(s, AV_LOG_ERROR, "pid %x is not PES\n", pid);
+ continue;
}
+ pes = ts->pids[pid]->u.pes_filter.opaque;
+ st = pes->st;
+ if (!st)
+ continue;
+
+ pes->sl = mp4_descr[i].sl;
+
+ ffio_init_context(&pb, mp4_descr[i].dec_config_descr,
+ mp4_descr[i].dec_config_descr_len, 0,
+ NULL, NULL, NULL, NULL);
+ ff_mp4_read_dec_config_descr(s, st, &pb);
+ if (st->codec->codec_id == AV_CODEC_ID_AAC &&
+ st->codec->extradata_size > 0)
+ st->need_parsing = 0;
+ if (st->codec->codec_id == AV_CODEC_ID_H264 &&
+ st->codec->extradata_size > 0)
+ st->need_parsing = 0;
+
+ st->codec->codec_type = avcodec_get_type(st->codec->codec_id);
}
}
- return 0;
+ for (i = 0; i < mp4_descr_count; i++)
+ av_free(mp4_descr[i].dec_config_descr);
}
+static const uint8_t opus_coupled_stream_cnt[9] = {
+ 1, 0, 1, 1, 2, 2, 2, 3, 3
+};
+
+static const uint8_t opus_stream_cnt[9] = {
+ 1, 1, 1, 2, 2, 3, 4, 4, 5,
+};
+
+static const uint8_t opus_channel_map[8][8] = {
+ { 0 },
+ { 0,1 },
+ { 0,2,1 },
+ { 0,1,2,3 },
+ { 0,4,1,2,3 },
+ { 0,4,1,2,3,5 },
+ { 0,4,1,2,3,5,6 },
+ { 0,6,1,2,3,4,5,7 },
+};
+
int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type,
const uint8_t **pp, const uint8_t *desc_list_end,
- int mp4_dec_config_descr_len, int mp4_es_id, int pid,
- uint8_t *mp4_dec_config_descr)
+ Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
+ MpegTSContext *ts)
{
const uint8_t *desc_end;
- int desc_len, desc_tag;
+ int desc_len, desc_tag, desc_es_id, ext_desc_tag, channels, channel_config_code;
char language[252];
int i;
desc_tag = get8(pp, desc_list_end);
if (desc_tag < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
desc_len = get8(pp, desc_list_end);
if (desc_len < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
desc_end = *pp + desc_len;
if (desc_end > desc_list_end)
- return -1;
+ return AVERROR_INVALIDDATA;
- av_dlog(fc, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
+ av_log(fc, AV_LOG_TRACE, "tag: 0x%02x len=%d\n", desc_tag, desc_len);
- if (st->codec->codec_id == CODEC_ID_NONE &&
+ if (st->codec->codec_id == AV_CODEC_ID_NONE &&
stream_type == STREAM_TYPE_PRIVATE_DATA)
mpegts_find_stream_type(st, desc_tag, DESC_types);
- switch(desc_tag) {
+ switch (desc_tag) {
+ case 0x1E: /* SL descriptor */
+ desc_es_id = get16(pp, desc_end);
+ if (desc_es_id < 0)
+ break;
+ if (ts && ts->pids[pid])
+ ts->pids[pid]->es_id = desc_es_id;
+ for (i = 0; i < mp4_descr_count; i++)
+ if (mp4_descr[i].dec_config_descr_len &&
+ mp4_descr[i].es_id == desc_es_id) {
+ AVIOContext pb;
+ ffio_init_context(&pb, mp4_descr[i].dec_config_descr,
+ mp4_descr[i].dec_config_descr_len, 0,
+ NULL, NULL, NULL, NULL);
+ ff_mp4_read_dec_config_descr(fc, st, &pb);
+ if (st->codec->codec_id == AV_CODEC_ID_AAC &&
+ st->codec->extradata_size > 0)
+ st->need_parsing = 0;
+ if (st->codec->codec_id == AV_CODEC_ID_MPEG4SYSTEMS)
+ mpegts_open_section_filter(ts, pid, m4sl_cb, ts, 1);
+ }
+ break;
case 0x1F: /* FMC descriptor */
- get16(pp, desc_end);
- if (st->codec->codec_id == CODEC_ID_AAC_LATM &&
- mp4_dec_config_descr_len && mp4_es_id == pid) {
+ if (get16(pp, desc_end) < 0)
+ break;
+ if (mp4_descr_count > 0 &&
+ st->codec->codec_id == AV_CODEC_ID_AAC_LATM &&
+ mp4_descr->dec_config_descr_len && mp4_descr->es_id == pid) {
AVIOContext pb;
- ffio_init_context(&pb, mp4_dec_config_descr,
- mp4_dec_config_descr_len, 0, NULL, NULL, NULL, NULL);
+ ffio_init_context(&pb, mp4_descr->dec_config_descr,
+ mp4_descr->dec_config_descr_len, 0,
+ NULL, NULL, NULL, NULL);
ff_mp4_read_dec_config_descr(fc, st, &pb);
- if (st->codec->codec_id == CODEC_ID_AAC &&
+ if (st->codec->codec_id == AV_CODEC_ID_AAC &&
st->codec->extradata_size > 0)
st->need_parsing = 0;
}
language[2] = get8(pp, desc_end);
language[3] = 0;
/* hearing impaired subtitles detection */
- switch(get8(pp, desc_end)) {
+ switch (get8(pp, desc_end)) {
case 0x20: /* DVB subtitles (for the hard of hearing) with no monitor aspect ratio criticality */
case 0x21: /* DVB subtitles (for the hard of hearing) for display on 4:3 aspect ratio monitor */
case 0x22: /* DVB subtitles (for the hard of hearing) for display on 16:9 aspect ratio monitor */
break;
}
if (st->codec->extradata) {
- if (st->codec->extradata_size == 4 && memcmp(st->codec->extradata, *pp, 4))
- av_log_ask_for_sample(fc, "DVB sub with multiple IDs\n");
+ if (st->codec->extradata_size == 4 &&
+ memcmp(st->codec->extradata, *pp, 4))
+ avpriv_request_sample(fc, "DVB sub with multiple IDs");
} else {
- st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE);
+ st->codec->extradata = av_malloc(4 + AV_INPUT_BUFFER_PADDING_SIZE);
if (st->codec->extradata) {
st->codec->extradata_size = 4;
memcpy(st->codec->extradata, *pp, 4);
language[i + 1] = get8(pp, desc_end);
language[i + 2] = get8(pp, desc_end);
language[i + 3] = ',';
- switch (get8(pp, desc_end)) {
- case 0x01: st->disposition |= AV_DISPOSITION_CLEAN_EFFECTS; break;
- case 0x02: st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED; break;
- case 0x03: st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED; break;
- }
+ switch (get8(pp, desc_end)) {
+ case 0x01:
+ st->disposition |= AV_DISPOSITION_CLEAN_EFFECTS;
+ break;
+ case 0x02:
+ st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED;
+ break;
+ case 0x03:
+ st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED;
+ break;
+ }
}
- if (i) {
+ if (i && language[0]) {
language[i - 1] = 0;
av_dict_set(&st->metadata, "language", language, 0);
}
break;
case 0x05: /* registration descriptor */
st->codec->codec_tag = bytestream_get_le32(pp);
- av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
- if (st->codec->codec_id == CODEC_ID_NONE &&
- stream_type == STREAM_TYPE_PRIVATE_DATA)
+ av_log(fc, AV_LOG_TRACE, "reg_desc=%.4s\n", (char *)&st->codec->codec_tag);
+ if (st->codec->codec_id == AV_CODEC_ID_NONE)
mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
break;
+ case 0x7f: /* DVB extension descriptor */
+ ext_desc_tag = get8(pp, desc_end);
+ if (ext_desc_tag < 0)
+ return AVERROR_INVALIDDATA;
+ if (st->codec->codec_id == AV_CODEC_ID_OPUS &&
+ ext_desc_tag == 0x80) { /* User defined (provisional Opus) */
+ if (!st->codec->extradata) {
+ st->codec->extradata = av_mallocz(sizeof(opus_default_extradata) +
+ AV_INPUT_BUFFER_PADDING_SIZE);
+ if (!st->codec->extradata)
+ return AVERROR(ENOMEM);
+
+ st->codec->extradata_size = sizeof(opus_default_extradata);
+ memcpy(st->codec->extradata, opus_default_extradata, sizeof(opus_default_extradata));
+
+ channel_config_code = get8(pp, desc_end);
+ if (channel_config_code < 0)
+ return AVERROR_INVALIDDATA;
+ if (channel_config_code <= 0x8) {
+ st->codec->extradata[9] = channels = channel_config_code ? channel_config_code : 2;
+ st->codec->extradata[18] = channel_config_code ? (channels > 2) : 255;
+ st->codec->extradata[19] = opus_stream_cnt[channel_config_code];
+ st->codec->extradata[20] = opus_coupled_stream_cnt[channel_config_code];
+ memcpy(&st->codec->extradata[21], opus_channel_map[channels - 1], channels);
+ } else {
+ avpriv_request_sample(fc, "Opus in MPEG-TS - channel_config_code > 0x8");
+ }
+ st->need_parsing = AVSTREAM_PARSE_FULL;
+ }
+ }
+ break;
default:
break;
}
static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
MpegTSContext *ts = filter->u.section_filter.opaque;
+ MpegTSSectionFilter *tssf = &filter->u.section_filter;
SectionHeader h1, *h = &h1;
PESContext *pes;
AVStream *st;
int program_info_length, pcr_pid, pid, stream_type;
int desc_list_len;
uint32_t prog_reg_desc = 0; /* registration descriptor */
- uint8_t *mp4_dec_config_descr = NULL;
- int mp4_dec_config_descr_len = 0;
- int mp4_es_id = 0;
- av_dlog(ts->stream, "PMT: len %i\n", section_len);
- hex_dump_debug(ts->stream, (uint8_t *)section, section_len);
+ int mp4_descr_count = 0;
+ Mp4Descr mp4_descr[MAX_MP4_DESCR_COUNT] = { { 0 } };
+ int i;
+
+ av_log(ts->stream, AV_LOG_TRACE, "PMT: len %i\n", section_len);
+ hex_dump_debug(ts->stream, section, section_len);
p_end = section + section_len - 4;
p = section;
if (parse_section_header(h, &p, p_end) < 0)
return;
+ if (h->version == tssf->last_ver)
+ return;
+ tssf->last_ver = h->version;
- av_dlog(ts->stream, "sid=0x%x sec_num=%d/%d\n",
- h->id, h->sec_num, h->last_sec_num);
+ av_log(ts->stream, AV_LOG_TRACE, "sid=0x%x sec_num=%d/%d\n",
+ h->id, h->sec_num, h->last_sec_num);
if (h->tid != PMT_TID)
return;
clear_program(ts, h->id);
- pcr_pid = get16(&p, p_end) & 0x1fff;
+ pcr_pid = get16(&p, p_end);
if (pcr_pid < 0)
return;
+ pcr_pid &= 0x1fff;
add_pid_to_pmt(ts, h->id, pcr_pid);
- av_dlog(ts->stream, "pcr_pid=0x%x\n", pcr_pid);
+ av_log(ts->stream, AV_LOG_TRACE, "pcr_pid=0x%x\n", pcr_pid);
- program_info_length = get16(&p, p_end) & 0xfff;
+ program_info_length = get16(&p, p_end);
if (program_info_length < 0)
return;
- while(program_info_length >= 2) {
+ program_info_length &= 0xfff;
+ while (program_info_length >= 2) {
uint8_t tag, len;
tag = get8(&p, p_end);
len = get8(&p, p_end);
- av_dlog(ts->stream, "program tag: 0x%02x len=%d\n", tag, len);
+ av_log(ts->stream, AV_LOG_TRACE, "program tag: 0x%02x len=%d\n", tag, len);
- if(len > program_info_length - 2)
- //something else is broken, exit the program_descriptors_loop
+ if (len > program_info_length - 2)
+ // something else is broken, exit the program_descriptors_loop
break;
program_info_length -= len + 2;
if (tag == 0x1d) { // IOD descriptor
get8(&p, p_end); // scope
get8(&p, p_end); // label
len -= 2;
- mp4_read_iods(ts->stream, p, len, &mp4_es_id,
- &mp4_dec_config_descr, &mp4_dec_config_descr_len);
+ mp4_read_iods(ts->stream, p, len, mp4_descr + mp4_descr_count,
+ &mp4_descr_count, MAX_MP4_DESCR_COUNT);
} else if (tag == 0x05 && len >= 4) { // registration descriptor
prog_reg_desc = bytestream_get_le32(&p);
len -= 4;
if (!ts->stream->nb_streams)
ts->stop_parse = 1;
- for(;;) {
+
+ for (;;) {
st = 0;
+ pes = NULL;
stream_type = get8(&p, p_end);
if (stream_type < 0)
break;
- pid = get16(&p, p_end) & 0x1fff;
+ pid = get16(&p, p_end);
if (pid < 0)
break;
+ pid &= 0x1fff;
- /* now create ffmpeg stream */
+ /* now create stream */
if (ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES) {
pes = ts->pids[pid]->u.pes_filter.opaque;
- if (!pes->st)
- pes->st = av_new_stream(pes->stream, pes->pid);
+ if (!pes->st) {
+ pes->st = avformat_new_stream(pes->stream, NULL);
+ pes->st->id = pes->pid;
+ }
st = pes->st;
- } else {
- if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); //wrongly added sdt filter probably
+ } else if (stream_type != 0x13) {
+ if (ts->pids[pid])
+ mpegts_close_filter(ts, ts->pids[pid]); // wrongly added sdt filter probably
pes = add_pes_stream(ts, pid, pcr_pid);
- if (pes)
- st = av_new_stream(pes->stream, pes->pid);
+ if (pes) {
+ st = avformat_new_stream(pes->stream, NULL);
+ st->id = pes->pid;
+ }
+ } else {
+ int idx = ff_find_stream_index(ts->stream, pid);
+ if (idx >= 0) {
+ st = ts->stream->streams[idx];
+ } else {
+ st = avformat_new_stream(ts->stream, NULL);
+ st->id = pid;
+ st->codec->codec_type = AVMEDIA_TYPE_DATA;
+ }
}
if (!st)
goto out;
- if (!pes->stream_type)
+ if (pes && !pes->stream_type)
mpegts_set_stream_info(st, pes, stream_type, prog_reg_desc);
add_pid_to_pmt(ts, h->id, pid);
ff_program_add_stream_index(ts->stream, h->id, st->index);
- desc_list_len = get16(&p, p_end) & 0xfff;
+ desc_list_len = get16(&p, p_end);
if (desc_list_len < 0)
break;
- desc_list_end = p + desc_list_len;
+ desc_list_len &= 0xfff;
+ desc_list_end = p + desc_list_len;
if (desc_list_end > p_end)
break;
- for(;;) {
- if (ff_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p, desc_list_end,
- mp4_dec_config_descr_len, mp4_es_id, pid, mp4_dec_config_descr) < 0)
+ for (;;) {
+ if (ff_parse_mpeg2_descriptor(ts->stream, st, stream_type, &p,
+ desc_list_end, mp4_descr,
+ mp4_descr_count, pid, ts) < 0)
break;
- if (prog_reg_desc == AV_RL32("HDMV") && stream_type == 0x83 && pes->sub_st) {
- ff_program_add_stream_index(ts->stream, h->id, pes->sub_st->index);
+ if (pes && prog_reg_desc == AV_RL32("HDMV") &&
+ stream_type == 0x83 && pes->sub_st) {
+ ff_program_add_stream_index(ts->stream, h->id,
+ pes->sub_st->index);
pes->sub_st->codec->codec_tag = st->codec->codec_tag;
}
}
p = desc_list_end;
}
- out:
- av_free(mp4_dec_config_descr);
+out:
+ for (i = 0; i < mp4_descr_count; i++)
+ av_free(mp4_descr[i].dec_config_descr);
}
static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
MpegTSContext *ts = filter->u.section_filter.opaque;
+ MpegTSSectionFilter *tssf = &filter->u.section_filter;
SectionHeader h1, *h = &h1;
const uint8_t *p, *p_end;
int sid, pmt_pid;
- av_dlog(ts->stream, "PAT:\n");
- hex_dump_debug(ts->stream, (uint8_t *)section, section_len);
+ av_log(ts->stream, AV_LOG_TRACE, "PAT:\n");
+ hex_dump_debug(ts->stream, section, section_len);
p_end = section + section_len - 4;
- p = section;
+ p = section;
if (parse_section_header(h, &p, p_end) < 0)
return;
if (h->tid != PAT_TID)
return;
+ if (h->version == tssf->last_ver)
+ return;
+ tssf->last_ver = h->version;
clear_programs(ts);
- for(;;) {
+ for (;;) {
sid = get16(&p, p_end);
if (sid < 0)
break;
- pmt_pid = get16(&p, p_end) & 0x1fff;
+ pmt_pid = get16(&p, p_end);
if (pmt_pid < 0)
break;
+ pmt_pid &= 0x1fff;
- av_dlog(ts->stream, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
+ av_log(ts->stream, AV_LOG_TRACE, "sid=0x%x pid=0x%x\n", sid, pmt_pid);
if (sid == 0x0000) {
/* NIT info */
mpegts_close_filter(ts, ts->pids[pmt_pid]);
mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);
add_pat_entry(ts, sid);
- add_pid_to_pmt(ts, sid, 0); //add pat pid to program
+ add_pid_to_pmt(ts, sid, 0); // add pat pid to program
add_pid_to_pmt(ts, sid, pmt_pid);
}
}
static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)
{
MpegTSContext *ts = filter->u.section_filter.opaque;
+ MpegTSSectionFilter *tssf = &filter->u.section_filter;
SectionHeader h1, *h = &h1;
const uint8_t *p, *p_end, *desc_list_end, *desc_end;
int onid, val, sid, desc_list_len, desc_tag, desc_len, service_type;
char *name, *provider_name;
- av_dlog(ts->stream, "SDT:\n");
- hex_dump_debug(ts->stream, (uint8_t *)section, section_len);
+ av_log(ts->stream, AV_LOG_TRACE, "SDT:\n");
+ hex_dump_debug(ts->stream, section, section_len);
p_end = section + section_len - 4;
- p = section;
+ p = section;
if (parse_section_header(h, &p, p_end) < 0)
return;
if (h->tid != SDT_TID)
return;
+ if (h->version == tssf->last_ver)
+ return;
+ tssf->last_ver = h->version;
+
onid = get16(&p, p_end);
if (onid < 0)
return;
val = get8(&p, p_end);
if (val < 0)
return;
- for(;;) {
+ for (;;) {
sid = get16(&p, p_end);
if (sid < 0)
break;
val = get8(&p, p_end);
if (val < 0)
break;
- desc_list_len = get16(&p, p_end) & 0xfff;
+ desc_list_len = get16(&p, p_end);
if (desc_list_len < 0)
break;
- desc_list_end = p + desc_list_len;
+ desc_list_len &= 0xfff;
+ desc_list_end = p + desc_list_len;
if (desc_list_end > p_end)
break;
- for(;;) {
+ for (;;) {
desc_tag = get8(&p, desc_list_end);
if (desc_tag < 0)
break;
if (desc_end > desc_list_end)
break;
- av_dlog(ts->stream, "tag: 0x%02x len=%d\n",
- desc_tag, desc_len);
+ av_log(ts->stream, AV_LOG_TRACE, "tag: 0x%02x len=%d\n",
+ desc_tag, desc_len);
- switch(desc_tag) {
+ switch (desc_tag) {
case 0x48:
service_type = get8(&p, p_end);
if (service_type < 0)
name = getstr8(&p, p_end);
if (name) {
AVProgram *program = av_new_program(ts->stream, sid);
- if(program) {
+ if (program) {
av_dict_set(&program->metadata, "service_name", name, 0);
- av_dict_set(&program->metadata, "service_provider", provider_name, 0);
+ av_dict_set(&program->metadata, "service_provider",
+ provider_name, 0);
}
}
av_free(name);
/* handle one TS packet */
static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
{
- AVFormatContext *s = ts->stream;
MpegTSFilter *tss;
int len, pid, cc, expected_cc, cc_ok, afc, is_start, is_discontinuity,
has_adaptation, has_payload;
int64_t pos;
pid = AV_RB16(packet + 1) & 0x1fff;
- if(pid && discard_pid(ts, pid))
+ if (pid && discard_pid(ts, pid))
return 0;
is_start = packet[1] & 0x40;
tss = ts->pids[pid];
- if (ts->auto_guess && tss == NULL && is_start) {
+ if (ts->auto_guess && !tss && is_start) {
add_pes_stream(ts, pid, -1);
tss = ts->pids[pid];
}
afc = (packet[3] >> 4) & 3;
if (afc == 0) /* reserved value */
return 0;
- has_adaptation = afc & 2;
- has_payload = afc & 1;
- is_discontinuity = has_adaptation
- && packet[4] != 0 /* with length > 0 */
- && (packet[5] & 0x80); /* and discontinuity indicated */
+ has_adaptation = afc & 2;
+ has_payload = afc & 1;
+ is_discontinuity = has_adaptation &&
+ packet[4] != 0 && /* with length > 0 */
+ (packet[5] & 0x80); /* and discontinuity indicated */
/* continuity check (currently not used) */
cc = (packet[3] & 0xf);
expected_cc = has_payload ? (tss->last_cc + 1) & 0x0f : tss->last_cc;
- cc_ok = pid == 0x1FFF // null packet PID
- || is_discontinuity
- || tss->last_cc < 0
- || expected_cc == cc;
+ cc_ok = pid == 0x1FFF || // null packet PID
+ is_discontinuity ||
+ tss->last_cc < 0 ||
+ expected_cc == cc;
tss->last_cc = cc;
if (!cc_ok) {
av_log(ts->stream, AV_LOG_WARNING,
"Continuity check failed for pid %d expected %d got %d\n",
pid, expected_cc, cc);
- if(tss->type == MPEGTS_PES) {
+ if (tss->type == MPEGTS_PES) {
PESContext *pc = tss->u.pes_filter.opaque;
pc->flags |= AV_PKT_FLAG_CORRUPT;
}
return 0;
p = packet + 4;
if (has_adaptation) {
- /* skip adapation field */
+ /* skip adaptation field */
p += p[0] + 1;
}
/* if past the end of packet, ignore */
return 0;
pos = avio_tell(ts->stream->pb);
- ts->pos47= pos % ts->raw_packet_size;
+ MOD_UNLIKELY(ts->pos47, pos, ts->raw_packet_size, ts->pos);
if (tss->type == MPEGTS_SECTION) {
if (is_start) {
return 0;
if (len && cc_ok) {
/* write remaining section bytes */
- write_section_data(s, tss,
+ write_section_data(ts, tss,
p, len, 0);
/* check whether filter has been closed */
if (!ts->pids[pid])
}
p += len;
if (p < p_end) {
- write_section_data(s, tss,
+ write_section_data(ts, tss,
p, p_end - p, 1);
}
} else {
if (cc_ok) {
- write_section_data(s, tss,
+ write_section_data(ts, tss,
p, p_end - p, 0);
}
}
}
/* XXX: try to find a better synchro over several packets (use
- get_packet_size() ?) */
+ * get_packet_size() ?) */
static int mpegts_resync(AVFormatContext *s)
{
+ MpegTSContext *ts = s->priv_data;
AVIOContext *pb = s->pb;
int c, i;
- for(i = 0;i < MAX_RESYNC_SIZE; i++) {
+ for (i = 0; i < ts->resync_size; i++) {
c = avio_r8(pb);
if (pb->eof_reached)
- return -1;
+ return AVERROR_EOF;
if (c == 0x47) {
avio_seek(pb, -1, SEEK_CUR);
return 0;
}
}
- av_log(s, AV_LOG_ERROR, "max resync size reached, could not find sync byte\n");
+ av_log(s, AV_LOG_ERROR,
+ "max resync size reached, could not find sync byte\n");
/* no sync found */
- return -1;
+ return AVERROR_INVALIDDATA;
}
-/* return -1 if error or EOF. Return 0 if OK. */
-static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size)
+/* return AVERROR_something if error or EOF. Return 0 if OK. */
+static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size,
+ const uint8_t **data)
{
AVIOContext *pb = s->pb;
- int skip, len;
+ int len;
- for(;;) {
- len = avio_read(pb, buf, TS_PACKET_SIZE);
+ for (;;) {
+ len = ffio_read_indirect(pb, buf, TS_PACKET_SIZE, data);
if (len != TS_PACKET_SIZE)
return len < 0 ? len : AVERROR_EOF;
- /* check paquet sync byte */
- if (buf[0] != 0x47) {
+ /* check packet sync byte */
+ if ((*data)[0] != 0x47) {
/* find a new packet start */
avio_seek(pb, -TS_PACKET_SIZE, SEEK_CUR);
if (mpegts_resync(s) < 0)
else
continue;
} else {
- skip = raw_packet_size - TS_PACKET_SIZE;
- if (skip > 0)
- avio_skip(pb, skip);
break;
}
}
return 0;
}
+static void finished_reading_packet(AVFormatContext *s, int raw_packet_size)
+{
+ AVIOContext *pb = s->pb;
+ int skip = raw_packet_size - TS_PACKET_SIZE;
+ if (skip > 0)
+ avio_skip(pb, skip);
+}
+
static int handle_packets(MpegTSContext *ts, int nb_packets)
{
AVFormatContext *s = ts->stream;
- uint8_t packet[TS_PACKET_SIZE];
+ uint8_t packet[TS_PACKET_SIZE + AV_INPUT_BUFFER_PADDING_SIZE];
+ const uint8_t *data;
int packet_num, ret = 0;
if (avio_tell(s->pb) != ts->last_pos) {
int i;
- av_dlog("Skipping after seek\n");
+ av_log(ts->stream, AV_LOG_TRACE, "Skipping after seek\n");
/* seek detected, flush pes buffer */
for (i = 0; i < NB_PID_MAX; i++) {
if (ts->pids[i]) {
if (ts->pids[i]->type == MPEGTS_PES) {
- PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
- av_freep(&pes->buffer);
- pes->data_index = 0;
- pes->state = MPEGTS_SKIP; /* skip until pes header */
+ PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
+ av_buffer_unref(&pes->buffer);
+ pes->data_index = 0;
+ pes->state = MPEGTS_SKIP; /* skip until pes header */
}
ts->pids[i]->last_cc = -1;
}
ts->stop_parse = 0;
packet_num = 0;
- for(;;) {
- if (ts->stop_parse>0)
+ memset(packet + TS_PACKET_SIZE, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+ for (;;) {
+ if (ts->stop_parse > 0)
break;
packet_num++;
if (nb_packets != 0 && packet_num >= nb_packets)
break;
- ret = read_packet(s, packet, ts->raw_packet_size);
+ ret = read_packet(s, packet, ts->raw_packet_size, &data);
if (ret != 0)
break;
- ret = handle_packet(ts, packet);
+ ret = handle_packet(ts, data);
+ finished_reading_packet(s, ts->raw_packet_size);
if (ret != 0)
break;
}
static int mpegts_probe(AVProbeData *p)
{
-#if 1
- const int size= p->buf_size;
+ const int size = p->buf_size;
int score, fec_score, dvhs_score;
- int check_count= size / TS_FEC_PACKET_SIZE;
+ int check_count = size / TS_FEC_PACKET_SIZE;
#define CHECK_COUNT 10
if (check_count < CHECK_COUNT)
- return -1;
-
- score = analyze(p->buf, TS_PACKET_SIZE *check_count, TS_PACKET_SIZE , NULL)*CHECK_COUNT/check_count;
- dvhs_score= analyze(p->buf, TS_DVHS_PACKET_SIZE*check_count, TS_DVHS_PACKET_SIZE, NULL)*CHECK_COUNT/check_count;
- fec_score = analyze(p->buf, TS_FEC_PACKET_SIZE *check_count, TS_FEC_PACKET_SIZE , NULL)*CHECK_COUNT/check_count;
-// av_log(NULL, AV_LOG_DEBUG, "score: %d, dvhs_score: %d, fec_score: %d \n", score, dvhs_score, fec_score);
-
-// we need a clear definition for the returned score otherwise things will become messy sooner or later
- if (score > fec_score && score > dvhs_score && score > 6) return AVPROBE_SCORE_MAX + score - CHECK_COUNT;
- else if(dvhs_score > score && dvhs_score > fec_score && dvhs_score > 6) return AVPROBE_SCORE_MAX + dvhs_score - CHECK_COUNT;
- else if( fec_score > 6) return AVPROBE_SCORE_MAX + fec_score - CHECK_COUNT;
- else return -1;
-#else
- /* only use the extension for safer guess */
- if (av_match_ext(p->filename, "ts"))
- return AVPROBE_SCORE_MAX;
+ return AVERROR_INVALIDDATA;
+
+ score = analyze(p->buf, TS_PACKET_SIZE * check_count,
+ TS_PACKET_SIZE, NULL, 1) * CHECK_COUNT / check_count;
+ dvhs_score = analyze(p->buf, TS_DVHS_PACKET_SIZE * check_count,
+ TS_DVHS_PACKET_SIZE, NULL, 1) * CHECK_COUNT / check_count;
+ fec_score = analyze(p->buf, TS_FEC_PACKET_SIZE * check_count,
+ TS_FEC_PACKET_SIZE, NULL, 1) * CHECK_COUNT / check_count;
+ av_log(NULL, AV_LOG_TRACE, "score: %d, dvhs_score: %d, fec_score: %d \n",
+ score, dvhs_score, fec_score);
+
+ /* we need a clear definition for the returned score otherwise
+ * things will become messy sooner or later */
+ if (score > fec_score && score > dvhs_score && score > 6)
+ return AVPROBE_SCORE_MAX + score - CHECK_COUNT;
+ else if (dvhs_score > score && dvhs_score > fec_score && dvhs_score > 6)
+ return AVPROBE_SCORE_MAX + dvhs_score - CHECK_COUNT;
+ else if (fec_score > 6)
+ return AVPROBE_SCORE_MAX + fec_score - CHECK_COUNT;
else
- return 0;
-#endif
+ return AVERROR_INVALIDDATA;
}
/* return the 90kHz PCR and the extension for the 27MHz PCR. return
- (-1) if not available */
-static int parse_pcr(int64_t *ppcr_high, int *ppcr_low,
- const uint8_t *packet)
+ * (-1) if not available */
+static int parse_pcr(int64_t *ppcr_high, int *ppcr_low, const uint8_t *packet)
{
int afc, len, flags;
const uint8_t *p;
afc = (packet[3] >> 4) & 3;
if (afc <= 1)
- return -1;
- p = packet + 4;
+ return AVERROR_INVALIDDATA;
+ p = packet + 4;
len = p[0];
p++;
if (len == 0)
- return -1;
+ return AVERROR_INVALIDDATA;
flags = *p++;
len--;
if (!(flags & 0x10))
- return -1;
+ return AVERROR_INVALIDDATA;
if (len < 6)
- return -1;
- v = AV_RB32(p);
- *ppcr_high = ((int64_t)v << 1) | (p[4] >> 7);
- *ppcr_low = ((p[4] & 1) << 8) | p[5];
+ return AVERROR_INVALIDDATA;
+ v = AV_RB32(p);
+ *ppcr_high = ((int64_t) v << 1) | (p[4] >> 7);
+ *ppcr_low = ((p[4] & 1) << 8) | p[5];
return 0;
}
-static int mpegts_read_header(AVFormatContext *s,
- AVFormatParameters *ap)
+static int mpegts_read_header(AVFormatContext *s)
{
MpegTSContext *ts = s->priv_data;
- AVIOContext *pb = s->pb;
- uint8_t buf[5*1024];
+ AVIOContext *pb = s->pb;
+ uint8_t buf[5 * 1024];
int len;
int64_t pos;
/* read the first 1024 bytes to get packet size */
pos = avio_tell(pb);
len = avio_read(pb, buf, sizeof(buf));
+ if (len < 0)
+ return len;
if (len != sizeof(buf))
- goto fail;
+ return AVERROR_BUG;
ts->raw_packet_size = get_packet_size(buf, sizeof(buf));
if (ts->raw_packet_size <= 0)
- goto fail;
- ts->stream = s;
+ return AVERROR_INVALIDDATA;
+ ts->stream = s;
ts->auto_guess = 0;
if (s->iformat == &ff_mpegts_demuxer) {
/* normal demux */
- /* first do a scaning to get all the services */
- if (pb->seekable && avio_seek(pb, pos, SEEK_SET) < 0)
+ /* first do a scan to get all the services */
+ if (avio_seek(pb, pos, SEEK_SET) < 0 && pb->seekable)
av_log(s, AV_LOG_ERROR, "Unable to seek back to the start\n");
mpegts_open_section_filter(ts, SDT_PID, sdt_cb, ts, 1);
ts->auto_guess = 1;
- av_dlog(ts->stream, "tuning done\n");
+ av_log(ts->stream, AV_LOG_TRACE, "tuning done\n");
s->ctx_flags |= AVFMTCTX_NOHEADER;
} else {
int64_t pcrs[2], pcr_h;
int packet_count[2];
uint8_t packet[TS_PACKET_SIZE];
+ const uint8_t *data;
/* only read packets */
- st = av_new_stream(s, 0);
+ st = avformat_new_stream(s, NULL);
if (!st)
- goto fail;
- av_set_pts_info(st, 60, 1, 27000000);
+ return AVERROR(ENOMEM);
+ avpriv_set_pts_info(st, 60, 1, 27000000);
st->codec->codec_type = AVMEDIA_TYPE_DATA;
- st->codec->codec_id = CODEC_ID_MPEG2TS;
+ st->codec->codec_id = AV_CODEC_ID_MPEG2TS;
/* we iterate until we find two PCRs to estimate the bitrate */
- pcr_pid = -1;
- nb_pcrs = 0;
+ pcr_pid = -1;
+ nb_pcrs = 0;
nb_packets = 0;
- for(;;) {
- ret = read_packet(s, packet, ts->raw_packet_size);
+ for (;;) {
+ ret = read_packet(s, packet, ts->raw_packet_size, &data);
if (ret < 0)
- return -1;
- pid = AV_RB16(packet + 1) & 0x1fff;
+ return ret;
+ pid = AV_RB16(data + 1) & 0x1fff;
if ((pcr_pid == -1 || pcr_pid == pid) &&
- parse_pcr(&pcr_h, &pcr_l, packet) == 0) {
+ parse_pcr(&pcr_h, &pcr_l, data) == 0) {
+ finished_reading_packet(s, ts->raw_packet_size);
pcr_pid = pid;
packet_count[nb_pcrs] = nb_packets;
pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
nb_pcrs++;
if (nb_pcrs >= 2)
break;
+ } else {
+ finished_reading_packet(s, ts->raw_packet_size);
}
nb_packets++;
}
/* NOTE1: the bitrate is computed without the FEC */
/* NOTE2: it is only the bitrate of the start of the stream */
ts->pcr_incr = (pcrs[1] - pcrs[0]) / (packet_count[1] - packet_count[0]);
- ts->cur_pcr = pcrs[0] - ts->pcr_incr * packet_count[0];
- s->bit_rate = (TS_PACKET_SIZE * 8) * 27e6 / ts->pcr_incr;
+ ts->cur_pcr = pcrs[0] - ts->pcr_incr * packet_count[0];
+ s->bit_rate = TS_PACKET_SIZE * 8 * 27e6 / ts->pcr_incr;
st->codec->bit_rate = s->bit_rate;
- st->start_time = ts->cur_pcr;
- av_dlog(ts->stream, "start=%0.3f pcr=%0.3f incr=%d\n",
+ st->start_time = ts->cur_pcr;
+ av_log(ts->stream, AV_LOG_TRACE, "start=%0.3f pcr=%0.3f incr=%d\n",
st->start_time / 1000000.0, pcrs[0] / 27e6, ts->pcr_incr);
}
avio_seek(pb, pos, SEEK_SET);
return 0;
- fail:
- return -1;
}
#define MAX_PACKET_READAHEAD ((128 * 1024) / 188)
-static int mpegts_raw_read_packet(AVFormatContext *s,
- AVPacket *pkt)
+static int mpegts_raw_read_packet(AVFormatContext *s, AVPacket *pkt)
{
MpegTSContext *ts = s->priv_data;
int ret, i;
int64_t pcr_h, next_pcr_h, pos;
int pcr_l, next_pcr_l;
uint8_t pcr_buf[12];
+ const uint8_t *data;
if (av_new_packet(pkt, TS_PACKET_SIZE) < 0)
return AVERROR(ENOMEM);
- pkt->pos= avio_tell(s->pb);
- ret = read_packet(s, pkt->data, ts->raw_packet_size);
+ ret = read_packet(s, pkt->data, ts->raw_packet_size, &data);
+ pkt->pos = avio_tell(s->pb);
if (ret < 0) {
- av_free_packet(pkt);
+ av_packet_unref(pkt);
return ret;
}
+ if (data != pkt->data)
+ memcpy(pkt->data, data, ts->raw_packet_size);
+ finished_reading_packet(s, ts->raw_packet_size);
if (ts->mpeg2ts_compute_pcr) {
/* compute exact PCR for each packet */
if (parse_pcr(&pcr_h, &pcr_l, pkt->data) == 0) {
/* we read the next PCR (XXX: optimize it by using a bigger buffer */
pos = avio_tell(s->pb);
- for(i = 0; i < MAX_PACKET_READAHEAD; i++) {
+ for (i = 0; i < MAX_PACKET_READAHEAD; i++) {
avio_seek(s->pb, pos + i * ts->raw_packet_size, SEEK_SET);
avio_read(s->pb, pcr_buf, 12);
if (parse_pcr(&next_pcr_h, &next_pcr_l, pcr_buf) == 0) {
/* XXX: not precise enough */
- ts->pcr_incr = ((next_pcr_h - pcr_h) * 300 + (next_pcr_l - pcr_l)) /
+ ts->pcr_incr =
+ ((next_pcr_h - pcr_h) * 300 + (next_pcr_l - pcr_l)) /
(i + 1);
break;
}
/* no next PCR found: we use previous increment */
ts->cur_pcr = pcr_h * 300 + pcr_l;
}
- pkt->pts = ts->cur_pcr;
+ pkt->pts = ts->cur_pcr;
pkt->duration = ts->pcr_incr;
- ts->cur_pcr += ts->pcr_incr;
+ ts->cur_pcr += ts->pcr_incr;
}
pkt->stream_index = 0;
return 0;
}
-static int mpegts_read_packet(AVFormatContext *s,
- AVPacket *pkt)
+static int mpegts_read_packet(AVFormatContext *s, AVPacket *pkt)
{
MpegTSContext *ts = s->priv_data;
int ret, i;
+ pkt->size = -1;
ts->pkt = pkt;
ret = handle_packets(ts, 0);
if (ret < 0) {
/* flush pes data left */
- for (i = 0; i < NB_PID_MAX; i++) {
+ for (i = 0; i < NB_PID_MAX; i++)
if (ts->pids[i] && ts->pids[i]->type == MPEGTS_PES) {
PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
if (pes->state == MPEGTS_PAYLOAD && pes->data_index > 0) {
break;
}
}
- }
}
+ if (!ret && pkt->size < 0)
+ ret = AVERROR(EINTR);
return ret;
}
-static int mpegts_read_close(AVFormatContext *s)
+static void mpegts_free(MpegTSContext *ts)
{
- MpegTSContext *ts = s->priv_data;
int i;
clear_programs(ts);
- for(i=0;i<NB_PID_MAX;i++)
- if (ts->pids[i]) mpegts_close_filter(ts, ts->pids[i]);
+ for (i = 0; i < NB_PID_MAX; i++)
+ if (ts->pids[i])
+ mpegts_close_filter(ts, ts->pids[i]);
+}
+static int mpegts_read_close(AVFormatContext *s)
+{
+ MpegTSContext *ts = s->priv_data;
+ mpegts_free(ts);
return 0;
}
MpegTSContext *ts = s->priv_data;
int64_t pos, timestamp;
uint8_t buf[TS_PACKET_SIZE];
- int pcr_l, pcr_pid = ((PESContext*)s->streams[stream_index]->priv_data)->pcr_pid;
- const int find_next= 1;
- pos = ((*ppos + ts->raw_packet_size - 1 - ts->pos47) / ts->raw_packet_size) * ts->raw_packet_size + ts->pos47;
+ int pcr_l, pcr_pid =
+ ((PESContext *)s->streams[stream_index]->priv_data)->pcr_pid;
+ const int find_next = 1;
+ pos =
+ ((*ppos + ts->raw_packet_size - 1 - ts->pos47) / ts->raw_packet_size) *
+ ts->raw_packet_size + ts->pos47;
if (find_next) {
- for(;;) {
+ for (;;) {
avio_seek(s->pb, pos, SEEK_SET);
if (avio_read(s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
return AV_NOPTS_VALUE;
pos += ts->raw_packet_size;
}
} else {
- for(;;) {
+ for (;;) {
pos -= ts->raw_packet_size;
if (pos < 0)
return AV_NOPTS_VALUE;
return timestamp;
}
-#ifdef USE_SYNCPOINT_SEARCH
-
-static int read_seek2(AVFormatContext *s,
- int stream_index,
- int64_t min_ts,
- int64_t target_ts,
- int64_t max_ts,
- int flags)
-{
- int64_t pos;
-
- int64_t ts_ret, ts_adj;
- int stream_index_gen_search;
- AVStream *st;
- AVParserState *backup;
-
- backup = ff_store_parser_state(s);
-
- // detect direction of seeking for search purposes
- flags |= (target_ts - min_ts > (uint64_t)(max_ts - target_ts)) ?
- AVSEEK_FLAG_BACKWARD : 0;
-
- if (flags & AVSEEK_FLAG_BYTE) {
- // use position directly, we will search starting from it
- pos = target_ts;
- } else {
- // search for some position with good timestamp match
- if (stream_index < 0) {
- stream_index_gen_search = av_find_default_stream_index(s);
- if (stream_index_gen_search < 0) {
- ff_restore_parser_state(s, backup);
- return -1;
- }
-
- st = s->streams[stream_index_gen_search];
- // timestamp for default must be expressed in AV_TIME_BASE units
- ts_adj = av_rescale(target_ts,
- st->time_base.den,
- AV_TIME_BASE * (int64_t)st->time_base.num);
- } else {
- ts_adj = target_ts;
- stream_index_gen_search = stream_index;
- }
- pos = av_gen_search(s, stream_index_gen_search, ts_adj,
- 0, INT64_MAX, -1,
- AV_NOPTS_VALUE,
- AV_NOPTS_VALUE,
- flags, &ts_ret, mpegts_get_pcr);
- if (pos < 0) {
- ff_restore_parser_state(s, backup);
- return -1;
- }
- }
-
- // search for actual matching keyframe/starting position for all streams
- if (ff_gen_syncpoint_search(s, stream_index, pos,
- min_ts, target_ts, max_ts,
- flags) < 0) {
- ff_restore_parser_state(s, backup);
- return -1;
- }
-
- ff_free_parser_state(s, backup);
- return 0;
-}
-
static int read_seek(AVFormatContext *s, int stream_index, int64_t target_ts, int flags)
{
- int ret;
- if (flags & AVSEEK_FLAG_BACKWARD) {
- flags &= ~AVSEEK_FLAG_BACKWARD;
- ret = read_seek2(s, stream_index, INT64_MIN, target_ts, target_ts, flags);
- if (ret < 0)
- // for compatibility reasons, seek to the best-fitting timestamp
- ret = read_seek2(s, stream_index, INT64_MIN, target_ts, INT64_MAX, flags);
- } else {
- ret = read_seek2(s, stream_index, target_ts, target_ts, INT64_MAX, flags);
- if (ret < 0)
- // for compatibility reasons, seek to the best-fitting timestamp
- ret = read_seek2(s, stream_index, INT64_MIN, target_ts, INT64_MAX, flags);
- }
- return ret;
-}
-
-#else
-
-static int read_seek(AVFormatContext *s, int stream_index, int64_t target_ts, int flags){
MpegTSContext *ts = s->priv_data;
uint8_t buf[TS_PACKET_SIZE];
int64_t pos;
+ int ret;
- if(av_seek_frame_binary(s, stream_index, target_ts, flags) < 0)
- return -1;
+ ret = ff_seek_frame_binary(s, stream_index, target_ts, flags);
+ if (ret < 0)
+ return ret;
- pos= avio_tell(s->pb);
+ pos = avio_tell(s->pb);
- for(;;) {
+ for (;;) {
avio_seek(s->pb, pos, SEEK_SET);
- if (avio_read(s->pb, buf, TS_PACKET_SIZE) != TS_PACKET_SIZE)
- return -1;
-// pid = AV_RB16(buf + 1) & 0x1fff;
- if(buf[1] & 0x40) break;
+ ret = avio_read(s->pb, buf, TS_PACKET_SIZE);
+ if (ret < 0)
+ return ret;
+ if (ret != TS_PACKET_SIZE)
+ return AVERROR_EOF;
+ // pid = AV_RB16(buf + 1) & 0x1fff;
+ if (buf[1] & 0x40)
+ break;
pos += ts->raw_packet_size;
}
avio_seek(s->pb, pos, SEEK_SET);
return 0;
}
-#endif
-
/**************************************************************/
/* parsing functions - called from other demuxers such as RTP */
}
/* return the consumed length if a packet was output, or -1 if no
- packet is output */
+ * packet is output */
int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
- const uint8_t *buf, int len)
+ const uint8_t *buf, int len)
{
int len1;
len1 = len;
ts->pkt = pkt;
ts->stop_parse = 0;
- for(;;) {
- if (ts->stop_parse>0)
+ for (;;) {
+ if (ts->stop_parse > 0)
break;
if (len < TS_PACKET_SIZE)
- return -1;
+ return AVERROR_INVALIDDATA;
if (buf[0] != 0x47) {
buf++;
len--;
void ff_mpegts_parse_close(MpegTSContext *ts)
{
- int i;
-
- for(i=0;i<NB_PID_MAX;i++)
- av_free(ts->pids[i]);
+ mpegts_free(ts);
av_free(ts);
}
AVInputFormat ff_mpegts_demuxer = {
.name = "mpegts",
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 transport stream format"),
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"),
.priv_data_size = sizeof(MpegTSContext),
.read_probe = mpegts_probe,
.read_header = mpegts_read_header,
.read_close = mpegts_read_close,
.read_seek = read_seek,
.read_timestamp = mpegts_get_pcr,
- .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
-#ifdef USE_SYNCPOINT_SEARCH
- .read_seek2 = read_seek2,
-#endif
+ .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
+ .priv_class = &mpegts_class,
};
AVInputFormat ff_mpegtsraw_demuxer = {
.name = "mpegtsraw",
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-2 raw transport stream format"),
+ .long_name = NULL_IF_CONFIG_SMALL("raw MPEG-TS (MPEG-2 Transport Stream)"),
.priv_data_size = sizeof(MpegTSContext),
.read_header = mpegts_read_header,
.read_packet = mpegts_raw_read_packet,
.read_close = mpegts_read_close,
.read_seek = read_seek,
.read_timestamp = mpegts_get_pcr,
- .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
-#ifdef USE_SYNCPOINT_SEARCH
- .read_seek2 = read_seek2,
-#endif
- .priv_class = &mpegtsraw_class,
+ .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
+ .priv_class = &mpegtsraw_class,
};
projects / ffmpeg / blobdiff