Prepare for splitting FrameType into AudioFrameType and VideoFrameType
This cl deprecates the FrameType enum, and adds aliases AudioFrameType
and VideoFrameType.
After downstream usage is updated, the enums will be separated
and be moved out of common_types.h.
Bug: webrtc:6883
Change-Id: I2aaf660169da45f22574b4cbb16aea8522cc07a6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/123184
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27011}diff --git a/api/fec_controller.h b/api/fec_controller.h
index 59e86cc..6cc46dd 100644
--- a/api/fec_controller.h
+++ b/api/fec_controller.h
@@ -74,8 +74,9 @@
int64_t round_trip_time_ms) = 0;
// Informs of encoded output.
- virtual void UpdateWithEncodedData(size_t encoded_image_length,
- FrameType encoded_image_frametype) = 0;
+ virtual void UpdateWithEncodedData(
+ size_t encoded_image_length,
+ VideoFrameType encoded_image_frametype) = 0;
// Returns whether this FEC Controller needs Loss Vector Mask as input.
virtual bool UseLossVectorMask() = 0;
diff --git a/api/test/mock_video_encoder.h b/api/test/mock_video_encoder.h
index 62f17ba..15e3914 100644
--- a/api/test/mock_video_encoder.h
+++ b/api/test/mock_video_encoder.h
@@ -40,7 +40,7 @@
MOCK_METHOD3(Encode,
int32_t(const VideoFrame& inputImage,
const CodecSpecificInfo* codecSpecificInfo,
- const std::vector<FrameType>* frame_types));
+ const std::vector<VideoFrameType>* frame_types));
MOCK_METHOD1(RegisterEncodeCompleteCallback,
int32_t(EncodedImageCallback* callback));
MOCK_METHOD0(Release, int32_t());
diff --git a/api/test/videocodec_test_stats.h b/api/test/videocodec_test_stats.h
index 5de015f..c9eada3 100644
--- a/api/test/videocodec_test_stats.h
+++ b/api/test/videocodec_test_stats.h
@@ -43,7 +43,7 @@
size_t encode_time_us = 0;
size_t target_bitrate_kbps = 0;
size_t length_bytes = 0;
- webrtc::FrameType frame_type = kVideoFrameDelta;
+ webrtc::VideoFrameType frame_type = kVideoFrameDelta;
// Layering.
size_t spatial_idx = 0;
diff --git a/api/video/encoded_image.h b/api/video/encoded_image.h
index 1d3bd46..804e06b 100644
--- a/api/video/encoded_image.h
+++ b/api/video/encoded_image.h
@@ -115,7 +115,7 @@
// NTP time of the capture time in local timebase in milliseconds.
int64_t ntp_time_ms_ = 0;
int64_t capture_time_ms_ = 0;
- FrameType _frameType = kVideoFrameDelta;
+ VideoFrameType _frameType = kVideoFrameDelta;
VideoRotation rotation_ = kVideoRotation_0;
VideoContentType content_type_ = VideoContentType::UNSPECIFIED;
bool _completeFrame = false;
diff --git a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
index 9adcd77..ec861dd 100644
--- a/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
+++ b/api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc
@@ -95,7 +95,7 @@
}
int32_t Encode(const VideoFrame& frame,
const CodecSpecificInfo* codec_specific_info,
- const std::vector<FrameType>* frame_types) override {
+ const std::vector<VideoFrameType>* frame_types) override {
++encode_count_;
if (encode_complete_callback_ &&
encode_return_code_ == WEBRTC_VIDEO_CODEC_OK) {
@@ -181,7 +181,7 @@
rtc::scoped_refptr<I420Buffer> buffer =
I420Buffer::Create(codec_.width, codec_.height);
I420Buffer::SetBlack(buffer);
- std::vector<FrameType> types(1, kVideoFrameKey);
+ std::vector<VideoFrameType> types(1, kVideoFrameKey);
frame_ =
absl::make_unique<VideoFrame>(VideoFrame::Builder()
@@ -293,7 +293,7 @@
EXPECT_EQ(&callback2, fake_encoder_->encode_complete_callback_);
// Encoding a frame using the fallback should arrive at the new callback.
- std::vector<FrameType> types(1, kVideoFrameKey);
+ std::vector<VideoFrameType> types(1, kVideoFrameKey);
frame_->set_timestamp(frame_->timestamp() + 1000);
EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, fallback_wrapper_->Encode(*frame_, &types));
diff --git a/api/video_codecs/video_encoder.cc b/api/video_codecs/video_encoder.cc
index c28c181..a8b6f42 100644
--- a/api/video_codecs/video_encoder.cc
+++ b/api/video_codecs/video_encoder.cc
@@ -104,13 +104,13 @@
// Implementations of the interface must implement one or the other of these two
// methods.
int32_t VideoEncoder::Encode(const VideoFrame& frame,
- const std::vector<FrameType>* frame_types) {
+ const std::vector<VideoFrameType>* frame_types) {
return Encode(frame, nullptr, frame_types);
}
int32_t VideoEncoder::Encode(const VideoFrame& frame,
const CodecSpecificInfo* codec_specific_info,
- const std::vector<FrameType>* frame_types) {
+ const std::vector<VideoFrameType>* frame_types) {
return Encode(frame, frame_types);
}
diff --git a/api/video_codecs/video_encoder.h b/api/video_codecs/video_encoder.h
index 59dc55f..dc68928 100644
--- a/api/video_codecs/video_encoder.h
+++ b/api/video_codecs/video_encoder.h
@@ -242,12 +242,12 @@
// WEBRTC_VIDEO_CODEC_MEMORY
// WEBRTC_VIDEO_CODEC_ERROR
virtual int32_t Encode(const VideoFrame& frame,
- const std::vector<FrameType>* frame_types);
+ const std::vector<VideoFrameType>* frame_types);
// TODO(bugs.webrtc.org/10379): Deprecated. Delete, and make above method pure
// virtual, as soon as downstream applications are updated.
virtual int32_t Encode(const VideoFrame& frame,
const CodecSpecificInfo* codec_specific_info,
- const std::vector<FrameType>* frame_types);
+ const std::vector<VideoFrameType>* frame_types);
// Inform the encoder about the new target bit rate.
//
diff --git a/api/video_codecs/video_encoder_software_fallback_wrapper.cc b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
index c52262f..4360980 100644
--- a/api/video_codecs/video_encoder_software_fallback_wrapper.cc
+++ b/api/video_codecs/video_encoder_software_fallback_wrapper.cc
@@ -88,7 +88,7 @@
int32_t Release() override;
int32_t Encode(const VideoFrame& frame,
- const std::vector<FrameType>* frame_types) override;
+ const std::vector<VideoFrameType>* frame_types) override;
int32_t SetRateAllocation(const VideoBitrateAllocation& bitrate_allocation,
uint32_t framerate) override;
EncoderInfo GetEncoderInfo() const override;
@@ -252,7 +252,7 @@
int32_t VideoEncoderSoftwareFallbackWrapper::Encode(
const VideoFrame& frame,
- const std::vector<FrameType>* frame_types) {
+ const std::vector<VideoFrameType>* frame_types) {
if (use_fallback_encoder_)
return fallback_encoder_->Encode(frame, frame_types);
int32_t ret = encoder_->Encode(frame, frame_types);