comparison libmpdemux/demux_ts.c @ 32777:9cc2689e5cd1

Fix r32587: the previous approach to return subtitles in time broke DVB subtitles due to returning incomplete packets and even for PGS subtitles resulted in incorrect pts values for the sub packets.

32776:15060bd7df4c

			}

			//IS IT TIME TO QUEUE DATA to the dp_packet?
			if(is_start && (dp != NULL))
			{
				// subtitle packets _have_ to be submitted before video, otherwise
				// they might get stuck "forever" and subtitles will be completely
				// out of sync.
				if (is_video)
					fill_packet(demuxer, demuxer->sub, &priv->fifo[2].pack, &priv->fifo[2].offset, NULL);
				retv = fill_packet(demuxer, ds, dp, dp_offset, si);
			}


			if(dp && *dp == NULL)

				memmove(p, es->start, es->size);
				*dp_offset += es->size;
				(*dp)->flags = 0;
				(*dp)->pos = stream_tell(demuxer->stream);
				(*dp)->pts = es->pts;

				if(retv > 0)
					return retv;
				else
					continue;

			if(! probe)
			{
				*dp_offset += sz;

				if(*dp_offset >= MAX_PACK_BYTES)
				{
					(*dp)->pts = tss->last_pts;
					retv = fill_packet(demuxer, ds, dp, dp_offset, si);
					return 1;
				}

32777:9cc2689e5cd1

			}

			//IS IT TIME TO QUEUE DATA to the dp_packet?
			if(is_start && (dp != NULL))
			{
				retv = fill_packet(demuxer, ds, dp, dp_offset, si);
			}


			if(dp && *dp == NULL)

				memmove(p, es->start, es->size);
				*dp_offset += es->size;
				(*dp)->flags = 0;
				(*dp)->pos = stream_tell(demuxer->stream);
				(*dp)->pts = es->pts;
				// subtitle packets must be returned immediately if possible
				if (is_sub && !tss->payload_size)
					retv = fill_packet(demuxer, ds, dp, dp_offset, si);

				if(retv > 0)
					return retv;
				else
					continue;

			if(! probe)
			{
				*dp_offset += sz;

				// subtitle packets must be returned immediately if possible
				if(*dp_offset >= MAX_PACK_BYTES || (is_sub && !tss->payload_size))
				{
					(*dp)->pts = tss->last_pts;
					retv = fill_packet(demuxer, ds, dp, dp_offset, si);
					return 1;
				}