virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Increase max resync size, fix demuxing of dvgrab-2009.03.28_19-07-22.m2t

Browse Source 
Print error when max resync size is reached and return EAGAIN instead of
INVALIDDATA, so user can retry if wanted.

Originally committed as revision 20286 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-10-18 20:08:13 +00:00
parent f4d608e344
commit 1303d62d84
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/mpegts.c
View File

@ -36,7 +36,7 @@
/* maximum size in which we look for synchronisation if /* maximum size in which we look for synchronisation if
synchronisation is lost */ synchronisation is lost */
#define MAX_RESYNC_SIZE 4096 #define MAX_RESYNC_SIZE 65536
#define MAX_PES_PAYLOAD 200*1024 #define MAX_PES_PAYLOAD 200*1024
@ -1209,8 +1209,9 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
/* XXX: try to find a better synchro over several packets (use /* XXX: try to find a better synchro over several packets (use
get_packet_size() ?) */ get_packet_size() ?) */
static int mpegts_resync(ByteIOContext *pb) static int mpegts_resync(AVFormatContext *s)
{ {
ByteIOContext *pb = s->pb;
int c, i; int c, i;
for(i = 0;i < MAX_RESYNC_SIZE; i++) { for(i = 0;i < MAX_RESYNC_SIZE; i++) {
@ -1222,13 +1223,15 @@ static int mpegts_resync(ByteIOContext *pb)
return 0; return 0;
} }
} }
av_log(s, AV_LOG_ERROR, "max resync size reached, could not find sync byte\n");
/* no sync found */ /* no sync found */
return -1; return -1;
} }
/* return -1 if error or EOF. Return 0 if OK. */ /* return -1 if error or EOF. Return 0 if OK. */
static int read_packet(ByteIOContext *pb, uint8_t *buf, int raw_packet_size) static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size)
{ {
ByteIOContext *pb = s->pb;
int skip, len; int skip, len;
for(;;) { for(;;) {
@ -1239,8 +1242,8 @@ static int read_packet(ByteIOContext *pb, uint8_t *buf, int raw_packet_size)
if (buf[0] != 0x47) { if (buf[0] != 0x47) {
/* find a new packet start */ /* find a new packet start */
url_fseek(pb, -TS_PACKET_SIZE, SEEK_CUR); url_fseek(pb, -TS_PACKET_SIZE, SEEK_CUR);
if (mpegts_resync(pb) < 0) if (mpegts_resync(s) < 0)
return AVERROR_INVALIDDATA; return AVERROR(EAGAIN);
else else
continue; continue;
} else { } else {
@ -1256,7 +1259,6 @@ static int read_packet(ByteIOContext *pb, uint8_t *buf, int raw_packet_size)
static int handle_packets(MpegTSContext *ts, int nb_packets) static int handle_packets(MpegTSContext *ts, int nb_packets)
{ {
AVFormatContext *s = ts->stream; AVFormatContext *s = ts->stream;
ByteIOContext *pb = s->pb;
uint8_t packet[TS_PACKET_SIZE]; uint8_t packet[TS_PACKET_SIZE];
int packet_num, ret; int packet_num, ret;
@ -1268,7 +1270,7 @@ static int handle_packets(MpegTSContext *ts, int nb_packets)
packet_num++; packet_num++;
if (nb_packets != 0 && packet_num >= nb_packets) if (nb_packets != 0 && packet_num >= nb_packets)
break; break;
ret = read_packet(pb, packet, ts->raw_packet_size); ret = read_packet(s, packet, ts->raw_packet_size);
if (ret != 0) if (ret != 0)
return ret; return ret;
ret = handle_packet(ts, packet); ret = handle_packet(ts, packet);
@ -1404,7 +1406,7 @@ static int mpegts_read_header(AVFormatContext *s,
nb_pcrs = 0; nb_pcrs = 0;
nb_packets = 0; nb_packets = 0;
for(;;) { for(;;) {
ret = read_packet(s->pb, packet, ts->raw_packet_size); ret = read_packet(s, packet, ts->raw_packet_size);
if (ret < 0) if (ret < 0)
return -1; return -1;
pid = AV_RB16(packet + 1) & 0x1fff; pid = AV_RB16(packet + 1) & 0x1fff;
@ -1453,7 +1455,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s,
if (av_new_packet(pkt, TS_PACKET_SIZE) < 0) if (av_new_packet(pkt, TS_PACKET_SIZE) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
pkt->pos= url_ftell(s->pb); pkt->pos= url_ftell(s->pb);
ret = read_packet(s->pb, pkt->data, ts->raw_packet_size); ret = read_packet(s, pkt->data, ts->raw_packet_size);
if (ret < 0) { if (ret < 0) {
av_free_packet(pkt); av_free_packet(pkt);
return ret; return ret;