highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf: move AVStream.{last_dts_for_order_check,dts_[mis]ordered} to AVStreamInternal

Browse Source 
Those are private fields, no reason to have them exposed in a public
header.
This commit is contained in:
Anton Khirnov 2020-10-09 09:22:36 +02:00
parent c1b916580a
commit 25bade3258
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/avformat.h
View File

@ -1190,13 +1190,6 @@ typedef struct AVStream {
int64_t pts_reorder_error[MAX_REORDER_DELAY+1]; int64_t pts_reorder_error[MAX_REORDER_DELAY+1];
uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1]; uint8_t pts_reorder_error_count[MAX_REORDER_DELAY+1];
/**
* Internal data to analyze DTS and detect faulty mpeg streams
*/
int64_t last_dts_for_order_check;
uint8_t dts_ordered;
uint8_t dts_misordered;
/** /**
* An opaque field for libavformat internal usage. * An opaque field for libavformat internal usage.
* Must not be accessed in any way by callers. * Must not be accessed in any way by callers.

7
libavformat/internal.h
View File

@ -225,6 +225,13 @@ struct AVStreamInternal {
} *info; } *info;
/**
* Internal data to analyze DTS and detect faulty mpeg streams
*/
int64_t last_dts_for_order_check;
uint8_t dts_ordered;
uint8_t dts_misordered;
/** /**
* Internal data to inject global side data * Internal data to inject global side data
*/ */

28
libavformat/utils.c
View File

@ -1209,24 +1209,24 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
return; return;
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && pkt->dts != AV_NOPTS_VALUE) { if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && pkt->dts != AV_NOPTS_VALUE) {
if (pkt->dts == pkt->pts && st->last_dts_for_order_check != AV_NOPTS_VALUE) { if (pkt->dts == pkt->pts && st->internal->last_dts_for_order_check != AV_NOPTS_VALUE) {
if (st->last_dts_for_order_check <= pkt->dts) { if (st->internal->last_dts_for_order_check <= pkt->dts) {
st->dts_ordered++; st->internal->dts_ordered++;
} else { } else {
av_log(s, st->dts_misordered ? AV_LOG_DEBUG : AV_LOG_WARNING, av_log(s, st->internal->dts_misordered ? AV_LOG_DEBUG : AV_LOG_WARNING,
"DTS %"PRIi64" < %"PRIi64" out of order\n", "DTS %"PRIi64" < %"PRIi64" out of order\n",
pkt->dts, pkt->dts,
st->last_dts_for_order_check); st->internal->last_dts_for_order_check);
st->dts_misordered++; st->internal->dts_misordered++;
} }
if (st->dts_ordered + st->dts_misordered > 250) { if (st->internal->dts_ordered + st->internal->dts_misordered > 250) {
st->dts_ordered >>= 1; st->internal->dts_ordered >>= 1;
st->dts_misordered >>= 1; st->internal->dts_misordered >>= 1;
} }
} }
st->last_dts_for_order_check = pkt->dts; st->internal->last_dts_for_order_check = pkt->dts;
if (st->dts_ordered < 8*st->dts_misordered && pkt->dts == pkt->pts) if (st->internal->dts_ordered < 8*st->internal->dts_misordered && pkt->dts == pkt->pts)
pkt->dts = AV_NOPTS_VALUE; pkt->dts = AV_NOPTS_VALUE;
} }
@ -1876,7 +1876,7 @@ void ff_read_frame_flush(AVFormatContext *s)
st->parser = NULL; st->parser = NULL;
} }
st->last_IP_pts = AV_NOPTS_VALUE; st->last_IP_pts = AV_NOPTS_VALUE;
st->last_dts_for_order_check = AV_NOPTS_VALUE; st->internal->last_dts_for_order_check = AV_NOPTS_VALUE;
if (st->first_dts == AV_NOPTS_VALUE) if (st->first_dts == AV_NOPTS_VALUE)
st->cur_dts = RELATIVE_TS_BASE; st->cur_dts = RELATIVE_TS_BASE;
else else
@ -2865,7 +2865,7 @@ skip_duration_calc:
st = ic->streams[i]; st = ic->streams[i];
st->cur_dts = st->first_dts; st->cur_dts = st->first_dts;
st->last_IP_pts = AV_NOPTS_VALUE; st->last_IP_pts = AV_NOPTS_VALUE;
st->last_dts_for_order_check = AV_NOPTS_VALUE; st->internal->last_dts_for_order_check = AV_NOPTS_VALUE;
for (j = 0; j < MAX_REORDER_DELAY + 1; j++) for (j = 0; j < MAX_REORDER_DELAY + 1; j++)
st->pts_buffer[j] = AV_NOPTS_VALUE; st->pts_buffer[j] = AV_NOPTS_VALUE;
} }
@ -4524,7 +4524,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
st->pts_wrap_behavior = AV_PTS_WRAP_IGNORE; st->pts_wrap_behavior = AV_PTS_WRAP_IGNORE;
st->last_IP_pts = AV_NOPTS_VALUE; st->last_IP_pts = AV_NOPTS_VALUE;
st->last_dts_for_order_check = AV_NOPTS_VALUE; st->internal->last_dts_for_order_check = AV_NOPTS_VALUE;
for (i = 0; i < MAX_REORDER_DELAY + 1; i++) for (i = 0; i < MAX_REORDER_DELAY + 1; i++)
st->pts_buffer[i] = AV_NOPTS_VALUE; st->pts_buffer[i] = AV_NOPTS_VALUE;