Ignore invalid sub-stream entries.

A HLS stream may contain various bitrate streams, if one failed to download we would abort. Now just ignore it and continue Fixes #10988
MythTV · Aug 11, 2012 · 30d75bc · 30d75bc
1 parent dfc0c1f
commit 30d75bc
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp b/mythtv/libs/libmythtv/HLS/httplivestreambuffer.cpp
@@ -2164,11 +2164,20 @@ int HLSRingBuffer::ParseM3U8(const QByteArray *buffer, StreamsList *streams)
                     HLSStream *hls = ParseStreamInformation(line, uri);
                     if (hls)
                     {
-                        streams->append(hls);
                         /* Download playlist file from server */
                         QByteArray buf;
                         bool ret = downloadURL(hls->Url(), &buf);
-                        if (!ret || m_killed)
+                        if (!ret)
+                        {
+                            LOG(VB_GENERAL, LOG_INFO, LOC +
+                                QString("Skipping invalid stream, couldn't download: %1")
+                                .arg(hls->Url()));
+                            delete hls;
+                            continue;
+                        }
+                        streams->append(hls);
+                        // One last chance to abort early
+                        if (m_killed)
                         {
                             err = RET_ERROR;
                             break;