Remove StreamInfo function

The StreamInfo has long been generated during stream creation.

6 files changed, 5 insertions, 26 deletions

diff --git a/demuxer/Demuxers/BDDemuxer.cpp b/demuxer/Demuxers/BDDemuxer.cpp
index ead8340b..47faa3ef 100644
--- a/demuxer/Demuxers/BDDemuxer.cpp
+++ b/demuxer/Demuxers/BDDemuxer.cpp
@@ -431,11 +431,6 @@ const char *CBDDemuxer::GetContainerFormat() const
   return "mpegts";
 }
 
-HRESULT CBDDemuxer::StreamInfo(const CBaseDemuxer::stream &s, WCHAR **ppszName) const
-{
-  return m_lavfDemuxer->StreamInfo(s, ppszName);
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // IAMExtendedSeeking
 STDMETHODIMP CBDDemuxer::get_ExSeekCapabilities(long* pExCapabilities)
diff --git a/demuxer/Demuxers/BDDemuxer.h b/demuxer/Demuxers/BDDemuxer.h
index 3aad15c0..47f35a7b 100644
--- a/demuxer/Demuxers/BDDemuxer.h
+++ b/demuxer/Demuxers/BDDemuxer.h
@@ -46,7 +46,6 @@ public:
   STDMETHODIMP GetNextPacket(Packet **ppPacket);
   STDMETHODIMP Seek(REFERENCE_TIME rTime);
   const char *GetContainerFormat() const;
-  HRESULT StreamInfo(const CBaseDemuxer::stream &s, WCHAR **ppszName) const;
 
   CStreamList *GetStreams(StreamType type) { if (m_lavfDemuxer) return m_lavfDemuxer->GetStreams(type); else return __super::GetStreams(type);  }
   HRESULT SetActiveStream(StreamType type, int pid) { if (m_lavfDemuxer) { m_lavfDemuxer->SetActiveStream(type, pid); return S_OK; } else return E_FAIL; }
diff --git a/demuxer/Demuxers/BaseDemuxer.h b/demuxer/Demuxers/BaseDemuxer.h
index c56c01ed..8dda341b 100644
--- a/demuxer/Demuxers/BaseDemuxer.h
+++ b/demuxer/Demuxers/BaseDemuxer.h
@@ -83,9 +83,6 @@ public:
   // Get Container Flags
 #define LAVFMT_TS_DISCONT 0x0001
   virtual DWORD GetContainerFlags() { return 0; }
-  // Create Stream Description
-  virtual HRESULT StreamInfo(const CBaseDemuxer::stream &s, WCHAR **ppszName) const = 0;
-
   // Select the active title
   virtual STDMETHODIMP SetTitle(int idx) { return E_NOTIMPL; }
   // Query the active title
diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp
index 0f580c96..161a8f1f 100644
--- a/demuxer/Demuxers/LAVFDemuxer.cpp
+++ b/demuxer/Demuxers/LAVFDemuxer.cpp
@@ -1086,21 +1086,6 @@ const char *CLAVFDemuxer::GetContainerFormat() const
   return m_pszInputFormat;
 }
 
-HRESULT CLAVFDemuxer::StreamInfo(const CBaseDemuxer::stream &s, WCHAR **ppszName) const
-{
-  if (s.pid >= (DWORD)m_avFormat->nb_streams) { return E_FAIL; }
-
-  if(ppszName) {
-    std::string info = s.streamInfo->codecInfo;
-    size_t len = info.size() + 1;
-    *ppszName = (WCHAR *)CoTaskMemAlloc(len * sizeof(WCHAR));
-    if (*ppszName)
-      MultiByteToWideChar(CP_UTF8, 0, info.c_str(), -1, *ppszName, (int)len);
-  }
-
-  return S_OK;
-}
-
 /////////////////////////////////////////////////////////////////////////////
 // IAMExtendedSeeking
 STDMETHODIMP CLAVFDemuxer::get_ExSeekCapabilities(long* pExCapabilities)
diff --git a/demuxer/Demuxers/LAVFDemuxer.h b/demuxer/Demuxers/LAVFDemuxer.h
index c4ffab0b..49caf44a 100644
--- a/demuxer/Demuxers/LAVFDemuxer.h
+++ b/demuxer/Demuxers/LAVFDemuxer.h
@@ -61,7 +61,6 @@ public:
   STDMETHODIMP Seek(REFERENCE_TIME rTime);
   const char *GetContainerFormat() const;
   virtual DWORD GetContainerFlags() { return m_bTSDiscont ? LAVFMT_TS_DISCONT : 0; }
-  HRESULT StreamInfo(const CBaseDemuxer::stream &s, WCHAR **ppszName) const;
 
   STDMETHODIMP SetTitle(int idx);
   STDMETHODIMP_(int) GetTitle();
diff --git a/demuxer/LAVSplitter/LAVSplitter.cpp b/demuxer/LAVSplitter/LAVSplitter.cpp
index 97ea2e40..d5fbb88d 100644
--- a/demuxer/LAVSplitter/LAVSplitter.cpp
+++ b/demuxer/LAVSplitter/LAVSplitter.cpp
@@ -1341,7 +1341,11 @@ STDMETHODIMP CLAVSplitter::Info(long lIndex, AM_MEDIA_TYPE **ppmt, DWORD *pdwFla
           *plcid = s.lcid;
         }
         if (ppszName) {
-          m_pDemuxer->StreamInfo(s, ppszName);
+          std::string info = s.streamInfo->codecInfo;
+          size_t len = info.size() + 1;
+          *ppszName = (WCHAR*)CoTaskMemAlloc(len * sizeof(WCHAR));
+          if (*ppszName)
+            MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, info.c_str(), -1, *ppszName, (int)len);
         }
       }
       hr = S_OK;