comparison libmpdemux/demux_ts.c @ 14992:d1d36694aa3d

consider parse random_access_point from the adaption_field to determine if the payload is an access point (for SL)

14991:07f1e7669772

		uint64_t dts, cts;
		
		if(sl->random_accesspoint)
			rap_flag = getbits(buf, n++, 1);
		
		if((rap_flag || sl->random_accesspoint_only) || (!sl->random_accesspoint && !sl->random_accesspoint_only))
			pes_es->is_synced = 1;
		
		n += sl->au_seqnum_len;
		if(packet_len * 8 <= n+8)
			return -1;

	char *p, tmp[TS_FEC_PACKET_SIZE];
	demux_stream_t *ds = NULL;
	demux_packet_t **dp = NULL;
	int *dp_offset = 0, *buffer_size = 0;
	int32_t progid, pid_type, bad, ts_error;
	int junk = 0;
	pmt_t *pmt;


	while(! done)
	{
		bad = ts_error = 0;
		ds = (demux_stream_t*) NULL;
		dp = (demux_packet_t **) NULL;
		dp_offset = buffer_size = NULL;

		junk = priv->ts.packet_size - TS_PACKET_SIZE;
		buf_size = priv->ts.packet_size - junk;

		if(stream_eof(stream))

		cc_ok = (tss->last_cc < 0) || ((((tss->last_cc + 1) & 0x0f) == cc));
		tss->last_cc = cc;
		    
		bad = ts_error; // || (! cc_ok);
    
		if(! bad)
		{
			// skip adaptation field, but only if cc_ok is not corrupt,
			//otherwise we may throw away good data  
			afc = (packet[3] >> 4) & 3;
			if(! (afc % 2))	//no payload in this TS packet
			{
			    stream_skip(stream, buf_size-1+junk);
			    continue;
			}
			
			if(afc == 3)
			{
				int c;
				c = stream_read_char(stream);
				buf_size--;

				c = min(c, buf_size);
				stream_skip(stream, c);
				buf_size -= c;
				if(buf_size == 0)
					continue;

				afc = c + 1;
			}
		}
		else
		{
			// logically this packet should be dropped, but if I do it
			// certain streams play corrupted. Maybe the decoders know
			// how to deal with it, but at least I consider the packet
			// as "not initial"

			stream_read(stream, p, buf_size);
			stream_skip(stream, junk);

			len = pes_parse2(p, buf_size, es, pid_type, pmt, pid);
			es->pid = tss->pid;
			tss->is_synced = es->is_synced;
			
			if(es->type==SL_PES_STREAM && !tss->is_synced)
			{
				if(probe)
					return 0;

14992:d1d36694aa3d

		uint64_t dts, cts;
		
		if(sl->random_accesspoint)
			rap_flag = getbits(buf, n++, 1);
		
		if(rap_flag || sl->random_accesspoint_only)
			pes_es->is_synced = 1;
		
		n += sl->au_seqnum_len;
		if(packet_len * 8 <= n+8)
			return -1;

	char *p, tmp[TS_FEC_PACKET_SIZE];
	demux_stream_t *ds = NULL;
	demux_packet_t **dp = NULL;
	int *dp_offset = 0, *buffer_size = 0;
	int32_t progid, pid_type, bad, ts_error;
	int junk = 0, rap_flag = 0;
	pmt_t *pmt;


	while(! done)
	{
		bad = ts_error = 0;
		ds = (demux_stream_t*) NULL;
		dp = (demux_packet_t **) NULL;
		dp_offset = buffer_size = NULL;
		rap_flag = 0;

		junk = priv->ts.packet_size - TS_PACKET_SIZE;
		buf_size = priv->ts.packet_size - junk;

		if(stream_eof(stream))

		cc_ok = (tss->last_cc < 0) || ((((tss->last_cc + 1) & 0x0f) == cc));
		tss->last_cc = cc;
		    
		bad = ts_error; // || (! cc_ok);
    
		afc = (packet[3] >> 4) & 3;
		if(afc > 1)
		{
			int c;
			c = stream_read_char(stream);
			buf_size--;
			rap_flag = stream_read_char(stream) & 0x40;
			buf_size--;

			c = min(c-1, buf_size);
			stream_skip(stream, c);
			buf_size -= c;
			if(buf_size == 0)
				continue;
		}
		
		if(! (afc % 2))	//no payload in this TS packet
		{
			stream_skip(stream, buf_size-1+junk);
			continue;
		}
		
		if(bad)
		{
			// logically this packet should be dropped, but if I do it
			// certain streams play corrupted. Maybe the decoders know
			// how to deal with it, but at least I consider the packet
			// as "not initial"

			stream_read(stream, p, buf_size);
			stream_skip(stream, junk);

			len = pes_parse2(p, buf_size, es, pid_type, pmt, pid);
			es->pid = tss->pid;
			tss->is_synced = es->is_synced | rap_flag;
			
			if(es->type==SL_PES_STREAM && !tss->is_synced)
			{
				if(probe)
					return 0;