Commit 5144f5b7 authored by John Smith's avatar John Smith Committed by Mauro Carvalho Chehab
Browse files

[media] dvb_demux: Transport stream continuity check fix 



This patch avoids incrementing continuity counter
demux->cnt_storage[pid] for TS packets without payload in accordance
with ISO /IEC 13818-1.

[mchehab@redhat.com: unmangle whitespacing and fix CodingStyle.
 Also checked ISO/IEC spec: patch is according with it]
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarJohn Smith <johns90812@gmail.com>

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fa7b9ac2

drivers/media/dvb-core/dvb_demux.c

+13 −11
Original line number Diff line number Diff line
@@ -443,14 +443,16 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) 
		if (demux->cnt_storage && dvb_demux_tscheck) {

			/* check pkt counter */

			if (pid < MAX_PID) {

			if ((buf[3] & 0xf) != demux->cnt_storage[pid])

				dprintk_tscheck("TS packet counter mismatch. "

						"PID=0x%x expected 0x%x "

						"got 0x%x\n",

				if (buf[3] & 0x10)

					demux->cnt_storage[pid] =

						(demux->cnt_storage[pid] + 1) & 0xf;



				if ((buf[3] & 0xf) != demux->cnt_storage[pid]) {

					dprintk_tscheck("TS packet counter mismatch. PID=0x%x expected 0x%x got 0x%x\n",

						pid, demux->cnt_storage[pid],

						buf[3] & 0xf);



			demux->cnt_storage[pid] = ((buf[3] & 0xf) + 1)&0xf;

					demux->cnt_storage[pid] = buf[3] & 0xf;

				}

			}

			/* end check */

		}