mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 23:57:59 +01:00
1fccaa4485
This reverts commit8bf3210629. Reason for revert: Initialized an uninitialized member in GofInfoVP9 (+ removed some redundant initialization of members already initialized by SetGofInfoVP9()) Original change's description: > Revert "operator== for VideoFrameMetadata + used in CloneSenderVideoFrame test" > > This reverts commit437bf78ed9. > > Reason for revert: Breaks upstream project > > Original change's description: > > operator== for VideoFrameMetadata + used in CloneSenderVideoFrame test > > > > Added equality and inequality operators for VideoFrameMetadata and used the equality operator to check that the cloned metadata property is equal to the original metadata in RtpSenderVideoFrameTransformerDelegateTest.CloneSenderVideoFrame. > > > > Also default-initialized VideoFrameMetadata::ssrc_ to 0. > > > > Bug: webrtc:14708 > > Change-Id: If1f5153069bc986061ff9f0a6abaa2a4a5a98dd1 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/293560 > > Commit-Queue: Tove Petersson <tovep@google.com> > > Reviewed-by: Tony Herre <herre@google.com> > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#39411} > > Bug: webrtc:14708 > Change-Id: Icbec1b65ed22b89766606cb9514dde6f4e9124be > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/295500 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Andrey Logvin <landrey@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#39413} Bug: webrtc:14708 Change-Id: I843d29f7dd0da2c7f16968a7fc08dc02cd359fc1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/295520 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Tove Petersson <tovep@google.com> Cr-Commit-Position: refs/heads/main@{#39418}
64 lines
2.5 KiB
C++
64 lines
2.5 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.
|
|
*/
|
|
|
|
// This file contains codec dependent definitions that are needed in
|
|
// order to compile the WebRTC codebase, even if this codec is not used.
|
|
|
|
#ifndef MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_
|
|
#define MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_
|
|
|
|
#include "modules/video_coding/codecs/interface/common_constants.h"
|
|
|
|
namespace webrtc {
|
|
|
|
struct RTPVideoHeaderVP8 {
|
|
void InitRTPVideoHeaderVP8() {
|
|
nonReference = false;
|
|
pictureId = kNoPictureId;
|
|
tl0PicIdx = kNoTl0PicIdx;
|
|
temporalIdx = kNoTemporalIdx;
|
|
layerSync = false;
|
|
keyIdx = kNoKeyIdx;
|
|
partitionId = 0;
|
|
beginningOfPartition = false;
|
|
}
|
|
|
|
friend bool operator==(const RTPVideoHeaderVP8& lhs,
|
|
const RTPVideoHeaderVP8& rhs) {
|
|
return lhs.nonReference == rhs.nonReference &&
|
|
lhs.pictureId == rhs.pictureId && lhs.tl0PicIdx == rhs.tl0PicIdx &&
|
|
lhs.temporalIdx == rhs.temporalIdx &&
|
|
lhs.layerSync == rhs.layerSync && lhs.keyIdx == rhs.keyIdx &&
|
|
lhs.partitionId == rhs.partitionId &&
|
|
lhs.beginningOfPartition == rhs.beginningOfPartition;
|
|
}
|
|
|
|
friend bool operator!=(const RTPVideoHeaderVP8& lhs,
|
|
const RTPVideoHeaderVP8& rhs) {
|
|
return !(lhs == rhs);
|
|
}
|
|
|
|
bool nonReference; // Frame is discardable.
|
|
int16_t pictureId; // Picture ID index, 15 bits;
|
|
// kNoPictureId if PictureID does not exist.
|
|
int16_t tl0PicIdx; // TL0PIC_IDX, 8 bits;
|
|
// kNoTl0PicIdx means no value provided.
|
|
uint8_t temporalIdx; // Temporal layer index, or kNoTemporalIdx.
|
|
bool layerSync; // This frame is a layer sync frame.
|
|
// Disabled if temporalIdx == kNoTemporalIdx.
|
|
int keyIdx; // 5 bits; kNoKeyIdx means not used.
|
|
int partitionId; // VP8 partition ID
|
|
bool beginningOfPartition; // True if this packet is the first
|
|
// in a VP8 partition. Otherwise false
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_CODECS_VP8_INCLUDE_VP8_GLOBALS_H_
|