mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 12:10:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

hls: m3u8playlist: more minor playlist_render() clean-ups

Browse source 
Move the TAG defines directly into the code, not sure what
their purposes is, these are printf format strings so having
them directly as literals in the code where they're used
makes the code easier to follow.
This commit is contained in:
Tim-Philipp Müller 2015-08-30 16:40:02 +01:00
parent 386f173eaf
commit 4a9a0da50f
1 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ext/hls/gstm3u8playlist.c
View file

@ -26,13 +26,6 @@
#define GST_CAT_DEFAULT fragmented_debug #define GST_CAT_DEFAULT fragmented_debug
#define M3U8_HEADER_TAG "#EXTM3U\n"
#define M3U8_VERSION_TAG "#EXT-X-VERSION:%d\n"
#define M3U8_ALLOW_CACHE_TAG "#EXT-X-ALLOW-CACHE:%s\n"
#define M3U8_TARGETDURATION_TAG "#EXT-X-TARGETDURATION:%d\n"
#define M3U8_MEDIA_SEQUENCE_TAG "#EXT-X-MEDIA-SEQUENCE:%d\n"
#define M3U8_ENDLIST_TAG "#EXT-X-ENDLIST"
enum enum
{ {
GST_M3U8_PLAYLIST_TYPE_EVENT, GST_M3U8_PLAYLIST_TYPE_EVENT,
@ -147,20 +140,18 @@ gst_m3u8_playlist_render (GstM3U8Playlist * playlist)
g_return_val_if_fail (playlist != NULL, NULL); g_return_val_if_fail (playlist != NULL, NULL);
playlist_str = g_string_new (""); playlist_str = g_string_new ("#EXTM3U\n");
/* #EXTM3U */ g_string_append_printf (playlist_str, "#EXT-X-VERSION:%d\n",
g_string_append_printf (playlist_str, M3U8_HEADER_TAG); playlist->version);
/* #EXT-X-VERSION */
g_string_append_printf (playlist_str, M3U8_VERSION_TAG, playlist->version); g_string_append_printf (playlist_str, "#EXT-X-ALLOW-CACHE:%s\n",
/* #EXT-X-ALLOW_CACHE */
g_string_append_printf (playlist_str, M3U8_ALLOW_CACHE_TAG,
playlist->allow_cache ? "YES" : "NO"); playlist->allow_cache ? "YES" : "NO");
/* #EXT-X-MEDIA-SEQUENCE */
g_string_append_printf (playlist_str, M3U8_MEDIA_SEQUENCE_TAG, g_string_append_printf (playlist_str, "#EXT-X-MEDIA-SEQUENCE:%d\n",
playlist->sequence_number - playlist->entries->length); playlist->sequence_number - playlist->entries->length);
/* #EXT-X-TARGETDURATION */
g_string_append_printf (playlist_str, M3U8_TARGETDURATION_TAG, g_string_append_printf (playlist_str, "#EXT-X-TARGETDURATION:%u\n",
gst_m3u8_playlist_target_duration (playlist)); gst_m3u8_playlist_target_duration (playlist));
g_string_append (playlist_str, "\n"); g_string_append (playlist_str, "\n");
@ -186,7 +177,7 @@ gst_m3u8_playlist_render (GstM3U8Playlist * playlist)
} }
if (playlist->end_list) if (playlist->end_list)
g_string_append (playlist_str, M3U8_ENDLIST_TAG); g_string_append (playlist_str, "#EXT-X-ENDLIST");
return g_string_free (playlist_str, FALSE); return g_string_free (playlist_str, FALSE);
} }