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

lavf: move AVStream.interleaver_chunk_* 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 108864acee
commit 7e87288f73
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avformat.h
View File

@ -1106,9 +1106,6 @@ typedef struct AVStream {
int pmt_version; int pmt_version;
int pmt_stream_idx; int pmt_stream_idx;
int64_t interleaver_chunk_size;
int64_t interleaver_chunk_duration;
/** /**
* 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.

3
libavformat/internal.h
View File

@ -225,6 +225,9 @@ struct AVStreamInternal {
} *info; } *info;
int64_t interleaver_chunk_size;
int64_t interleaver_chunk_duration;
/** /**
* stream probing state * stream probing state
* -1 -> probing finished * -1 -> probing finished

16
libavformat/mux.c
View File

@ -839,19 +839,19 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
if (chunked) { if (chunked) {
uint64_t max= av_rescale_q_rnd(s->max_chunk_duration, AV_TIME_BASE_Q, st->time_base, AV_ROUND_UP); uint64_t max= av_rescale_q_rnd(s->max_chunk_duration, AV_TIME_BASE_Q, st->time_base, AV_ROUND_UP);
st->interleaver_chunk_size += pkt->size; st->internal->interleaver_chunk_size += pkt->size;
st->interleaver_chunk_duration += pkt->duration; st->internal->interleaver_chunk_duration += pkt->duration;
if ( (s->max_chunk_size && st->interleaver_chunk_size > s->max_chunk_size) if ( (s->max_chunk_size && st->internal->interleaver_chunk_size > s->max_chunk_size)
|| (max && st->interleaver_chunk_duration > max)) { || (max && st->internal->interleaver_chunk_duration > max)) {
st->interleaver_chunk_size = 0; st->internal->interleaver_chunk_size = 0;
pkt->flags |= CHUNK_START; pkt->flags |= CHUNK_START;
if (max && st->interleaver_chunk_duration > max) { if (max && st->internal->interleaver_chunk_duration > max) {
int64_t syncoffset = (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)*max/2; int64_t syncoffset = (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)*max/2;
int64_t syncto = av_rescale(pkt->dts + syncoffset, 1, max)*max - syncoffset; int64_t syncto = av_rescale(pkt->dts + syncoffset, 1, max)*max - syncoffset;
st->interleaver_chunk_duration += (pkt->dts - syncto)/8 - max; st->internal->interleaver_chunk_duration += (pkt->dts - syncto)/8 - max;
} else } else
st->interleaver_chunk_duration = 0; st->internal->interleaver_chunk_duration = 0;
} }
} }
if (*next_point) { if (*next_point) {