mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 23:30:48 +01:00
5546aef682
- Enable vp9 flexible mode in VideoEngine if 3 spatial layers are set. - Enable flexible mode in loopback tools and quality tests. - Reset first active spatial layer on keyframe in encoder. - Ensure duplicate references are not set by the sender in video header. - Set references manually for flexible mode in vp9 encoder. - Delay new activated layers until next base layer frame. - On receive side put each spatial layer as a separate frame to FrameBuffer and return several frames combined from FrameBuffer. Bug: webrtc:10049,webrtc:9794,webrtc:9784 Change-Id: I01e69f134cc145deba666ccc92deb1d37a324ede Reviewed-on: https://webrtc-review.googlesource.com/c/112289 Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Reviewed-by: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25895}
90 lines
3 KiB
C++
90 lines
3 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"
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.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() {}
|
|
|
|
// 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;
|
|
|
|
bool is_keyframe() const { return num_references == 0; }
|
|
|
|
VideoLayerFrameId id;
|
|
|
|
// 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;
|
|
// Is this subframe the last one in the superframe (In RTP stream that would
|
|
// mean that the last packet has a marker bit set).
|
|
bool is_last_spatial_layer = true;
|
|
};
|
|
|
|
} // namespace video_coding
|
|
} // namespace webrtc
|
|
|
|
#endif // API_VIDEO_ENCODED_FRAME_H_
|