Commit f831eeac authored by Miguel Casas's avatar Miguel Casas Committed by Commit Bot

cleanup: Replace "video" trace category with "media"

There's only a few instances of "video" as TRACE_EVENT category [1],
so it doesn't have a strong reason to exist. This CL folds them back
into "media"

sed -i -e 's/"video"/"media"/'  `grep -rn 'TRACE_EVENT.("video"' media/ content/ | cut -d: -f1 | uniq`

[1] https://cs.chromium.org/search/?q=TRACE_EVENT.%5C(%22video%22&sq=package:chromium&type=cs

Change-Id: Id2a164986d0cbabd465ba69b59b365668ac80777
Reviewed-on: https://chromium-review.googlesource.com/922401Reviewed-by: default avatarYuri Wiitala <miu@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537553}
parent 0b1d2235
...@@ -126,7 +126,7 @@ void PpFrameWriter::StopSourceImpl() { ...@@ -126,7 +126,7 @@ void PpFrameWriter::StopSourceImpl() {
void PpFrameWriter::PutFrame(PPB_ImageData_Impl* image_data, void PpFrameWriter::PutFrame(PPB_ImageData_Impl* image_data,
int64_t time_stamp_ns) { int64_t time_stamp_ns) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
TRACE_EVENT0("video", "PpFrameWriter::PutFrame"); TRACE_EVENT0("media", "PpFrameWriter::PutFrame");
DVLOG(3) << "PpFrameWriter::PutFrame()"; DVLOG(3) << "PpFrameWriter::PutFrame()";
if (!image_data) { if (!image_data) {
......
...@@ -50,7 +50,7 @@ class PpFrameReceiver : public MediaStreamVideoSink { ...@@ -50,7 +50,7 @@ class PpFrameReceiver : public MediaStreamVideoSink {
void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame, void OnVideoFrame(const scoped_refptr<media::VideoFrame>& frame,
base::TimeTicks estimated_capture_time) { base::TimeTicks estimated_capture_time) {
TRACE_EVENT0("video", "PpFrameReceiver::OnVideoFrame"); TRACE_EVENT0("media", "PpFrameReceiver::OnVideoFrame");
if (reader_) if (reader_)
reader_->GotFrame(frame); reader_->GotFrame(frame);
} }
......
...@@ -597,7 +597,7 @@ void VideoTrackAdapter::DeliverFrameOnIO( ...@@ -597,7 +597,7 @@ void VideoTrackAdapter::DeliverFrameOnIO(
const scoped_refptr<media::VideoFrame>& frame, const scoped_refptr<media::VideoFrame>& frame,
base::TimeTicks estimated_capture_time) { base::TimeTicks estimated_capture_time) {
DCHECK(io_task_runner_->BelongsToCurrentThread()); DCHECK(io_task_runner_->BelongsToCurrentThread());
TRACE_EVENT0("video", "VideoTrackAdapter::DeliverFrameOnIO"); TRACE_EVENT0("media", "VideoTrackAdapter::DeliverFrameOnIO");
++frame_counter_; ++frame_counter_;
bool is_device_rotated = false; bool is_device_rotated = false;
......
...@@ -43,7 +43,7 @@ WebRtcVideoCapturerAdapter::~WebRtcVideoCapturerAdapter() { ...@@ -43,7 +43,7 @@ WebRtcVideoCapturerAdapter::~WebRtcVideoCapturerAdapter() {
void WebRtcVideoCapturerAdapter::OnFrameCaptured( void WebRtcVideoCapturerAdapter::OnFrameCaptured(
const scoped_refptr<media::VideoFrame>& input_frame) { const scoped_refptr<media::VideoFrame>& input_frame) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
TRACE_EVENT0("video", "WebRtcVideoCapturerAdapter::OnFrameCaptured"); TRACE_EVENT0("media", "WebRtcVideoCapturerAdapter::OnFrameCaptured");
if (!(input_frame->IsMappable() && if (!(input_frame->IsMappable() &&
(input_frame->format() == media::PIXEL_FORMAT_I420 || (input_frame->format() == media::PIXEL_FORMAT_I420 ||
input_frame->format() == media::PIXEL_FORMAT_I420A)) && input_frame->format() == media::PIXEL_FORMAT_I420A)) &&
......
...@@ -118,7 +118,7 @@ void HtmlVideoElementCapturerSource::StopCapture() { ...@@ -118,7 +118,7 @@ void HtmlVideoElementCapturerSource::StopCapture() {
void HtmlVideoElementCapturerSource::sendNewFrame() { void HtmlVideoElementCapturerSource::sendNewFrame() {
DVLOG(3) << __func__; DVLOG(3) << __func__;
TRACE_EVENT0("video", "HtmlVideoElementCapturerSource::sendNewFrame"); TRACE_EVENT0("media", "HtmlVideoElementCapturerSource::sendNewFrame");
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
if (!web_media_player_ || new_frame_callback_.is_null()) if (!web_media_player_ || new_frame_callback_.is_null())
......
...@@ -54,7 +54,7 @@ H264Encoder::~H264Encoder() { ...@@ -54,7 +54,7 @@ H264Encoder::~H264Encoder() {
void H264Encoder::EncodeOnEncodingTaskRunner( void H264Encoder::EncodeOnEncodingTaskRunner(
scoped_refptr<VideoFrame> frame, scoped_refptr<VideoFrame> frame,
base::TimeTicks capture_timestamp) { base::TimeTicks capture_timestamp) {
TRACE_EVENT0("video", "H264Encoder::EncodeOnEncodingTaskRunner"); TRACE_EVENT0("media", "H264Encoder::EncodeOnEncodingTaskRunner");
DCHECK(encoding_task_runner_->BelongsToCurrentThread()); DCHECK(encoding_task_runner_->BelongsToCurrentThread());
const gfx::Size frame_size = frame->visible_rect().size(); const gfx::Size frame_size = frame->visible_rect().size();
...@@ -112,7 +112,7 @@ void H264Encoder::EncodeOnEncodingTaskRunner( ...@@ -112,7 +112,7 @@ void H264Encoder::EncodeOnEncodingTaskRunner(
} }
void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) { void H264Encoder::ConfigureEncoderOnEncodingTaskRunner(const gfx::Size& size) {
TRACE_EVENT0("video", "H264Encoder::ConfigureEncoderOnEncodingTaskRunner"); TRACE_EVENT0("media", "H264Encoder::ConfigureEncoderOnEncodingTaskRunner");
DCHECK(encoding_task_runner_->BelongsToCurrentThread()); DCHECK(encoding_task_runner_->BelongsToCurrentThread());
ISVCEncoder* temp_encoder = nullptr; ISVCEncoder* temp_encoder = nullptr;
if (WelsCreateSVCEncoder(&temp_encoder) != 0) { if (WelsCreateSVCEncoder(&temp_encoder) != 0) {
......
...@@ -69,7 +69,7 @@ bool VpxEncoder::CanEncodeAlphaChannel() { ...@@ -69,7 +69,7 @@ bool VpxEncoder::CanEncodeAlphaChannel() {
void VpxEncoder::EncodeOnEncodingTaskRunner(scoped_refptr<VideoFrame> frame, void VpxEncoder::EncodeOnEncodingTaskRunner(scoped_refptr<VideoFrame> frame,
base::TimeTicks capture_timestamp) { base::TimeTicks capture_timestamp) {
TRACE_EVENT0("video", "VpxEncoder::EncodeOnEncodingTaskRunner"); TRACE_EVENT0("media", "VpxEncoder::EncodeOnEncodingTaskRunner");
DCHECK(encoding_task_runner_->BelongsToCurrentThread()); DCHECK(encoding_task_runner_->BelongsToCurrentThread());
const gfx::Size frame_size = frame->visible_rect().size(); const gfx::Size frame_size = frame->visible_rect().size();
......
...@@ -104,7 +104,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( ...@@ -104,7 +104,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
base::TimeTicks reference_time, base::TimeTicks reference_time,
base::TimeDelta timestamp, base::TimeDelta timestamp,
int frame_feedback_id) { int frame_feedback_id) {
TRACE_EVENT0("video", "VideoCaptureDeviceClient::OnIncomingCapturedData"); TRACE_EVENT0("media", "VideoCaptureDeviceClient::OnIncomingCapturedData");
DCHECK_EQ(VideoPixelStorage::CPU, format.pixel_storage); DCHECK_EQ(VideoPixelStorage::CPU, format.pixel_storage);
if (last_captured_pixel_format_ != format.pixel_format) { if (last_captured_pixel_format_ != format.pixel_format) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment