hlsdemux: Fix crash when NETTLE is not used

hlsdemux: Fix bug for getting variant stream info

Change-Id: Ibe39e0749723d5ef41b927beb6066f91336e35b0

diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c
index d088873211f02c48f16029c1b5c214cb9fb13305..c1be60d305b9d9bc34068330553d84cb427e1bb2 100644 (file)
--- a/ext/hls/gsthlsdemux.c
+++ b/ext/hls/gsthlsdemux.c
@@ -311,7 +311,6 @@ gst_hls_demux_get_bitrate (GstHLSDemux * hlsdemux)
 static void
 gst_hls_demux_clear_pending_data (GstHLSDemux * hlsdemux)
 {
-  gst_hls_demux_decrypt_end (hlsdemux);
   gst_adapter_clear (hlsdemux->pending_encrypted_data);
   gst_buffer_replace (&hlsdemux->pending_decrypted_buffer, NULL);
   gst_buffer_replace (&hlsdemux->pending_typefind_buffer, NULL);
@@ -343,9 +342,8 @@ gst_hls_demux_seek (GstAdaptiveDemux * demux, GstEvent * seek)
   if (flags & GST_SEEK_FLAG_FLUSH) {
 #ifdef TIZEN_FEATURE_ADAPTIVE_MODIFICATION
     gst_hls_demux_clear_pending_data (hlsdemux);
-#else
-    gst_hls_demux_decrypt_end (hlsdemux);
 #endif
+    gst_hls_demux_decrypt_end (hlsdemux);
   }
 
   /* Use I-frame variants for trick modes */
@@ -440,6 +438,8 @@ gst_hls_demux_setup_streams (GstAdaptiveDemux * demux)
   /* only 1 output supported */
 #ifdef TIZEN_FEATURE_ADAPTIVE_MODIFICATION
   gst_hls_demux_clear_pending_data (hlsdemux);
+  gst_hls_demux_decrypt_end (hlsdemux);
+
 #endif
   gst_adaptive_demux_stream_new (demux, gst_hls_demux_create_pad (hlsdemux));
 
@@ -965,7 +965,6 @@ gst_hls_demux_reset (GstAdaptiveDemux * ademux)
     g_free (demux->current_iv);
     demux->current_iv = NULL;
   }
-
   gst_hls_demux_decrypt_end (demux);
 }
 

diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c
index 1f2c7247b5c41f39de1a65b1f414792e093b5faf..1cfb23f9fe1a0baef662441a85fd17c67b49859e 100644 (file)
--- a/ext/hls/m3u8.c
+++ b/ext/hls/m3u8.c
@@ -790,7 +790,7 @@ gst_m3u8_update (GstM3U8Client * client, GstM3U8 * self, gchar * data,
 
 #ifdef TIZEN_FEATURE_ADAPTIVE_MODIFICATION
     /* update variant stream info */
-    for (l = self->current_variant; l != NULL; l = l->next) {
+    for (l = self->lists; l != NULL; l = l->next) {
       GstM3U8 *data = l->data;
       GstM3U8VideoVariantInfo *var_info = g_new0(GstM3U8VideoVariantInfo, 1);