Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: check option before set discont_program_date_time
@ 2022-05-08  0:54 Steven Liu
  2022-05-08  0:54 ` [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: expand the scope of flags from int32_t to int64_t Steven Liu
  0 siblings, 1 reply; 2+ messages in thread
From: Steven Liu @ 2022-05-08  0:54 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Steven Liu

fix ticket: 9238
There should check option flags with HLS_PROGRAM_DATE_TIME before
set discont_program_date_time.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 libavformat/hlsenc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index d2b8215dff..d91c7ebcb7 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1288,8 +1288,10 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs
                 new_start_pos = avio_tell(vs->avf->pb);
                 vs->size = new_start_pos - vs->start_pos;
                 ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size);
-                vs->last_segment->discont_program_date_time = discont_program_date_time;
-                discont_program_date_time += vs->duration;
+                if (hls->flags & HLS_PROGRAM_DATE_TIME) {
+                    vs->last_segment->discont_program_date_time = discont_program_date_time;
+                    discont_program_date_time += vs->duration;
+                }
                 if (ret < 0)
                     goto fail;
                 vs->start_pos = new_start_pos;
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: expand the scope of flags from int32_t to int64_t
  2022-05-08  0:54 [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: check option before set discont_program_date_time Steven Liu
@ 2022-05-08  0:54 ` Steven Liu
  0 siblings, 0 replies; 2+ messages in thread
From: Steven Liu @ 2022-05-08  0:54 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Steven Liu

because the flags in AVOption support i64.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
---
 libavformat/hlsenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index d91c7ebcb7..8e91c7a980 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -202,7 +202,7 @@ typedef struct HLSContext {
     int64_t init_time;     // Set by a private option.
     int max_nb_segments;   // Set by a private option.
     int hls_delete_threshold; // Set by a private option.
-    uint32_t flags;        // enum HLSFlags
+    uint64_t flags;        // enum HLSFlags
     uint32_t pl_type;      // enum PlaylistType
     char *segment_filename;
     char *fmp4_init_filename;
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-05-08  0:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-08  0:54 [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: check option before set discont_program_date_time Steven Liu
2022-05-08  0:54 ` [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: expand the scope of flags from int32_t to int64_t Steven Liu

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git