demux_playlist: add base paths when adding playlist entries

Currently entries in playlist files like m3u are first added to the
playlist, and then if they were relative paths the playlist file's
dirname is prepended to them.

Change it to directly add entries with the correct path. This will be
needed to normalize playlist entries as soon as they are added, else
normalization would prepend the working directory to entries with
relative paths.

demux_cue, demux_edl and demux_mkv_timeline don't need to be modified to
work with the next commit.

Author: guidocella

common/playlist.c

@@ -304,20 +304,6 @@ struct playlist_entry *playlist_get_first_in_same_playlist(
     return entry;
 }
 
-void playlist_add_base_path(struct playlist *pl, bstr base_path)
-{
-    if (base_path.len == 0 || bstrcmp0(base_path, ".") == 0)
-        return;
-    for (int n = 0; n < pl->num_entries; n++) {
-        struct playlist_entry *e = pl->entries[n];
-        if (!mp_is_url(bstr0(e->filename))) {
-            char *new_file = mp_path_join_bstr(e, base_path, bstr0(e->filename));
-            talloc_free(e->filename);
-            e->filename = new_file;
-        }
-    }
-}
-
 void playlist_set_stream_flags(struct playlist *pl, int flags)
 {
     for (int n = 0; n < pl->num_entries; n++)

common/playlist.h

@@ -107,7 +107,6 @@ struct playlist_entry *playlist_get_first_in_next_playlist(struct playlist *pl,
                                                            int direction);
 struct playlist_entry *playlist_get_first_in_same_playlist(struct playlist_entry *entry,
                                                            char *current_playlist_path);
-void playlist_add_base_path(struct playlist *pl, bstr base_path);
 void playlist_set_stream_flags(struct playlist *pl, int flags);
 int64_t playlist_transfer_entries_to(struct playlist *pl, int dst_index,
                                      struct playlist *source_pl);

demux/demux_playlist.c

@@ -101,7 +101,6 @@ struct pl_parser {
     bool error;
     bool probing;
     bool force;
-    bool add_base;
     bool line_allocated;
     int autocreate_playlist;
     enum demux_check check_level;
@@ -219,9 +218,19 @@ static void pl_free_line(struct pl_parser *p, bstr line)
 
 static void pl_add(struct pl_parser *p, bstr entry)
 {
-    char *s = bstrto0(NULL, entry);
-    playlist_append_file(p->pl, s);
-    talloc_free(s);
+    char *filename;
+    bstr proto = mp_split_proto(bstr0(p->s->url), NULL);
+    // Don't add base path to self-expanding protocols
+    if (!mp_is_url(entry) && bstrcasecmp0(proto, "memory") &&
+        bstrcasecmp0(proto, "lavf") && bstrcasecmp0(proto, "hex") &&
+        bstrcasecmp0(proto, "data") && bstrcasecmp0(proto, "fd")) {
+      filename = mp_path_join_bstr(NULL, mp_dirname(p->s->url), entry);
+    } else {
+      filename = bstrto0(NULL, entry);
+    }
+
+    playlist_append_file(p->pl, filename);
+    talloc_free(filename);
 }
 
 static bool pl_eof(struct pl_parser *p)
@@ -279,12 +288,10 @@ static int parse_m3u(struct pl_parser *p)
         } else if (bstr_startswith0(line_dup, "#EXT-X-")) {
             p->format = "hls";
         } else if (line_dup.len > 0 && !bstr_startswith0(line_dup, "#")) {
-            char *fn = bstrto0(NULL, line_dup);
-            struct playlist_entry *e = playlist_entry_new(fn);
-            talloc_free(fn);
+            pl_add(p, line);
+            struct playlist_entry *e = playlist_get_last(p->pl);
             e->title = talloc_steal(e, title);
             title = NULL;
-            playlist_insert_at(p->pl, e, NULL);
         }
         pl_free_line(p, line);
         line = pl_get_line(p);
@@ -595,7 +602,6 @@ static int parse_dir(struct pl_parser *p)
 
     scan_dir(p, path, dir_stack, 0, autocreate);
 
-    p->add_base = false;
     ret = p->pl->num_entries > 0 ? 0 : -1;
 
 done:
@@ -662,7 +668,6 @@ static int open_file(struct demuxer *demuxer, enum demux_check check)
     p->log = demuxer->log;
     p->pl = talloc_zero(p, struct playlist);
     p->real_stream = demuxer->stream;
-    p->add_base = true;
 
     struct demux_opts *opts = mp_get_config_group(p, p->global, &demux_conf);
     p->codepage = opts->meta_cp;
@@ -696,16 +701,6 @@ static int open_file(struct demuxer *demuxer, enum demux_check check)
     p->s = demuxer->stream;
     p->utf16 = stream_skip_bom(p->s);
     bool ok = fmt->parse(p) >= 0 && !p->error;
-    if (p->add_base) {
-        bstr proto = mp_split_proto(bstr0(demuxer->filename), NULL);
-        // Don't add base path to self-expanding protocols
-        if (bstrcasecmp0(proto, "memory") && bstrcasecmp0(proto, "lavf") &&
-            bstrcasecmp0(proto, "hex") && bstrcasecmp0(proto, "data") &&
-            bstrcasecmp0(proto, "fd"))
-        {
-            playlist_add_base_path(p->pl, mp_dirname(demuxer->filename));
-        }
-    }
     playlist_set_stream_flags(p->pl, demuxer->stream_origin);
     demuxer->playlist = talloc_steal(demuxer, p->pl);
     demuxer->filetype = p->format ? p->format : fmt->name;