har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpegts: Mark corrupted packets

Browse Source 
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Zohar Kelrich 2011-07-24 11:13:50 +03:00 committed by Luca Barbato
parent c64f80b0e8
commit ce9e31655e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mpegts.c
View File

@ -164,6 +164,7 @@ typedef struct PESContext {
enum MpegTSState state; enum MpegTSState state;
/* used to get the format */ /* used to get the format */
int data_index; int data_index;
int flags; /**< copied to the AVPacket flags */
int total_size; int total_size;
int pes_header_size; int pes_header_size;
int extended_stream_id; int extended_stream_id;
@ -635,12 +636,14 @@ static void new_pes_packet(PESContext *pes, AVPacket *pkt)
pkt->dts = pes->dts; pkt->dts = pes->dts;
/* store position of first TS packet of this PES packet */ /* store position of first TS packet of this PES packet */
pkt->pos = pes->ts_packet_pos; pkt->pos = pes->ts_packet_pos;
pkt->flags = pes->flags;
/* reset pts values */ /* reset pts values */
pes->pts = AV_NOPTS_VALUE; pes->pts = AV_NOPTS_VALUE;
pes->dts = AV_NOPTS_VALUE; pes->dts = AV_NOPTS_VALUE;
pes->buffer = NULL; pes->buffer = NULL;
pes->data_index = 0; pes->data_index = 0;
pes->flags = 0;
} }
/* return non zero if a packet could be constructed */ /* return non zero if a packet could be constructed */
@ -808,6 +811,7 @@ static int mpegts_push_data(MpegTSFilter *filter,
// pes packet size is < ts size packet and pes data is padded with 0xff // pes packet size is < ts size packet and pes data is padded with 0xff
// not sure if this is legal in ts but see issue #2392 // not sure if this is legal in ts but see issue #2392
buf_size = pes->total_size; buf_size = pes->total_size;
pes->flags |= AV_PKT_FLAG_CORRUPT;
} }
memcpy(pes->buffer+pes->data_index, p, buf_size); memcpy(pes->buffer+pes->data_index, p, buf_size);
pes->data_index += buf_size; pes->data_index += buf_size;
@ -1283,6 +1287,13 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
|| expected_cc == cc; || expected_cc == cc;
tss->last_cc = cc; tss->last_cc = cc;
if (!cc_ok) {
av_log(NULL, AV_LOG_WARNING, "Continuity Check Failed\n");
if(tss->type == MPEGTS_PES) {
PESContext *pc = tss->u.pes_filter.opaque;
pc->flags |= AV_PKT_FLAG_CORRUPT;
}
}
if (!has_payload) if (!has_payload)
return 0; return 0;