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

avformat/mpegts: Simplify score compare

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-03-09 15:30:46 +01:00
parent 0a84ba2608
commit f94b4f1611
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/mpegts.c
View File

@ -620,16 +620,16 @@ static int get_packet_size(AVFormatContext* s)
av_log(s, AV_LOG_TRACE, "Probe: %d, score: %d, dvhs_score: %d, fec_score: %d \n",
buf_size, score, dvhs_score, fec_score);
if (buf_size < PROBE_PACKET_MAX_BUF)
margin = PROBE_PACKET_MARGIN; /*if buffer not filled */
else
margin = 0;
margin = mid_pred(score, fec_score, dvhs_score);
if (score > FFMAX(fec_score, dvhs_score) + margin)
if (buf_size < PROBE_PACKET_MAX_BUF)
margin += PROBE_PACKET_MARGIN; /*if buffer not filled */
if (score > margin)
return TS_PACKET_SIZE;
else if (dvhs_score > FFMAX(score, fec_score) + margin)
else if (dvhs_score > margin)
return TS_DVHS_PACKET_SIZE;
else if (fec_score > FFMAX(score, dvhs_score) + margin)
else if (fec_score > margin)
return TS_FEC_PACKET_SIZE;
}
return AVERROR_INVALIDDATA;