a64300af50
Also fixes a timer bug related to NACKing in the RTP module which could cause packets to only be NACKed twice if there's frequent packet losses. Note that I decided to remove any selective NACKing for now as I don't think the gain of doing it is big enough compared to the added complexity. The same reasoning for empty packets. None of them will be retransmitted by a smart sender since the sender would know that they aren't needed. BUG=1420 TEST=video_coding_unittests, vie_auto_test, video_coding_integrationtests, trybots Review URL: https://webrtc-codereview.appspot.com/1115006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3599 4adac7df-926f-26a2-2b94-8c16560cd09d
100 lines
3.2 KiB
C++
100 lines
3.2 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_
|
|
|
|
#include "modules/interface/module_common_types.h"
|
|
#include "modules/video_coding/main/source/encoded_frame.h"
|
|
#include "modules/video_coding/main/source/jitter_buffer_common.h"
|
|
#include "modules/video_coding/main/source/session_info.h"
|
|
#include "typedefs.h"
|
|
|
|
namespace webrtc
|
|
{
|
|
|
|
class VCMFrameBuffer : public VCMEncodedFrame
|
|
{
|
|
public:
|
|
VCMFrameBuffer();
|
|
virtual ~VCMFrameBuffer();
|
|
|
|
VCMFrameBuffer(VCMFrameBuffer& rhs);
|
|
|
|
virtual void Reset();
|
|
|
|
VCMFrameBufferEnum InsertPacket(const VCMPacket& packet,
|
|
WebRtc_Word64 timeInMs,
|
|
bool enableDecodableState,
|
|
WebRtc_UWord32 rttMs);
|
|
|
|
// State
|
|
// Get current state of frame
|
|
VCMFrameBufferStateEnum GetState() const;
|
|
// Get current state and timestamp of frame
|
|
VCMFrameBufferStateEnum GetState(WebRtc_UWord32& timeStamp) const;
|
|
void SetState(VCMFrameBufferStateEnum state); // Set state of frame
|
|
|
|
bool IsRetransmitted() const;
|
|
bool IsSessionComplete() const;
|
|
bool HaveLastPacket() const;
|
|
// Makes sure the session contain a decodable stream.
|
|
void MakeSessionDecodable();
|
|
|
|
// Sequence numbers
|
|
// Get lowest packet sequence number in frame
|
|
WebRtc_Word32 GetLowSeqNum() const;
|
|
// Get highest packet sequence number in frame
|
|
WebRtc_Word32 GetHighSeqNum() const;
|
|
|
|
int PictureId() const;
|
|
int TemporalId() const;
|
|
bool LayerSync() const;
|
|
int Tl0PicId() const;
|
|
bool NonReference() const;
|
|
|
|
// Set counted status (as counted by JB or not)
|
|
void SetCountedFrame(bool frameCounted);
|
|
bool GetCountedFrame() const;
|
|
|
|
// Increments a counter to keep track of the number of packets of this frame
|
|
// which were NACKed before they arrived.
|
|
void IncrementNackCount();
|
|
// Returns the number of packets of this frame which were NACKed before they
|
|
// arrived.
|
|
WebRtc_Word16 GetNackCount() const;
|
|
|
|
WebRtc_Word64 LatestPacketTimeMs() const;
|
|
|
|
webrtc::FrameType FrameType() const;
|
|
void SetPreviousFrameLoss();
|
|
|
|
WebRtc_Word32 ExtractFromStorage(const EncodedVideoData& frameFromStorage);
|
|
|
|
// The number of packets discarded because the decoder can't make use of
|
|
// them.
|
|
int NotDecodablePackets() const;
|
|
|
|
protected:
|
|
void RestructureFrameInformation();
|
|
void PrepareForDecode();
|
|
|
|
private:
|
|
VCMFrameBufferStateEnum _state; // Current state of the frame
|
|
bool _frameCounted; // Was this frame counted by JB?
|
|
VCMSessionInfo _sessionInfo;
|
|
WebRtc_UWord16 _nackCount;
|
|
WebRtc_Word64 _latestPacketTimeMs;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_VIDEO_CODING_FRAME_BUFFER_H_
|