2016-04-01 02:01:54 -07:00
|
|
|
/*
|
|
|
|
|
* Copyright (c) 2016 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#ifndef MODULES_VIDEO_CODING_FRAME_OBJECT_H_
|
|
|
|
|
#define MODULES_VIDEO_CODING_FRAME_OBJECT_H_
|
2016-04-01 02:01:54 -07:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "api/optional.h"
|
2017-09-15 13:58:09 +02:00
|
|
|
#include "common_types.h" // NOLINT(build/include)
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/include/module_common_types.h"
|
|
|
|
|
#include "modules/video_coding/encoded_frame.h"
|
2016-04-01 02:01:54 -07:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
namespace video_coding {
|
|
|
|
|
|
2016-07-04 16:18:55 +02:00
|
|
|
class FrameObject : public webrtc::VCMEncodedFrame {
|
2016-04-01 02:01:54 -07:00
|
|
|
public:
|
2016-04-20 10:26:34 +02:00
|
|
|
static const uint8_t kMaxFrameReferences = 5;
|
|
|
|
|
|
2016-05-09 11:41:48 +02:00
|
|
|
FrameObject();
|
2016-07-11 08:46:29 -07:00
|
|
|
virtual ~FrameObject() {}
|
2016-05-09 11:41:48 +02:00
|
|
|
|
2016-04-01 02:01:54 -07:00
|
|
|
virtual bool GetBitstream(uint8_t* destination) const = 0;
|
2016-07-11 08:46:29 -07:00
|
|
|
|
|
|
|
|
// The capture timestamp of this frame.
|
|
|
|
|
virtual uint32_t Timestamp() const = 0;
|
|
|
|
|
|
|
|
|
|
// When this frame was received.
|
|
|
|
|
virtual int64_t ReceivedTime() const = 0;
|
|
|
|
|
|
|
|
|
|
// When this frame should be rendered.
|
|
|
|
|
virtual int64_t RenderTime() const = 0;
|
|
|
|
|
|
2017-01-25 08:56:23 -08:00
|
|
|
// This information is currently needed by the timing calculation class.
|
|
|
|
|
// TODO(philipel): Remove this function when a new timing class has
|
|
|
|
|
// been implemented.
|
|
|
|
|
virtual bool delayed_by_retransmission() const { return 0; }
|
|
|
|
|
|
2017-08-04 06:39:31 -07:00
|
|
|
size_t size() const { return _length; }
|
2016-04-20 10:26:34 +02:00
|
|
|
|
Reland of quest keyframes more frequently on stream start/decoding error. (patchset #1 id:1 of https://codereview.chromium.org/2995153002/ )
Reason for revert:
iOS workaround.
Original issue's description:
> Revert of quest keyframes more frequently on stream start/decoding error. (patchset #2 id:170001 of https://codereview.webrtc.org/2996823002/ )
>
> Reason for revert:
> Causes iOS H264 calls received in the background to have increased delay before being able to decode stream from sender due to not having a keyframe.
>
> Original issue's description:
> > Reland of quest keyframes more frequently on stream start/decoding error. (patchset #1 id:1 of https://codereview.chromium.org/2994043002/ )
> >
> > Reason for revert:
> > Create fix CL.
> >
> > Original issue's description:
> > > Revert of Request keyframes more frequently on stream start/decoding error. (patchset #1 id:1 of https://codereview.webrtc.org/2993793002/ )
> > >
> > > Reason for revert:
> > > Broke downstream test that was waiting for 5 keyframes to be received within 10 seconds. Maybe the issue is that "stats_callback_->OnCompleteFrame(frame->num_references == 0, ..." was changed to "frame->is_keyframe()"?
> > >
> > > Original issue's description:
> > > > Request keyframes more frequently on stream start/decoding error.
> > > >
> > > > In this CL:
> > > > - Added FrameObject::is_keyframe() convinience function.
> > > > - Moved logic to request keyframes on decoding error from VideoReceived to
> > > > VideoReceiveStream.
> > > > - Added keyframe_required as a parameter to FrameBuffer::NextFrame.
> > > >
> > > > BUG=webrtc:8074
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2993793002
> > > > Cr-Commit-Position: refs/heads/master@{#19280}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/26b48043581735eed6e36b95fae6f5b1bcf8cfb5
> > >
> > > TBR=terelius@webrtc.org,stefan@webrtc.org,noahric@chromium.org,philipel@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:8074
> > >
> > > Review-Url: https://codereview.webrtc.org/2994043002
> > > Cr-Commit-Position: refs/heads/master@{#19295}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/77a983185f57628cd5955bd2c0a1bf71c30439bb
> >
> > TBR=terelius@webrtc.org,stefan@webrtc.org,noahric@chromium.org,deadbeef@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > BUG=webrtc:8074
> >
> > Review-Url: https://codereview.webrtc.org/2996823002
> > Cr-Commit-Position: refs/heads/master@{#19324}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/628ac5964e32e66083a6ab14dceac6cb2cabe345
>
> TBR=terelius@webrtc.org,stefan@webrtc.org,noahric@chromium.org,deadbeef@webrtc.org,philipel@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:8074
>
> Review-Url: https://codereview.webrtc.org/2995153002
> Cr-Commit-Position: refs/heads/master@{#19392}
> Committed: https://chromium.googlesource.com/external/webrtc/+/53959fcc2ba580e7c87231708e5b4af7906f6836
TBR=terelius@webrtc.org,stefan@webrtc.org,noahric@chromium.org,deadbeef@webrtc.org,tkchin@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
BUG=webrtc:8074
Review-Url: https://codereview.webrtc.org/2996153003
Cr-Commit-Position: refs/heads/master@{#19410}
2017-08-18 04:55:02 -07:00
|
|
|
bool is_keyframe() const { return num_references == 0; }
|
|
|
|
|
|
2016-05-09 11:41:48 +02:00
|
|
|
// The tuple (|picture_id|, |spatial_layer|) uniquely identifies a frame
|
|
|
|
|
// object. For codec types that don't necessarily have picture ids they
|
|
|
|
|
// have to be constructed from the header data relevant to that codec.
|
2017-09-04 07:03:46 -07:00
|
|
|
int64_t picture_id;
|
2016-05-09 11:41:48 +02:00
|
|
|
uint8_t spatial_layer;
|
2016-05-19 12:19:35 +02:00
|
|
|
uint32_t timestamp;
|
2016-05-09 11:41:48 +02:00
|
|
|
|
2017-06-15 09:06:21 -07:00
|
|
|
// TODO(philipel): Add simple modify/access functions to prevent adding too
|
|
|
|
|
// many |references|.
|
2016-04-20 10:26:34 +02:00
|
|
|
size_t num_references;
|
2017-09-04 07:03:46 -07:00
|
|
|
int64_t references[kMaxFrameReferences];
|
2016-05-09 11:41:48 +02:00
|
|
|
bool inter_layer_predicted;
|
2016-04-01 02:01:54 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
class PacketBuffer;
|
|
|
|
|
|
|
|
|
|
class RtpFrameObject : public FrameObject {
|
|
|
|
|
public:
|
|
|
|
|
RtpFrameObject(PacketBuffer* packet_buffer,
|
2016-05-13 06:01:03 -07:00
|
|
|
uint16_t first_seq_num,
|
2016-05-24 10:20:47 +02:00
|
|
|
uint16_t last_seq_num,
|
|
|
|
|
size_t frame_size,
|
2016-07-11 08:46:29 -07:00
|
|
|
int times_nacked,
|
|
|
|
|
int64_t received_time);
|
2016-04-20 10:26:34 +02:00
|
|
|
|
2016-04-01 02:01:54 -07:00
|
|
|
~RtpFrameObject();
|
2016-04-20 10:26:34 +02:00
|
|
|
uint16_t first_seq_num() const;
|
|
|
|
|
uint16_t last_seq_num() const;
|
2016-05-24 10:20:47 +02:00
|
|
|
int times_nacked() const;
|
2016-07-04 16:18:55 +02:00
|
|
|
enum FrameType frame_type() const;
|
2016-05-13 06:01:03 -07:00
|
|
|
VideoCodecType codec_type() const;
|
2016-04-01 02:01:54 -07:00
|
|
|
bool GetBitstream(uint8_t* destination) const override;
|
2016-07-11 08:46:29 -07:00
|
|
|
uint32_t Timestamp() const override;
|
|
|
|
|
int64_t ReceivedTime() const override;
|
|
|
|
|
int64_t RenderTime() const override;
|
2017-01-25 08:56:23 -08:00
|
|
|
bool delayed_by_retransmission() const override;
|
2016-11-03 08:56:54 -07:00
|
|
|
rtc::Optional<RTPVideoTypeHeader> GetCodecHeader() const;
|
2016-04-01 02:01:54 -07:00
|
|
|
|
|
|
|
|
private:
|
2016-08-11 15:09:26 +02:00
|
|
|
rtc::scoped_refptr<PacketBuffer> packet_buffer_;
|
2016-07-04 16:18:55 +02:00
|
|
|
enum FrameType frame_type_;
|
2016-05-13 06:01:03 -07:00
|
|
|
VideoCodecType codec_type_;
|
|
|
|
|
uint16_t first_seq_num_;
|
|
|
|
|
uint16_t last_seq_num_;
|
2016-07-11 08:46:29 -07:00
|
|
|
uint32_t timestamp_;
|
|
|
|
|
int64_t received_time_;
|
2016-05-24 10:20:47 +02:00
|
|
|
|
|
|
|
|
// Equal to times nacked of the packet with the highet times nacked
|
|
|
|
|
// belonging to this frame.
|
|
|
|
|
int times_nacked_;
|
2016-04-01 02:01:54 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
} // namespace video_coding
|
|
|
|
|
} // namespace webrtc
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#endif // MODULES_VIDEO_CODING_FRAME_OBJECT_H_
|