comparison libmpdemux/demux_ts.c @ 19540:70a5e89ea4cd

Get rid of demux_aid_vid_mismatch mess.

19539:64009ae411fb

int ts_prog;
int ts_keep_broken=0;
off_t ts_probe = TS_MAX_PROBE_SIZE;
extern char *dvdsub_lang, *audio_lang;	//for -alang
extern int demux_aid_vid_mismatch;

typedef enum
{
	UNKNOWN		= -1,
	VIDEO_MPEG1 	= 0x10000001,

	demuxer->video->id = params.vpid;
	demuxer->sub->id = params.spid;
	priv->prog = params.prog;

	demux_aid_vid_mismatch = 1; // don't identify in new_sh_* since ids don't match

	if(params.vtype != UNKNOWN)
	{
		ES_stream_t *es = priv->ts.pids[params.vpid];
		sh_video = new_sh_video(demuxer, 0);
		if(params.vtype == VIDEO_AVC && es->extradata && es->extradata_len)
		{
			int w = 0, h = 0;
			sh_video->bih = (BITMAPINFOHEADER *) calloc(1, sizeof(BITMAPINFOHEADER) + es->extradata_len);
			sh_video->bih->biSize= sizeof(BITMAPINFOHEADER) + es->extradata_len;

	}

	if(params.atype != UNKNOWN)
	{
		ES_stream_t *es = priv->ts.pids[params.apid];
		sh_audio = new_sh_audio(demuxer, 0);
		priv->ts.streams[params.apid].id = 0;
		priv->ts.streams[params.apid].sh = sh_audio;
		priv->ts.streams[params.apid].type = TYPE_AUDIO;
		priv->last_aid = 0;
		demuxer->audio->id = 0;

			// PES CONTENT STARTS HERE
		if(! probe)
		{
			if((IS_AUDIO(tss->type) || IS_AUDIO(tss->subtype)) && is_start && !priv->ts.streams[pid].sh && priv->last_aid+1 < MAX_A_STREAMS)
			{
				sh_audio_t *sh = new_sh_audio(demuxer, priv->last_aid+1);
				if(sh)
				{
					sh->format = IS_AUDIO(tss->type) ? tss->type : tss->subtype;
					sh->ds = demuxer->audio;

19540:70a5e89ea4cd

int ts_prog;
int ts_keep_broken=0;
off_t ts_probe = TS_MAX_PROBE_SIZE;
extern char *dvdsub_lang, *audio_lang;	//for -alang

typedef enum
{
	UNKNOWN		= -1,
	VIDEO_MPEG1 	= 0x10000001,

	demuxer->video->id = params.vpid;
	demuxer->sub->id = params.spid;
	priv->prog = params.prog;

	if(params.vtype != UNKNOWN)
	{
		ES_stream_t *es = priv->ts.pids[params.vpid];
		sh_video = new_sh_video_vid(demuxer, 0, es->pid);
		if(params.vtype == VIDEO_AVC && es->extradata && es->extradata_len)
		{
			int w = 0, h = 0;
			sh_video->bih = (BITMAPINFOHEADER *) calloc(1, sizeof(BITMAPINFOHEADER) + es->extradata_len);
			sh_video->bih->biSize= sizeof(BITMAPINFOHEADER) + es->extradata_len;

	}

	if(params.atype != UNKNOWN)
	{
		ES_stream_t *es = priv->ts.pids[params.apid];
		sh_audio = new_sh_audio_aid(demuxer, 0, es->pid);
		priv->ts.streams[params.apid].id = 0;
		priv->ts.streams[params.apid].sh = sh_audio;
		priv->ts.streams[params.apid].type = TYPE_AUDIO;
		priv->last_aid = 0;
		demuxer->audio->id = 0;

			// PES CONTENT STARTS HERE
		if(! probe)
		{
			if((IS_AUDIO(tss->type) || IS_AUDIO(tss->subtype)) && is_start && !priv->ts.streams[pid].sh && priv->last_aid+1 < MAX_A_STREAMS)
			{
				sh_audio_t *sh = new_sh_audio_aid(demuxer, priv->last_aid+1, pid);
				if(sh)
				{
					sh->format = IS_AUDIO(tss->type) ? tss->type : tss->subtype;
					sh->ds = demuxer->audio;