Changeset 721


Ignore:
Timestamp:
01/14/12 04:00:11 (4 months ago)
Author:
josh
Message:

-- RTMP: Stream types should take a BaseRTMPProtocol in the constructor.

Location:
trunk/sources/thelib
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/thelib/include/protocols/rtmp/streaming/baseoutnetrtmpstream.h

    r637 r721  
    7474        uint64_t _videoDroppedBytesCount; 
    7575protected: 
    76         BaseOutNetRTMPStream(BaseProtocol *pProtocol, StreamsManager *pStreamsManager, 
     76        BaseOutNetRTMPStream(BaseRTMPProtocol *pProtocol, StreamsManager *pStreamsManager, 
    7777                        uint64_t type, string name, uint32_t rtmpStreamId, uint32_t chunkSize); 
    7878public: 
    79         static BaseOutNetRTMPStream *GetInstance(BaseProtocol *pProtocol, 
     79        static BaseOutNetRTMPStream *GetInstance(BaseRTMPProtocol *pProtocol, 
    8080                        StreamsManager *pStreamsManager, 
    8181                        string name, uint32_t rtmpStreamId, 

  • trunk/sources/thelib/include/protocols/rtmp/streaming/infilertmpstream.h

    r456 r721  
    9696        uint32_t _chunkSize; 
    9797public: 
    98         InFileRTMPStream(BaseProtocol *pProtocol, StreamsManager *pStreamsManager, 
     98        InFileRTMPStream(BaseRTMPProtocol *pProtocol, StreamsManager *pStreamsManager, 
    9999                        string name); 
    100100        virtual ~InFileRTMPStream(); 

  • trunk/sources/thelib/include/protocols/rtmp/streaming/outfilertmpflvstream.h

    r56 r721  
    2424#include "streaming/baseoutfilestream.h" 
    2525 
     26class BaseRTMPProtocol; 
     27 
    2628class DLLEXP OutFileRTMPFLVStream 
    2729: public BaseOutFileStream { 
    … …  
    3335        uint32_t _prevTagSize; 
    3436public: 
    35         OutFileRTMPFLVStream(BaseProtocol *pProtocol, StreamsManager *pStreamsManager, 
     37        OutFileRTMPFLVStream(BaseRTMPProtocol *pProtocol, StreamsManager *pStreamsManager, 
    3638                        string name); 
    3739        virtual ~OutFileRTMPFLVStream(); 

  • trunk/sources/thelib/include/protocols/rtmp/streaming/outnetrtmp4rtmpstream.h

    r422 r721  
    2828: public BaseOutNetRTMPStream { 
    2929public: 
    30         OutNetRTMP4RTMPStream(BaseProtocol *pProtocol, StreamsManager *pStreamsManager, 
     30        OutNetRTMP4RTMPStream(BaseRTMPProtocol *pProtocol, StreamsManager *pStreamsManager, 
    3131                        string name, uint32_t rtmpStreamId, uint32_t chunkSize); 
    3232        virtual ~OutNetRTMP4RTMPStream(); 

  • trunk/sources/thelib/include/protocols/rtmp/streaming/outnetrtmp4tsstream.h

    r668 r721  
    3737        bool _inboundStreamIsRTP; 
    3838public: 
    39         OutNetRTMP4TSStream(BaseProtocol *pProtocol, StreamsManager *pStreamsManager, 
     39        OutNetRTMP4TSStream(BaseRTMPProtocol *pProtocol, StreamsManager *pStreamsManager, 
    4040                        string name, uint32_t rtmpStreamId, uint32_t chunkSize); 
    4141        virtual ~OutNetRTMP4TSStream(); 

  • trunk/sources/thelib/include/protocols/rtmp/streaming/rtmpstream.h

    r422 r721  
    2525#include "streaming/basestream.h" 
    2626 
     27class BaseRTMPProtocol; 
     28 
    2729class DLLEXP RTMPStream 
    2830: public BaseStream { 
    … …  
    3032        uint32_t _rtmpStreamId; 
    3133public: 
    32         RTMPStream(BaseProtocol *pProtocol, StreamsManager *pStreamsManager, 
     34        RTMPStream(BaseRTMPProtocol *pProtocol, StreamsManager *pStreamsManager, 
    3335                        uint32_t rtmpStreamId); 
    3436        virtual ~RTMPStream(); 

  • trunk/sources/thelib/src/protocols/rtmp/streaming/baseoutnetrtmpstream.cpp

    r684 r721  
    4444//#define SIMULATE_DROPPING_FRAMES 40 
    4545 
    46 BaseOutNetRTMPStream::BaseOutNetRTMPStream(BaseProtocol *pProtocol, 
     46BaseOutNetRTMPStream::BaseOutNetRTMPStream(BaseRTMPProtocol *pProtocol, 
    4747                StreamsManager *pStreamsManager, uint64_t type, string name, uint32_t rtmpStreamId, 
    4848                uint32_t chunkSize) 
    … …  
    8383} 
    8484 
    85 BaseOutNetRTMPStream *BaseOutNetRTMPStream::GetInstance(BaseProtocol *pProtocol, 
     85BaseOutNetRTMPStream *BaseOutNetRTMPStream::GetInstance(BaseRTMPProtocol *pProtocol, 
    8686                StreamsManager *pStreamsManager, 
    8787                string name, uint32_t rtmpStreamId, 

  • trunk/sources/thelib/src/protocols/rtmp/streaming/infilertmpstream.cpp

    r468 r721  
    174174} 
    175175 
    176 InFileRTMPStream::InFileRTMPStream(BaseProtocol *pProtocol, 
     176InFileRTMPStream::InFileRTMPStream(BaseRTMPProtocol *pProtocol, 
    177177                StreamsManager *pStreamsManager, string name) 
    178178: BaseInFileStream(pProtocol, pStreamsManager, ST_IN_FILE_RTMP, name) { 
    … …  
    275275                        //||metadata[META_MEDIA_TYPE] == MEDIA_TYPE_NSV 
    276276                        ) { 
    277                 pResult = new InFileRTMPStream((BaseProtocol *) pRTMPProtocol, 
     277                pResult = new InFileRTMPStream(pRTMPProtocol, 
    278278                                pStreamsManager, metadata[META_SERVER_FULL_PATH]); 
    279279        } else { 

  • trunk/sources/thelib/src/protocols/rtmp/streaming/outfilertmpflvstream.cpp

    r373 r721  
    2222#include "protocols/rtmp/streaming/outfilertmpflvstream.h" 
    2323#include "streaming/streamstypes.h" 
    24 #include "protocols/baseprotocol.h" 
     24#include "protocols/rtmp/basertmpprotocol.h" 
    2525 
    26 OutFileRTMPFLVStream::OutFileRTMPFLVStream(BaseProtocol *pProtocol, 
     26OutFileRTMPFLVStream::OutFileRTMPFLVStream(BaseRTMPProtocol *pProtocol, 
    2727                StreamsManager *pStreamsManager, string name) 
    2828: BaseOutFileStream(pProtocol, pStreamsManager, ST_OUT_FILE_RTMP_FLV, name) { 

  • trunk/sources/thelib/src/protocols/rtmp/streaming/outnetrtmp4rtmpstream.cpp

    r489 r721  
    2222#include "streaming/streamstypes.h" 
    2323 
    24 OutNetRTMP4RTMPStream::OutNetRTMP4RTMPStream(BaseProtocol *pProtocol, 
     24OutNetRTMP4RTMPStream::OutNetRTMP4RTMPStream(BaseRTMPProtocol *pProtocol, 
    2525                StreamsManager *pStreamsManager, string name, uint32_t rtmpStreamId, 
    2626                uint32_t chunkSize) 

  • trunk/sources/thelib/src/protocols/rtmp/streaming/outnetrtmp4tsstream.cpp

    r668 r721  
    2525#define SPSPPS_MAX_LENGTH 1024 
    2626 
    27 OutNetRTMP4TSStream::OutNetRTMP4TSStream(BaseProtocol *pProtocol, 
     27OutNetRTMP4TSStream::OutNetRTMP4TSStream(BaseRTMPProtocol *pProtocol, 
    2828                StreamsManager *pStreamsManager, string name, uint32_t rtmpStreamId, 
    2929                uint32_t chunkSize) 

  • trunk/sources/thelib/src/protocols/rtmp/streaming/rtmpstream.cpp

    r422 r721  
    1919 
    2020#ifdef HAS_PROTOCOL_RTMP 
     21#include "protocols/rtmp/basertmpprotocol.h" 
    2122#include "protocols/rtmp/streaming/rtmpstream.h" 
    2223#include "streaming/streamstypes.h" 
    2324 
    24 RTMPStream::RTMPStream(BaseProtocol *pProtocol, 
     25RTMPStream::RTMPStream(BaseRTMPProtocol *pProtocol, 
    2526                StreamsManager *pStreamsManager, uint32_t rtmpStreamId) 
    2627: BaseStream(pProtocol, pStreamsManager, ST_NEUTRAL_RTMP, "") { 
Note: See TracChangeset for help on using the changeset viewer.