avformat/aviobuf: End grace period of allowing 0 from read_packet

[ffmpeg] / libavformat / hlsplaylist.c

diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c
index efcbff0009db775323dcdd2128a1f7b4082510df..0e1dcc087f071d9e2f6ec7b9e8964f0d32e0e6f7 100644 (file)
--- a/libavformat/hlsplaylist.c
+++ b/libavformat/hlsplaylist.c
@@ -28,27 +28,49 @@
 #include "avformat.h"
 #include "hlsplaylist.h"
 
-void ff_hls_write_playlist_version(AVIOContext *out, int version) {
+void ff_hls_write_playlist_version(AVIOContext *out, int version)
+{
     if (!out)
         return;
     avio_printf(out, "#EXTM3U\n");
     avio_printf(out, "#EXT-X-VERSION:%d\n", version);
 }
 
-void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup,
-                                  char *filename, int name_id, int is_default) {
+void ff_hls_write_audio_rendition(AVIOContext *out, const char *agroup,
+                                  const char *filename, const char *language,
+                                  int name_id, int is_default)
+{
     if (!out || !agroup || !filename)
         return;
 
     avio_printf(out, "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"group_%s\"", agroup);
-    avio_printf(out, ",NAME=\"audio_%d\",DEFAULT=%s,URI=\"%s\"\n", name_id,
-                     is_default ? "YES" : "NO", filename);
+    avio_printf(out, ",NAME=\"audio_%d\",DEFAULT=%s,", name_id, is_default ? "YES" : "NO");
+    if (language) {
+        avio_printf(out, "LANGUAGE=\"%s\",", language);
+    }
+    avio_printf(out, "URI=\"%s\"\n", filename);
 }
 
-void ff_hls_write_stream_info(AVStream *st, AVIOContext *out,
-                              int bandwidth, char *filename, char *agroup,
-                              char *codecs, char *ccgroup) {
+void ff_hls_write_subtitle_rendition(AVIOContext *out, const char *sgroup,
+                                     const char *filename, const char *language,
+                                     int name_id, int is_default)
+{
+    if (!out || !filename)
+        return;
 
+    avio_printf(out, "#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"%s\"", sgroup);
+    avio_printf(out, ",NAME=\"subtitle_%d\",DEFAULT=%s,", name_id, is_default ? "YES" : "NO");
+    if (language) {
+        avio_printf(out, "LANGUAGE=\"%s\",", language);
+    }
+    avio_printf(out, "URI=\"%s\"\n", filename);
+}
+
+void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, int bandwidth,
+                              const char *filename, const char *agroup,
+                              const char *codecs, const char *ccgroup,
+                              const char *sgroup)
+{
     if (!out || !filename)
         return;
 
@@ -62,18 +84,21 @@ void ff_hls_write_stream_info(AVStream *st, AVIOContext *out,
     if (st && st->codecpar->width > 0 && st->codecpar->height > 0)
         avio_printf(out, ",RESOLUTION=%dx%d", st->codecpar->width,
                 st->codecpar->height);
-    if (codecs && strlen(codecs) > 0)
+    if (codecs && codecs[0])
         avio_printf(out, ",CODECS=\"%s\"", codecs);
-    if (agroup && strlen(agroup) > 0)
+    if (agroup && agroup[0])
         avio_printf(out, ",AUDIO=\"group_%s\"", agroup);
-    if (ccgroup && strlen(ccgroup) > 0)
+    if (ccgroup && ccgroup[0])
         avio_printf(out, ",CLOSED-CAPTIONS=\"%s\"", ccgroup);
+    if (sgroup && sgroup[0])
+        avio_printf(out, ",SUBTITLES=\"%s\"", sgroup);
     avio_printf(out, "\n%s\n\n", filename);
 }
 
 void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache,
                                   int target_duration, int64_t sequence,
-                                  uint32_t playlist_type) {
+                                  uint32_t playlist_type, int iframe_mode)
+{
     if (!out)
         return;
     ff_hls_write_playlist_version(out, version);
@@ -89,10 +114,14 @@ void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache,
     } else if (playlist_type == PLAYLIST_TYPE_VOD) {
         avio_printf(out, "#EXT-X-PLAYLIST-TYPE:VOD\n");
     }
+    if (iframe_mode) {
+        avio_printf(out, "#EXT-X-I-FRAMES-ONLY\n");
+    }
 }
 
-void ff_hls_write_init_file(AVIOContext *out, char *filename,
-                            int byterange_mode, int64_t size, int64_t pos) {
+void ff_hls_write_init_file(AVIOContext *out, const char *filename,
+                            int byterange_mode, int64_t size, int64_t pos)
+{
     avio_printf(out, "#EXT-X-MAP:URI=\"%s\"", filename);
     if (byterange_mode) {
         avio_printf(out, ",BYTERANGE=\"%"PRId64"@%"PRId64"\"", size, pos);
@@ -101,11 +130,14 @@ void ff_hls_write_init_file(AVIOContext *out, char *filename,
 }
 
 int ff_hls_write_file_entry(AVIOContext *out, int insert_discont,
-                             int byterange_mode,
-                             double duration, int round_duration,
-                             int64_t size, int64_t pos, //Used only if HLS_SINGLE_FILE flag is set
-                             char *baseurl, //Ignored if NULL
-                             char *filename, double *prog_date_time) {
+                            int byterange_mode, double duration,
+                            int round_duration, int64_t size,
+                            int64_t pos /* Used only if HLS_SINGLE_FILE flag is set */,
+                            const char *baseurl /* Ignored if NULL */,
+                            const char *filename, double *prog_date_time,
+                            int64_t video_keyframe_size, int64_t video_keyframe_pos,
+                            int iframe_mode)
+{
     if (!out || !filename)
         return AVERROR(EINVAL);
 
@@ -117,7 +149,8 @@ int ff_hls_write_file_entry(AVIOContext *out, int insert_discont,
     else
         avio_printf(out, "#EXTINF:%f,\n", duration);
     if (byterange_mode)
-        avio_printf(out, "#EXT-X-BYTERANGE:%"PRId64"@%"PRId64"\n", size, pos);
+        avio_printf(out, "#EXT-X-BYTERANGE:%"PRId64"@%"PRId64"\n", iframe_mode ? video_keyframe_size : size,
+                    iframe_mode ? video_keyframe_pos : pos);
 
     if (prog_date_time) {
         time_t tt, wrongsecs;
@@ -153,7 +186,8 @@ int ff_hls_write_file_entry(AVIOContext *out, int insert_discont,
     return 0;
 }
 
-void ff_hls_write_end_list (AVIOContext *out) {
+void ff_hls_write_end_list(AVIOContext *out)
+{
     if (!out)
         return;
     avio_printf(out, "#EXT-X-ENDLIST\n");