avformat/mux: Don't allocate priv_pts separately

Andreas Rheinhardt committed 2 years ago

Commit 71e1da41 parent ad9f6444 files · +8 −17Browse files

Showing the changes to libavformat (4 of 4 files). Show all

Unified · Split

4 files

libavformat/avformat.c +0 −1
libavformat/internal.h +1 −1
libavformat/mux.c +6 −11
libavformat/mux_utils.c +1 −4

@@ -63,7 +63,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 62 unmodified lines
63	av_parser_close(sti->parser);	63	av_parser_close(sti->parser);
64	avcodec_free_context(&sti->avctx);	64	avcodec_free_context(&sti->avctx);
65	av_bsf_free(&sti->bsfc);	65	av_bsf_free(&sti->bsfc);
66	av_freep(&sti->priv_pts);
67	av_freep(&sti->index_entries);	66	av_freep(&sti->index_entries);
68	av_freep(&sti->probe_data.buf);	67	av_freep(&sti->probe_data.buf);
69		68

libavformat/internal.h+1−1

@@ -245,7 +245,7 @@ typedef struct FFStream { · 244 unmodified lines
245		245
246	int is_intra_only;	246	int is_intra_only;
247		247
248	FFFrac *priv_pts;	248	FFFrac priv_pts;
249		249
250	/**	250	/**
251	* Stream information used internally by avformat_find_stream_info()	251	* Stream information used internally by avformat_find_stream_info()

libavformat/mux.c+6−11

             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);
         }
     }
         }
         pkt->dts =
 //        pkt->pts= st->cur_dts;
-            pkt->pts = sti->priv_pts->val;
+            pkt->pts = sti->priv_pts.val;
     }
     //calculate dts from pts
             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) {
         /* 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)) {
+        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);
+            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;

libavformat/mux_utils.c+1−4

 #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;
-        return cffstream(st)->priv_pts->val;
-    } else
-        return AV_NOPTS_VALUE;
 }
 #endif

avformat/mux: Don't allocate priv_pts separately

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code