zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace VideoLayerFrameId with int64_t.

Browse Source 
Bug: webrtc:12206
Change-Id: I7e141806e417c4d98ce795d898f0d820e482113e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/207860
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33280}
This commit is contained in:
philipel
2021-02-16 11:13:25 +01:00
committed by Commit Bot
parent bdf78cb5bb
commit d6c81dbc20
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/video/encoded_frame.h
View File

@ -19,11 +19,6 @@
namespace webrtc {
namespace video_coding {
// TODO(bugs.webrtc.org/12206): Remove when downstream has been updated.
struct VideoLayerFrameId {
int64_t picture_id = -1;
};
// 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.
@ -48,12 +43,8 @@ class EncodedFrame : public webrtc::VCMEncodedFrame {
bool is_keyframe() const { return num_references == 0; }
// TODO(bugs.webrtc.org/12206): Replace with private int64_t when downstream
// has been updated.
VideoLayerFrameId id;
void SetId(int64_t frame_id) { id.picture_id = frame_id; }
int64_t Id() const { return id.picture_id; }
void SetId(int64_t id) { id_ = id; }
int64_t Id() const { return id_; }
// TODO(philipel): Add simple modify/access functions to prevent adding too
// many |references|.
@ -62,6 +53,11 @@ class EncodedFrame : public webrtc::VCMEncodedFrame {
// 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;
private:
// The ID of the frame is determined from RTP level information. The IDs are
// used to describe order and dependencies between frames.
int64_t id_ = -1;
};
} // namespace video_coding

4
api/video/video_stream_decoder.h
View File

@ -38,10 +38,6 @@ class VideoStreamDecoderInterface {
// Called when the VideoStreamDecoder enters a non-decodable state.
virtual void OnNonDecodableState() = 0;
// TODO(bugs.webrtc.org/12206): Remove when downstream has been updated.
virtual void OnContinuousUntil(const video_coding::VideoLayerFrameId& key) {
}
virtual void OnContinuousUntil(int64_t frame_id) {}
virtual void OnDecodedFrame(VideoFrame frame,