
This reverts commit c9a2c5e93aa51606916e6728454bcff26bb75f79. Reason for revert: Breaks downstream test Original change's description: > Reland "Copy video frames metadata between encoded and plain frames in one place" > > Reland with fixes: Do not remove extra metadata copies in software decoders as some downstream projects assumes these fields are copied by the encoders. > > Currently some video frames metadata like rotation or ntp timestamps are > copied in every encoder and decoder separately. This CL makes copying to > happen at a single place for send or receive side. This will make it > easier to add new metadata in the future. > > Also, added some missing tests. > > Original Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133346 > > Bug: webrtc:10460 > Change-Id: I8e49589bf75f406e2b5ddee34882de0faedbd09a > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134102 > Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> > Reviewed-by: Johannes Kron <kron@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#27756} TBR=ilnik@webrtc.org,sprang@webrtc.org,kron@webrtc.org,artit@webrtc.org Change-Id: I34cc563ec6383735c2a76a6f45a72a7726b74421 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10460 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134204 Reviewed-by: Artem Titarenko <artit@google.com> Commit-Queue: Artem Titarenko <artit@google.com> Cr-Commit-Position: refs/heads/master@{#27765}
136 lines
3.8 KiB
C++
136 lines
3.8 KiB
C++
/*
|
|
* Copyright (c) 2011 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 MODULES_VIDEO_CODING_ENCODED_FRAME_H_
|
|
#define MODULES_VIDEO_CODING_ENCODED_FRAME_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "api/video/encoded_image.h"
|
|
#include "modules/include/module_common_types.h"
|
|
#include "modules/video_coding/include/video_codec_interface.h"
|
|
#include "modules/video_coding/include/video_coding_defines.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VCMEncodedFrame : protected EncodedImage {
|
|
public:
|
|
VCMEncodedFrame();
|
|
VCMEncodedFrame(const VCMEncodedFrame&) = delete;
|
|
|
|
~VCMEncodedFrame();
|
|
/**
|
|
* Set render time in milliseconds
|
|
*/
|
|
void SetRenderTime(const int64_t renderTimeMs) {
|
|
_renderTimeMs = renderTimeMs;
|
|
}
|
|
|
|
/**
|
|
* Set the encoded frame size
|
|
*/
|
|
void SetEncodedSize(uint32_t width, uint32_t height) {
|
|
_encodedWidth = width;
|
|
_encodedHeight = height;
|
|
}
|
|
|
|
void SetPlayoutDelay(PlayoutDelay playout_delay) {
|
|
playout_delay_ = playout_delay;
|
|
}
|
|
|
|
/**
|
|
* Get the encoded image
|
|
*/
|
|
const webrtc::EncodedImage& EncodedImage() const {
|
|
return static_cast<const webrtc::EncodedImage&>(*this);
|
|
}
|
|
|
|
using EncodedImage::data;
|
|
using EncodedImage::set_size;
|
|
using EncodedImage::SetSpatialIndex;
|
|
using EncodedImage::SetTimestamp;
|
|
using EncodedImage::size;
|
|
using EncodedImage::Timestamp;
|
|
|
|
/**
|
|
* Get render time in milliseconds
|
|
*/
|
|
int64_t RenderTimeMs() const { return _renderTimeMs; }
|
|
/**
|
|
* Get frame type
|
|
*/
|
|
webrtc::VideoFrameType FrameType() const { return _frameType; }
|
|
/**
|
|
* Get frame rotation
|
|
*/
|
|
VideoRotation rotation() const { return rotation_; }
|
|
/**
|
|
* Get video content type
|
|
*/
|
|
VideoContentType contentType() const { return content_type_; }
|
|
/**
|
|
* Get video timing
|
|
*/
|
|
EncodedImage::Timing video_timing() const { return timing_; }
|
|
EncodedImage::Timing* video_timing_mutable() { return &timing_; }
|
|
/**
|
|
* True if this frame is complete, false otherwise
|
|
*/
|
|
bool Complete() const { return _completeFrame; }
|
|
/**
|
|
* True if there's a frame missing before this frame
|
|
*/
|
|
bool MissingFrame() const { return _missingFrame; }
|
|
/**
|
|
* Payload type of the encoded payload
|
|
*/
|
|
uint8_t PayloadType() const { return _payloadType; }
|
|
/**
|
|
* Get codec specific info.
|
|
* The returned pointer is only valid as long as the VCMEncodedFrame
|
|
* is valid. Also, VCMEncodedFrame owns the pointer and will delete
|
|
* the object.
|
|
*/
|
|
const CodecSpecificInfo* CodecSpecific() const { return &_codecSpecificInfo; }
|
|
void SetCodecSpecific(const CodecSpecificInfo* codec_specific) {
|
|
_codecSpecificInfo = *codec_specific;
|
|
}
|
|
|
|
/**
|
|
* Verifies that current allocated buffer size is larger than or equal to the
|
|
* input size.
|
|
* If the current buffer size is smaller, a new allocation is made and the old
|
|
* buffer data
|
|
* is copied to the new buffer.
|
|
* Buffer size is updated to minimumSize.
|
|
*/
|
|
void VerifyAndAllocate(size_t minimumSize);
|
|
|
|
protected:
|
|
void Reset();
|
|
|
|
void CopyCodecSpecific(const RTPVideoHeader* header);
|
|
|
|
int64_t _renderTimeMs;
|
|
uint8_t _payloadType;
|
|
bool _missingFrame;
|
|
CodecSpecificInfo _codecSpecificInfo;
|
|
webrtc::VideoCodecType _codec;
|
|
|
|
// Video rotation is only set along with the last packet for each frame
|
|
// (same as marker bit). This |_rotation_set| is only for debugging purpose
|
|
// to ensure we don't set it twice for a frame.
|
|
bool _rotation_set;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_ENCODED_FRAME_H_
|