[FFmpeg-cvslog] r16968 - trunk/libavformat/mpegts.c
michael
subversion
Tue Feb 3 12:01:57 CET 2009
Author: michael
Date: Tue Feb 3 12:01:57 2009
New Revision: 16968
Log:
Fix probe & demuxing of Topfield 58XXPVR and 68XXPVR (topfield.rec)
Modified:
trunk/libavformat/mpegts.c
Modified: trunk/libavformat/mpegts.c
==============================================================================
--- trunk/libavformat/mpegts.c Tue Feb 3 04:01:17 2009 (r16967)
+++ trunk/libavformat/mpegts.c Tue Feb 3 12:01:57 2009 (r16968)
@@ -1177,14 +1177,15 @@ static int mpegts_probe(AVProbeData *p)
#if 1
const int size= p->buf_size;
int score, fec_score, dvhs_score;
+ int check_count= size / TS_FEC_PACKET_SIZE;
#define CHECK_COUNT 10
- if (size < (TS_FEC_PACKET_SIZE * CHECK_COUNT))
+ if (check_count < CHECK_COUNT)
return -1;
- score = analyze(p->buf, TS_PACKET_SIZE *CHECK_COUNT, TS_PACKET_SIZE, NULL);
- dvhs_score = analyze(p->buf, TS_DVHS_PACKET_SIZE *CHECK_COUNT, TS_DVHS_PACKET_SIZE, NULL);
- fec_score= analyze(p->buf, TS_FEC_PACKET_SIZE*CHECK_COUNT, TS_FEC_PACKET_SIZE, NULL);
+ score = analyze(p->buf, TS_PACKET_SIZE *check_count, TS_PACKET_SIZE , NULL)*CHECK_COUNT/check_count;
+ dvhs_score= analyze(p->buf, TS_DVHS_PACKET_SIZE*check_count, TS_DVHS_PACKET_SIZE, NULL)*CHECK_COUNT/check_count;
+ fec_score = analyze(p->buf, TS_FEC_PACKET_SIZE *check_count, TS_FEC_PACKET_SIZE , NULL)*CHECK_COUNT/check_count;
// av_log(NULL, AV_LOG_DEBUG, "score: %d, dvhs_score: %d, fec_score: %d \n", score, dvhs_score, fec_score);
// we need a clear definition for the returned score otherwise things will become messy sooner or later
@@ -1235,7 +1236,7 @@ static int mpegts_read_header(AVFormatCo
{
MpegTSContext *ts = s->priv_data;
ByteIOContext *pb = s->pb;
- uint8_t buf[1024];
+ uint8_t buf[5*1024];
int len;
int64_t pos;
More information about the ffmpeg-cvslog
mailing list