52f53d5419
This reverts commit f34d467b03da4f20a1d036a20966fcad43d2433f. Reason for revert: Seems to break downstream project. Original change's description: > Add Timestamp accessor methods to the EncodedImage class. > > Bug: webrtc:9378 > Change-Id: I59bf14f631f92f0f4e05f60d4af25641a23a53f9 > Reviewed-on: https://webrtc-review.googlesource.com/82100 > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Philip Eliasson <philipel@webrtc.org> > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Commit-Queue: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23734} TBR=brandtr@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,philipel@webrtc.org Change-Id: I3aa0c0119426886bc583c918aae862eb7f4b6b63 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9378 Reviewed-on: https://webrtc-review.googlesource.com/85600 Reviewed-by: Björn Terelius <terelius@webrtc.org> Commit-Queue: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23739}
94 lines
3.1 KiB
C++
94 lines
3.1 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef API_VIDEO_ENCODED_FRAME_H_
|
|
#define API_VIDEO_ENCODED_FRAME_H_
|
|
|
|
#include "modules/video_coding/encoded_frame.h"
|
|
|
|
namespace webrtc {
|
|
namespace video_coding {
|
|
|
|
// NOTE: This class is still under development and may change without notice.
|
|
struct VideoLayerFrameId {
|
|
// TODO(philipel): The default ctor is currently used internaly, but have a
|
|
// look if we can remove it.
|
|
VideoLayerFrameId() : picture_id(-1), spatial_layer(0) {}
|
|
VideoLayerFrameId(int64_t picture_id, uint8_t spatial_layer)
|
|
: picture_id(picture_id), spatial_layer(spatial_layer) {}
|
|
|
|
bool operator==(const VideoLayerFrameId& rhs) const {
|
|
return picture_id == rhs.picture_id && spatial_layer == rhs.spatial_layer;
|
|
}
|
|
|
|
bool operator!=(const VideoLayerFrameId& rhs) const {
|
|
return !(*this == rhs);
|
|
}
|
|
|
|
bool operator<(const VideoLayerFrameId& rhs) const {
|
|
if (picture_id == rhs.picture_id)
|
|
return spatial_layer < rhs.spatial_layer;
|
|
return picture_id < rhs.picture_id;
|
|
}
|
|
|
|
bool operator<=(const VideoLayerFrameId& rhs) const { return !(rhs < *this); }
|
|
bool operator>(const VideoLayerFrameId& rhs) const { return rhs < *this; }
|
|
bool operator>=(const VideoLayerFrameId& rhs) const { return rhs <= *this; }
|
|
|
|
int64_t picture_id;
|
|
uint8_t spatial_layer;
|
|
};
|
|
|
|
// TODO(philipel): Remove webrtc::VCMEncodedFrame inheritance.
|
|
// TODO(philipel): Move transport specific info out of EncodedFrame.
|
|
// NOTE: This class is still under development and may change without notice.
|
|
class EncodedFrame : public webrtc::VCMEncodedFrame {
|
|
public:
|
|
static const uint8_t kMaxFrameReferences = 5;
|
|
|
|
EncodedFrame() = default;
|
|
virtual ~EncodedFrame() {}
|
|
|
|
virtual bool GetBitstream(uint8_t* destination) const = 0;
|
|
|
|
// The capture timestamp of this frame, using the 90 kHz RTP clock.
|
|
virtual uint32_t Timestamp() const;
|
|
virtual void SetTimestamp(uint32_t rtp_timestamp);
|
|
|
|
// When this frame was received.
|
|
virtual int64_t ReceivedTime() const = 0;
|
|
|
|
// When this frame should be rendered.
|
|
virtual int64_t RenderTime() const = 0;
|
|
|
|
// 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;
|
|
|
|
size_t size() const { return _length; }
|
|
|
|
bool is_keyframe() const { return num_references == 0; }
|
|
|
|
VideoLayerFrameId id;
|
|
uint32_t timestamp = 0;
|
|
|
|
// TODO(philipel): Add simple modify/access functions to prevent adding too
|
|
// many |references|.
|
|
size_t num_references = 0;
|
|
int64_t references[kMaxFrameReferences];
|
|
bool inter_layer_predicted = false;
|
|
};
|
|
|
|
} // namespace video_coding
|
|
} // namespace webrtc
|
|
|
|
#endif // API_VIDEO_ENCODED_FRAME_H_
|