admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use common VideoFrameTypeToString helper

Browse Source 
This CL cleans up all local conversions, in favor of the common helper
function.

Bug: webrtc:15210
Change-Id: Id77e1c6b1151a2542d92e220e91d5b11285479b8
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/311060
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Jianhui J Dai <jianhui.j.dai@intel.com>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40420}
This commit is contained in:
Jianhui Dai 2023-06-30 09:57:02 +08:00 committed by WebRTC LUCI CQ
parent 4200233adc
commit 32a8169a65
4 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/video/BUILD.gn
View File

@ -126,6 +126,7 @@ rtc_source_set("video_frame_type") {
visibility = [ "*" ]
sources = [ "video_frame_type.h" ]
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
deps = [ "../../rtc_base:checks" ]
}
rtc_source_set("render_resolution") {

17
api/video/video_frame_type.h
View File

@ -12,6 +12,7 @@
#define API_VIDEO_VIDEO_FRAME_TYPE_H_
#include "absl/strings/string_view.h"
#include "rtc_base/checks.h"
namespace webrtc {
@ -25,15 +26,15 @@ enum class VideoFrameType {
inline constexpr absl::string_view VideoFrameTypeToString(
VideoFrameType frame_type) {
if (frame_type == VideoFrameType::kEmptyFrame) {
return "empty";
}
if (frame_type == VideoFrameType::kVideoFrameKey) {
return "key";
}
if (frame_type == VideoFrameType::kVideoFrameDelta) {
return "delta";
switch (frame_type) {
case VideoFrameType::kEmptyFrame:
return "empty";
case VideoFrameType::kVideoFrameKey:
return "key";
case VideoFrameType::kVideoFrameDelta:
return "delta";
}
RTC_CHECK_NOTREACHED();
return "";
}

19
modules/rtp_rtcp/source/rtp_sender_video.cc
View File

@ -94,20 +94,6 @@ bool IsBaseLayer(const RTPVideoHeader& video_header) {
return true;
}
[[maybe_unused]] const char* FrameTypeToString(VideoFrameType frame_type) {
switch (frame_type) {
case VideoFrameType::kEmptyFrame:
return "empty";
case VideoFrameType::kVideoFrameKey:
return "video_key";
case VideoFrameType::kVideoFrameDelta:
return "video_delta";
default:
RTC_DCHECK_NOTREACHED();
return "";
}
}
bool IsNoopDelay(const VideoPlayoutDelay& delay) {
return delay.min_ms == -1 && delay.max_ms == -1;
}
@ -491,8 +477,9 @@ bool RTPSenderVideo::SendVideo(
RTPVideoHeader video_header,
absl::optional<int64_t> expected_retransmission_time_ms,
std::vector<uint32_t> csrcs) {
TRACE_EVENT_ASYNC_STEP1("webrtc", "Video", capture_time_ms, "Send", "type",
FrameTypeToString(video_header.frame_type));
TRACE_EVENT_ASYNC_STEP1(
"webrtc", "Video", capture_time_ms, "Send", "type",
std::string(VideoFrameTypeToString(video_header.frame_type)));
RTC_CHECK_RUNS_SERIALIZED(&send_checker_);
if (video_header.frame_type == VideoFrameType::kEmptyFrame)

15
rtc_tools/video_encoder/video_encoder.cc
View File

@ -69,19 +69,6 @@ namespace {
// See `WebRtcVideoSendChannel::kDefaultQpMax`.
constexpr unsigned int kDefaultQpMax = 56;
const char* FrameTypeToString(const VideoFrameType& frame_type) {
switch (frame_type) {
case VideoFrameType::kEmptyFrame:
return "empty";
case VideoFrameType::kVideoFrameKey:
return "key";
case VideoFrameType::kVideoFrameDelta:
return "delta";
}
RTC_CHECK_NOTREACHED();
return "";
}
[[maybe_unused]] const char* InterLayerPredModeToString(
const InterLayerPredMode& inter_layer_pred_mode) {
switch (inter_layer_pred_mode) {
@ -100,7 +87,7 @@ std::string ToString(const EncodedImage& encoded_image) {
char buffer[1024];
rtc::SimpleStringBuilder ss(buffer);
ss << FrameTypeToString(encoded_image._frameType)
ss << VideoFrameTypeToString(encoded_image._frameType)
<< ", size=" << encoded_image.size() << ", qp=" << encoded_image.qp_
<< ", timestamp=" << encoded_image.Timestamp();