diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-03 20:11:29 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-07 10:22:18 +0100 |
| commit | 71e1da4522de809e06cbc7cdca7de3fda794f255 (patch) | |
| tree | b6a37eea82ac6afe6255f19dbd2519b3dbc283a1 | |
| parent | ad9f644505bddd8b7243d4d9927ca08d6f80e97a (diff) | |
| download | ffmpeg-71e1da4522de809e06cbc7cdca7de3fda794f255.tar.gz | |
avformat/mux: Don't allocate priv_pts separately
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavformat/avformat.c | 1 | ||||
| -rw-r--r-- | libavformat/internal.h | 2 | ||||
| -rw-r--r-- | libavformat/mux.c | 17 | ||||
| -rw-r--r-- | libavformat/mux_utils.c | 5 |
4 files changed, 8 insertions, 17 deletions
diff --git a/libavformat/avformat.c b/libavformat/avformat.c index ae79ee6ef7..ca31d3dc56 100644 --- a/libavformat/avformat.c +++ b/libavformat/avformat.c @@ -63,7 +63,6 @@ FF_ENABLE_DEPRECATION_WARNINGS av_parser_close(sti->parser); avcodec_free_context(&sti->avctx); av_bsf_free(&sti->bsfc); - av_freep(&sti->priv_pts); av_freep(&sti->index_entries); av_freep(&sti->probe_data.buf); diff --git a/libavformat/internal.h b/libavformat/internal.h index 520f1a5229..c66f959e9f 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -245,7 +245,7 @@ typedef struct FFStream { int is_intra_only; - FFFrac *priv_pts; + FFFrac priv_pts; /** * Stream information used internally by avformat_find_stream_info() diff --git a/libavformat/mux.c b/libavformat/mux.c index de10d2c008..93280f9047 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -406,16 +406,11 @@ static int init_pts(AVFormatContext *s) break; } - if (!sti->priv_pts) - sti->priv_pts = av_mallocz(sizeof(*sti->priv_pts)); - if (!sti->priv_pts) - return AVERROR(ENOMEM); - if (den != AV_NOPTS_VALUE) { if (den <= 0) return AVERROR_INVALIDDATA; - frac_init(sti->priv_pts, 0, 0, den); + frac_init(&sti->priv_pts, 0, 0, den); } } @@ -550,7 +545,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * } pkt->dts = // pkt->pts= st->cur_dts; - pkt->pts = sti->priv_pts->val; + pkt->pts = sti->priv_pts.val; } //calculate dts from pts @@ -587,7 +582,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * av_ts2str(pkt->pts), av_ts2str(pkt->dts)); sti->cur_dts = pkt->dts; - sti->priv_pts->val = pkt->dts; + sti->priv_pts.val = pkt->dts; /* update pts */ switch (st->codecpar->codec_type) { @@ -599,12 +594,12 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * /* HACK/FIXME, we skip the initial 0 size packets as they are most * likely equal to the encoder delay, but it would be better if we * had the real timestamps from the encoder */ - if (frame_size >= 0 && (pkt->size || sti->priv_pts->num != sti->priv_pts->den >> 1 || sti->priv_pts->val)) { - frac_add(sti->priv_pts, (int64_t)st->time_base.den * frame_size); + if (frame_size >= 0 && (pkt->size || sti->priv_pts.num != sti->priv_pts.den >> 1 || sti->priv_pts.val)) { + frac_add(&sti->priv_pts, (int64_t)st->time_base.den * frame_size); } break; case AVMEDIA_TYPE_VIDEO: - frac_add(sti->priv_pts, (int64_t)st->time_base.den * st->time_base.num); + frac_add(&sti->priv_pts, (int64_t)st->time_base.den * st->time_base.num); break; } return 0; diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c index 3e63b8039a..c7ac2a9c97 100644 --- a/libavformat/mux_utils.c +++ b/libavformat/mux_utils.c @@ -33,10 +33,7 @@ #if FF_API_GET_END_PTS int64_t av_stream_get_end_pts(const AVStream *st) { - if (cffstream(st)->priv_pts) { - return cffstream(st)->priv_pts->val; - } else - return AV_NOPTS_VALUE; + return cffstream(st)->priv_pts.val; } #endif |