Move RtpFrameObject and EncodedFrame out of video_coding namespace.
Bug: webrtc:12579 Change-Id: Ib7ecd624eb5c54abb77fe08440a014aa1e963865 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/212860 Reviewed-by: Erik Språng <sprang@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33542}
This commit is contained in:
@ -26,7 +26,6 @@ using ::testing::Property;
|
||||
using ::testing::UnorderedElementsAreArray;
|
||||
|
||||
namespace webrtc {
|
||||
namespace video_coding {
|
||||
|
||||
namespace {
|
||||
class Frame {
|
||||
@ -83,7 +82,7 @@ class Frame {
|
||||
return *this;
|
||||
}
|
||||
|
||||
operator std::unique_ptr<video_coding::RtpFrameObject>() {
|
||||
operator std::unique_ptr<RtpFrameObject>() {
|
||||
RTPVideoHeaderVP9 vp9_header{};
|
||||
vp9_header.picture_id = *picture_id;
|
||||
vp9_header.temporal_idx = *temporal_id;
|
||||
@ -112,7 +111,7 @@ class Frame {
|
||||
: VideoFrameType::kVideoFrameDelta;
|
||||
video_header.video_type_header = vp9_header;
|
||||
// clang-format off
|
||||
return std::make_unique<video_coding::RtpFrameObject>(
|
||||
return std::make_unique<RtpFrameObject>(
|
||||
seq_num_start,
|
||||
seq_num_end,
|
||||
/*markerBit=*/true,
|
||||
@ -209,7 +208,7 @@ class RtpVp9RefFinderTest : public ::testing::Test {
|
||||
protected:
|
||||
RtpVp9RefFinderTest() : ref_finder_(std::make_unique<RtpVp9RefFinder>()) {}
|
||||
|
||||
void Insert(std::unique_ptr<video_coding::RtpFrameObject> frame) {
|
||||
void Insert(std::unique_ptr<RtpFrameObject> frame) {
|
||||
for (auto& f : ref_finder_->ManageFrame(std::move(frame))) {
|
||||
frames_.push_back(std::move(f));
|
||||
}
|
||||
@ -703,5 +702,4 @@ TEST_F(RtpVp9RefFinderTest, SpatialIndex) {
|
||||
Contains(Pointee(Property(&EncodedFrame::SpatialIndex, 2))));
|
||||
}
|
||||
|
||||
} // namespace video_coding
|
||||
} // namespace webrtc
|
||||
|
||||
Reference in New Issue
Block a user