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

hls: m3u8: remove helper var that's only used during parsing from structure

Browse source 
Just keep that local to the parsing function.
This commit is contained in:
Tim-Philipp Müller 2015-11-15 17:31:05 +00:00
parent efe62292a3
commit 5443cca406
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/hls/m3u8.c
View file

@ -152,7 +152,6 @@ _m3u8_copy (const GstM3U8 * self)
dup->iframe_lists = dup->iframe_lists =
g_list_copy_deep (self->iframe_lists, (GCopyFunc) _m3u8_copy, NULL); g_list_copy_deep (self->iframe_lists, (GCopyFunc) _m3u8_copy, NULL);
/* NOTE: current_variant will get set in gst_m3u8_copy () */ /* NOTE: current_variant will get set in gst_m3u8_copy () */
dup->mediasequence = self->mediasequence;
return dup; return dup;
} }
@ -374,6 +373,7 @@ gst_m3u8_update (GstM3U8Client * client, GstM3U8 * self, gchar * data,
gboolean have_iv = FALSE; gboolean have_iv = FALSE;
guint8 iv[16] = { 0, }; guint8 iv[16] = { 0, };
gint64 size = -1, offset = -1; gint64 size = -1, offset = -1;
gint64 mediasequence;
g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (self != NULL, FALSE);
g_return_val_if_fail (data != NULL, FALSE); g_return_val_if_fail (data != NULL, FALSE);
@ -408,7 +408,7 @@ gst_m3u8_update (GstM3U8Client * client, GstM3U8 * self, gchar * data,
self->files = NULL; self->files = NULL;
} }
client->duration = GST_CLOCK_TIME_NONE; client->duration = GST_CLOCK_TIME_NONE;
self->mediasequence = 0; mediasequence = 0;
/* By default, allow caching */ /* By default, allow caching */
self->allowcache = TRUE; self->allowcache = TRUE;
@ -452,9 +452,7 @@ gst_m3u8_update (GstM3U8Client * client, GstM3U8 * self, gchar * data,
list = NULL; list = NULL;
} else { } else {
GstM3U8MediaFile *file; GstM3U8MediaFile *file;
file = file = gst_m3u8_media_file_new (data, title, duration, mediasequence++);
gst_m3u8_media_file_new (data, title, duration,
self->mediasequence++);
/* set encryption params */ /* set encryption params */
file->key = current_key ? g_strdup (current_key) : NULL; file->key = current_key ? g_strdup (current_key) : NULL;
@ -595,7 +593,7 @@ gst_m3u8_update (GstM3U8Client * client, GstM3U8 * self, gchar * data,
self->targetduration = val * GST_SECOND; self->targetduration = val * GST_SECOND;
} else if (g_str_has_prefix (data_ext_x, "MEDIA-SEQUENCE:")) { } else if (g_str_has_prefix (data_ext_x, "MEDIA-SEQUENCE:")) {
if (int_from_string (data + 22, &data, &val)) if (int_from_string (data + 22, &data, &val))
self->mediasequence = val; mediasequence = val;
} else if (g_str_has_prefix (data_ext_x, "DISCONTINUITY")) { } else if (g_str_has_prefix (data_ext_x, "DISCONTINUITY")) {
discontinuity = TRUE; discontinuity = TRUE;
} else if (g_str_has_prefix (data_ext_x, "PROGRAM-DATE-TIME:")) { } else if (g_str_has_prefix (data_ext_x, "PROGRAM-DATE-TIME:")) {

1
ext/hls/m3u8.h
View file

@ -71,7 +71,6 @@ struct _GstM3U8
GList *lists; /* list of GstM3U8 from the main playlist */ GList *lists; /* list of GstM3U8 from the main playlist */
GList *iframe_lists; /* I-frame lists from the main playlist */ GList *iframe_lists; /* I-frame lists from the main playlist */
GList *current_variant; /* Current variant playlist used */ GList *current_variant; /* Current variant playlist used */
gint64 mediasequence; /* EXT-X-MEDIA-SEQUENCE & increased with new media file */
}; };
struct _GstM3U8MediaFile struct _GstM3U8MediaFile