Ticket #9722: streaming.patch

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -920 +920 @@
 
     InitByteContext();
 
+    if (ringBuffer->IsStream() && !ringBuffer->StartFromBeginning())
+        return -1;
+
     int err = av_open_input_stream(&ic, ic->pb, filename, fmt, &params);
     if (err < 0)
     {
@@ -931 +934 @@
     int ret = FindStreamInfo();
 
     // Reset DVD/bluray ringbuffers
-    if (!ringBuffer->StartFromBeginning())
+    if (ringBuffer->IsDisc() && !ringBuffer->StartFromBeginning())
         return -1;
     ringBuffer->IgnoreWaitStates(false);
 

mythtv/libs/libmythtv/ringbuffer.cpp

@@ -114 +114 @@
     bool is_dvd = false;
     bool is_bd  = false;
 
-    if (lfilename.startsWith("http://"))
+    if (lfilename.startsWith("http://") ||
+        lfilename.contains(QRegExp("^rtmp.?://")))
     {
         return new StreamingRingBuffer(lfilename);
     }
@@ -1413 +1414 @@
     rwlock.unlock();
 }
 
+const StreamingRingBuffer  *RingBuffer::Stream(void) const
+{
+    return dynamic_cast<const StreamingRingBuffer*>(this);
+}
+
 const DVDRingBuffer *RingBuffer::DVD(void) const
 {
     return dynamic_cast<const DVDRingBuffer*>(this);
@@ -1433 +1439 @@
     return dynamic_cast<BDRingBuffer*>(this);
 }
 
+StreamingRingBuffer  *RingBuffer::Stream(void)
+{
+    return dynamic_cast<StreamingRingBuffer*>(this);
+}
+
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

mythtv/libs/libmythtv/ringbuffer.h

@@ -27 +27 @@
 class ThreadedFileWriter;
 class DVDRingBuffer;
 class BDRingBuffer;
+class StreamingRingBuffer;
 class LiveTVChain;
 class RemoteFile;
 
@@ -69 +70 @@
     bool IsDisc(void) const { return IsDVD() || IsBD(); }
     bool IsDVD(void)  const { return DVD() != NULL;     }
     bool IsBD(void)   const { return BD()  != NULL;     }
+    bool IsStream(void) const { return Stream() != NULL;  }
+    const StreamingRingBuffer *Stream(void) const;
     const DVDRingBuffer *DVD(void) const;
     const BDRingBuffer  *BD(void)  const;
     DVDRingBuffer *DVD(void);
     BDRingBuffer  *BD(void);
+    StreamingRingBuffer *Stream(void);
     virtual bool StartFromBeginning(void)                   { return true;  }
     virtual void IgnoreWaitStates(bool ignore)              { }
     virtual bool IsInDiscMenuOrStillFrame(void) const       { return false; }

mythtv/libs/libmythtv/streamingringbuffer.cpp

@@ -44 +44 @@
     return true;
 }
 
+bool StreamingRingBuffer::StartFromBeginning(void)
+{
+    if (m_context)
+    {
+        url_close(m_context);
+        m_context = NULL;
+    }
+
+    return OpenFile(filename);
+}
+
 long long StreamingRingBuffer::Seek(long long pos, int whence, bool has_lock)
 {
+    if (m_context)
+    {
+        if (url_seek(m_context, pos, whence) < 0)
+        {
+            ateof = true;
+            return 0;
+        }
+        return pos;
+    }
     return 0;
 }
 
 int StreamingRingBuffer::safe_read(void *data, uint sz)
 {
     if (m_context)
-        return url_read(m_context, (unsigned char*)data, sz);
+        return url_read_complete(m_context, (unsigned char*)data, sz);
     return 0;
 }
 

mythtv/libs/libmythtv/streamingringbuffer.h

@@ -20 +20 @@
     virtual long long Seek(long long pos, int whence, bool has_lock);
     virtual long long GetRealFileSize(void);
     virtual bool IsStreamed(void) { return true; }
+    bool StartFromBeginning(void);
 
   protected:
     virtual int safe_read(void *data, uint sz);

mythtv/programs/mythfrontend/main.cpp

@@ -784 +784 @@
     QFile checkFile(mrl);
     if ((!checkFile.exists() && !mrl.startsWith("dvd:")
          && !mrl.startsWith("bd:")
-         && !mrl.startsWith("myth:")))
+         && !mrl.startsWith("myth:")
+         && !mrl.startsWith("http:")
+         && !mrl.contains(QRegExp("^rtmp.?://"))))
     {
         QString errorText = QObject::tr("Failed to open \n '%1' in %2 \n"
                                         "Check if the video exists")