/*
* MPEG2 transport stream (aka DVB) demuxer
- * Copyright (c) 2002-2003 Fabrice Bellard.
+ * Copyright (c) 2002-2003 Fabrice Bellard
*
* This file is part of FFmpeg.
*
*/
#include "libavutil/crc.h"
+#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "mpegts.h"
+#include "internal.h"
//#define DEBUG_SI
//#define DEBUG_SEEK
static PESContext* add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid, int stream_type);
static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code);
-extern void av_set_program_name(AVProgram *program, char *provider_name, char *name);
-extern void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
enum MpegTSFilterType {
MPEGTS_PES,
};
#define MAX_PIDS_PER_PROGRAM 64
-typedef struct {
+struct Program {
unsigned int id; //program id/service id
unsigned int nb_pids;
unsigned int pids[MAX_PIDS_PER_PROGRAM];
-} Program_t;
+};
struct MpegTSContext {
/* user data */
/* scan context */
/** structure to keep track of Program->pids mapping */
unsigned int nb_prg;
- Program_t *prg;
+ struct Program *prg;
/** filters for various streams specified by PMT + for the PAT and PMT */
static void add_pat_entry(MpegTSContext *ts, unsigned int programid)
{
- Program_t *p;
- void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(Program_t));
+ struct Program *p;
+ void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(struct Program));
if(!tmp)
return;
ts->prg = tmp;
static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid, unsigned int pid)
{
int i;
- Program_t *p = NULL;
+ struct Program *p = NULL;
for(i=0; i<ts->nb_prg; i++) {
if(ts->prg[i].id == programid) {
p = &ts->prg[i];
{
int i, j, k;
int used = 0, discarded = 0;
- Program_t *p;
+ struct Program *p;
for(i=0; i<ts->nb_prg; i++) {
p = &ts->prg[i];
for(j=0; j<p->nb_pids; j++) {
pid = filter->pid;
if (filter->type == MPEGTS_SECTION)
av_freep(&filter->u.section_filter.section_buf);
+ else if (filter->type == MPEGTS_PES) {
+ /* referenced private data will be freed later in
+ * av_close_input_stream */
+ if (!((PESContext *)filter->u.pes_filter.opaque)->st) {
+ av_freep(&filter->u.pes_filter.opaque);
+ }
+ }
av_free(filter);
ts->pids[pid] = NULL;
memset(stat, 0, packet_size*sizeof(int));
- for(x=i=0; i<size; i++){
- if(buf[i] == 0x47){
+ for(x=i=0; i<size-3; i++){
+ if(buf[i] == 0x47 && !(buf[i+1] & 0x80) && (buf[i+3] & 0x30)){
stat[x]++;
if(stat[x] > best_score){
best_score= stat[x];
int comp_page = 0, anc_page = 0; /* initialize to kill warnings */
char language[4] = {0}; /* initialize to kill warnings */
int has_hdmv_descr = 0;
+ int has_dirac_descr = 0;
#ifdef DEBUG_SI
av_log(ts->stream, AV_LOG_DEBUG, "PMT: len %i\n", section_len);
language[2] = get8(&p, desc_end);
language[3] = 0;
break;
+ case REGISTRATION_DESCRIPTOR: /*MPEG-2 Registration descriptor */
+ {
+ uint8_t bytes[4];
+ bytes[0] = get8(&p, desc_end);
+ bytes[1] = get8(&p, desc_end);
+ bytes[2] = get8(&p, desc_end);
+ bytes[3] = get8(&p, desc_end);
+ if(bytes[0] == 'd' && bytes[1] == 'r' &&
+ bytes[2] == 'a' && bytes[3] == 'c')
+ has_dirac_descr = 1;
+ break;
+ }
default:
break;
}
case STREAM_TYPE_VIDEO_MPEG4:
case STREAM_TYPE_VIDEO_H264:
case STREAM_TYPE_VIDEO_VC1:
+ case STREAM_TYPE_VIDEO_DIRAC:
case STREAM_TYPE_AUDIO_AAC:
case STREAM_TYPE_AUDIO_AC3:
case STREAM_TYPE_AUDIO_DTS:
case STREAM_TYPE_AUDIO_HDMV_DTS:
case STREAM_TYPE_SUBTITLE_DVB:
- if(stream_type == STREAM_TYPE_AUDIO_HDMV_DTS && !has_hdmv_descr)
+ if((stream_type == STREAM_TYPE_AUDIO_HDMV_DTS && !has_hdmv_descr)
+ || (stream_type == STREAM_TYPE_VIDEO_DIRAC && !has_dirac_descr))
break;
if(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES){
pes= ts->pids[pid]->u.pes_filter.opaque;
if (st) {
if (language[0] != 0) {
- memcpy(st->language, language, 4);
+ av_metadata_set(&st->metadata, "language", language);
}
if (stream_type == STREAM_TYPE_SUBTITLE_DVB) {
name = getstr8(&p, p_end);
if (name) {
AVProgram *program = av_new_program(ts->stream, sid);
- if(program)
- av_set_program_name(program, provider_name, name);
+ if(program) {
+ av_metadata_set(&program->metadata, "name", name);
+ av_metadata_set(&program->metadata, "provider_name", provider_name);
+ }
}
av_free(name);
av_free(provider_name);
pes->pts = AV_NOPTS_VALUE;
pes->dts = AV_NOPTS_VALUE;
if ((flags & 0xc0) == 0x80) {
- pes->pts = get_pts(r);
+ pes->dts = pes->pts = get_pts(r);
r += 5;
} else if ((flags & 0xc0) == 0xc0) {
pes->pts = get_pts(r);
static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code)
{
AVStream *st;
- int codec_type, codec_id;
+ enum CodecID codec_id;
+ enum CodecType codec_type;
switch(pes->stream_type){
case STREAM_TYPE_AUDIO_MPEG1:
codec_type = CODEC_TYPE_VIDEO;
codec_id = CODEC_ID_VC1;
break;
+ case STREAM_TYPE_VIDEO_DIRAC:
+ codec_type = CODEC_TYPE_VIDEO;
+ codec_id = CODEC_ID_DIRAC;
+ break;
case STREAM_TYPE_AUDIO_AAC:
codec_type = CODEC_TYPE_AUDIO;
codec_id = CODEC_ID_AAC;
codec_id = CODEC_ID_AC3;
} else {
codec_type = CODEC_TYPE_VIDEO;
- codec_id = CODEC_ID_MPEG1VIDEO;
+ codec_id = CODEC_ID_PROBE;
}
break;
}
#if 1
const int size= p->buf_size;
int score, fec_score, dvhs_score;
+ int check_count= size / TS_FEC_PACKET_SIZE;
#define CHECK_COUNT 10
- if (size < (TS_FEC_PACKET_SIZE * CHECK_COUNT))
+ if (check_count < CHECK_COUNT)
return -1;
- score = analyze(p->buf, TS_PACKET_SIZE *CHECK_COUNT, TS_PACKET_SIZE, NULL);
- dvhs_score = analyze(p->buf, TS_DVHS_PACKET_SIZE *CHECK_COUNT, TS_DVHS_PACKET_SIZE, NULL);
- fec_score= analyze(p->buf, TS_FEC_PACKET_SIZE*CHECK_COUNT, TS_FEC_PACKET_SIZE, NULL);
+ 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
#endif
}
-/* return the 90 kHz PCR and the extension for the 27 MHz PCR. return
+/* 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)
{
MpegTSContext *ts = s->priv_data;
ByteIOContext *pb = s->pb;
- uint8_t buf[1024];
+ uint8_t buf[5*1024];
int len;
int64_t pos;
mpegts_read_close,
read_seek,
mpegts_get_pcr,
- .flags = AVFMT_SHOW_IDS,
+ .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
};
AVInputFormat mpegtsraw_demuxer = {
mpegts_read_close,
read_seek,
mpegts_get_pcr,
- .flags = AVFMT_SHOW_IDS,
+ .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT,
};