Update talk to 50918584.
Together with Stefan's http://review.webrtc.org/1960004/. R=mallinath@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2048004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4556 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -30,6 +30,7 @@
|
||||
|
||||
namespace webrtc
|
||||
{
|
||||
class RTPPayloadRegistry;
|
||||
class RtpDump;
|
||||
|
||||
// Send Side - Packetization callback - send an encoded frame to the VCMReceiver
|
||||
@ -60,7 +61,7 @@ public:
|
||||
// Return encode complete (true/false)
|
||||
bool EncodeComplete();
|
||||
// Inform callback of codec used
|
||||
void SetCodecType(RTPVideoCodecTypes codecType)
|
||||
void SetCodecType(RtpVideoCodecTypes codecType)
|
||||
{_codecType = codecType;}
|
||||
// Inform callback of frame dimensions
|
||||
void SetFrameDimensions(int32_t width, int32_t height)
|
||||
@ -83,7 +84,7 @@ private:
|
||||
bool _encodeComplete;
|
||||
int32_t _width;
|
||||
int32_t _height;
|
||||
RTPVideoCodecTypes _codecType;
|
||||
RtpVideoCodecTypes _codecType;
|
||||
|
||||
}; // end of VCMEncodeCompleteCallback
|
||||
|
||||
@ -114,7 +115,7 @@ public:
|
||||
// Return encode complete (true/false)
|
||||
bool EncodeComplete();
|
||||
// Inform callback of codec used
|
||||
void SetCodecType(RTPVideoCodecTypes codecType)
|
||||
void SetCodecType(RtpVideoCodecTypes codecType)
|
||||
{_codecType = codecType;}
|
||||
|
||||
// Inform callback of frame dimensions
|
||||
@ -131,7 +132,7 @@ private:
|
||||
RtpRtcp* _RTPModule;
|
||||
int16_t _width;
|
||||
int16_t _height;
|
||||
RTPVideoCodecTypes _codecType;
|
||||
RtpVideoCodecTypes _codecType;
|
||||
}; // end of VCMEncodeCompleteCallback
|
||||
|
||||
// Decode Complete callback
|
||||
@ -189,6 +190,8 @@ protected:
|
||||
|
||||
Clock* _clock;
|
||||
uint32_t _sendCount;
|
||||
RTPPayloadRegistry* rtp_payload_registry_;
|
||||
RtpReceiver* rtp_receiver_;
|
||||
RtpRtcp* _rtp;
|
||||
double _lossPct;
|
||||
double _burstLength;
|
||||
|
||||
Reference in New Issue
Block a user