Fix media type handling when switching video streams

2 files changed, 13 insertions, 1 deletions

diff --git a/demuxer/LAVSplitter/OutputPin.cpp b/demuxer/LAVSplitter/OutputPin.cpp
index 39a4a4c9..9a411385 100644
--- a/demuxer/LAVSplitter/OutputPin.cpp
+++ b/demuxer/LAVSplitter/OutputPin.cpp
@@ -253,6 +253,12 @@ STDMETHODIMP CLAVOutputPin::Connect(IPin* pReceivePin, const AM_MEDIA_TYPE* pmt)
   return hr;
 }
 
+HRESULT CLAVOutputPin::CompleteConnect(IPin *pReceivePin)
+{
+  m_StreamMT = m_mt;
+  return __super::CompleteConnect(pReceivePin);
+}
+
 HRESULT CLAVOutputPin::DeliverBeginFlush()
 {
   DbgLog((LOG_TRACE, 20, L"::DeliverBeginFlush on %s Pin", CBaseDemuxer::CStreamList::ToStringW(m_pinType)));
@@ -347,11 +353,12 @@ HRESULT CLAVOutputPin::QueuePacket(Packet *pPacket)
     if(m_newMT && pPacket) {
       DbgLog((LOG_TRACE, 10, L"::QueuePacket() - Found new Media Type"));
       pPacket->pmt = CreateMediaType(m_newMT);
+      SetStreamMediaType(m_newMT);
       SAFE_DELETE(m_newMT);
     }
   }
 
-  m_Parser.Parse(m_mt.subtype, pPacket);
+  m_Parser.Parse(m_StreamMT.subtype, pPacket);
 
   return m_hrDeliver;
 }
@@ -485,6 +492,8 @@ HRESULT CLAVOutputPin::DeliverPacket(Packet *pPacket)
     m_mts.clear();
     m_mts.push_back(pmt);
     pPacket->pmt = NULL;
+
+    SetMediaType(&pmt);
   }
 
   bool fTimeValid = pPacket->rtStart != Packet::INVALID_TIME;
diff --git a/demuxer/LAVSplitter/OutputPin.h b/demuxer/LAVSplitter/OutputPin.h
index 1e7c6ff4..2a483c8c 100644
--- a/demuxer/LAVSplitter/OutputPin.h
+++ b/demuxer/LAVSplitter/OutputPin.h
@@ -57,6 +57,7 @@ public:
   HRESULT Inactive();
 
   STDMETHODIMP Connect(IPin * pReceivePin, const AM_MEDIA_TYPE *pmt);
+  HRESULT CompleteConnect(IPin *pReceivePin);
 
   // IMediaSeeking
   STDMETHODIMP GetCapabilities(DWORD* pCapabilities);
@@ -94,6 +95,7 @@ public:
 
   void SetNewMediaTypes(std::vector<CMediaType> pmts) { CAutoLock lock(&m_csMT); m_mts = pmts; SetQueueSizes(); }
   void SendMediaType(CMediaType *mt) { CAutoLock lock(&m_csMT); m_newMT = mt;}
+  void SetStreamMediaType(CMediaType *mt) { CAutoLock lock(&m_csMT); m_StreamMT = *mt; }
 
   CMediaType& GetActiveMediaType() { return m_mt; }
 
@@ -130,6 +132,7 @@ private:
   CCritSec m_csMT;
   std::vector<CMediaType> m_mts;
   CPacketQueue m_queue;
+  CMediaType m_StreamMT;
 
   std::string m_containerFormat;