diff options
author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 04:51:23 +0000 |
---|---|---|
committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 04:51:23 +0000 |
commit | cbcc6c1ee96bd8dcb980dce4ad89f6f7575f73cb (patch) | |
tree | aa647e46e4c6de4ddbb938e3cd9e614bef5553a7 /content | |
parent | 007cdc1f6ac88ae7cca165a6e33fc5ffb1417667 (diff) | |
download | chromium_src-cbcc6c1ee96bd8dcb980dce4ad89f6f7575f73cb.zip chromium_src-cbcc6c1ee96bd8dcb980dce4ad89f6f7575f73cb.tar.gz chromium_src-cbcc6c1ee96bd8dcb980dce4ad89f6f7575f73cb.tar.bz2 |
Rename VideoFrame::{Get,Set}Timestamp() to {set_}timestamp().
Makes the naming consistent with AudioBuffer, which is helpful now that DecoderStream<T> enforces API consistency.
TBR=dmichael
Review URL: https://codereview.chromium.org/229453004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
7 files changed, 12 insertions, 12 deletions
diff --git a/content/renderer/media/rtc_video_renderer.cc b/content/renderer/media/rtc_video_renderer.cc index 2003862..26cff0d 100644 --- a/content/renderer/media/rtc_video_renderer.cc +++ b/content/renderer/media/rtc_video_renderer.cc @@ -91,7 +91,7 @@ void RTCVideoRenderer::OnVideoFrame( "OnVideoFrame", TRACE_EVENT_SCOPE_THREAD, "timestamp", - frame->GetTimestamp().InMilliseconds()); + frame->timestamp().InMilliseconds()); repaint_cb_.Run(frame); } diff --git a/content/renderer/media/video_source_handler_unittest.cc b/content/renderer/media/video_source_handler_unittest.cc index d5ffa03..59b803d 100644 --- a/content/renderer/media/video_source_handler_unittest.cc +++ b/content/renderer/media/video_source_handler_unittest.cc @@ -64,7 +64,7 @@ TEST_F(VideoSourceHandlerTest, OpenClose) { // A new frame is captured. scoped_refptr<media::VideoFrame> captured_frame = media::VideoFrame::CreateBlackFrame(gfx::Size(width, height)); - captured_frame->SetTimestamp(ts); + captured_frame->set_timestamp(ts); // The frame is delivered to VideoSourceHandler. MediaStreamVideoSink* receiver = handler_->GetReceiver(&reader); @@ -75,7 +75,7 @@ TEST_F(VideoSourceHandlerTest, OpenClose) { ASSERT_TRUE(frame != NULL); EXPECT_EQ(width, frame->coded_size().width()); EXPECT_EQ(height, frame->coded_size().height()); - EXPECT_EQ(ts, frame->GetTimestamp()); + EXPECT_EQ(ts, frame->timestamp()); EXPECT_EQ(captured_frame->data(media::VideoFrame::kYPlane), frame->data(media::VideoFrame::kYPlane)); diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc index c5a630b..6533bd0 100644 --- a/content/renderer/media/webmediaplayer_ms.cc +++ b/content/renderer/media/webmediaplayer_ms.cc @@ -48,7 +48,7 @@ scoped_refptr<media::VideoFrame> CopyFrameToYV12( frame->coded_size(), frame->visible_rect(), frame->natural_size(), - frame->GetTimestamp()); + frame->timestamp()); if (frame->format() == media::VideoFrame::NATIVE_TEXTURE) { SkBitmap bitmap; @@ -427,7 +427,7 @@ void WebMediaPlayerMS::OnFrameAvailable( if (!sequence_started_) { sequence_started_ = true; - start_time_ = frame->GetTimestamp(); + start_time_ = frame->timestamp(); } bool size_changed = !current_frame_.get() || current_frame_->natural_size() != frame->natural_size(); @@ -437,7 +437,7 @@ void WebMediaPlayerMS::OnFrameAvailable( if (!current_frame_used_ && current_frame_.get()) ++dropped_frame_count_; current_frame_ = frame; - current_time_ = frame->GetTimestamp() - start_time_; + current_time_ = frame->timestamp() - start_time_; current_frame_used_ = false; } diff --git a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc index d028b3f..199cdff 100644 --- a/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc +++ b/content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc @@ -80,16 +80,16 @@ void WebRtcVideoCapturerAdapter::OnFrameCaptured( DCHECK(media::VideoFrame::I420 == frame->format() || media::VideoFrame::YV12 == frame->format()); if (first_frame_timestamp_ == media::kNoTimestamp()) - first_frame_timestamp_ = frame->GetTimestamp(); + first_frame_timestamp_ = frame->timestamp(); cricket::CapturedFrame captured_frame; captured_frame.width = frame->visible_rect().width(); captured_frame.height = frame->visible_rect().height(); // cricket::CapturedFrame time is in nanoseconds. captured_frame.elapsed_time = - (frame->GetTimestamp() - first_frame_timestamp_).InMicroseconds() * + (frame->timestamp() - first_frame_timestamp_).InMicroseconds() * base::Time::kNanosecondsPerMicrosecond; - captured_frame.time_stamp = frame->GetTimestamp().InMicroseconds() * + captured_frame.time_stamp = frame->timestamp().InMicroseconds() * base::Time::kNanosecondsPerMicrosecond; captured_frame.pixel_height = 1; captured_frame.pixel_width = 1; diff --git a/content/renderer/media/webrtc/webrtc_video_sink_adapter.cc b/content/renderer/media/webrtc/webrtc_video_sink_adapter.cc index 587ecfe..dd5bb37 100644 --- a/content/renderer/media/webrtc/webrtc_video_sink_adapter.cc +++ b/content/renderer/media/webrtc/webrtc_video_sink_adapter.cc @@ -53,7 +53,7 @@ void WebRtcVideoSinkAdapter::RenderFrame(const cricket::VideoFrame* frame) { NativeHandleImpl* handle = static_cast<NativeHandleImpl*>(frame->GetNativeHandle()); video_frame = static_cast<media::VideoFrame*>(handle->GetHandle()); - video_frame->SetTimestamp(timestamp); + video_frame->set_timestamp(timestamp); } else { gfx::Size size(frame->GetWidth(), frame->GetHeight()); video_frame = media::VideoFrame::CreateFrame( diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc index 618d044..776813a 100644 --- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc @@ -218,7 +218,7 @@ void PepperMediaStreamVideoTrackHost::OnVideoFrame( &(buffer_manager()->GetBufferPointer(index)->video); buffer->header.size = buffer_manager()->buffer_size(); buffer->header.type = ppapi::MediaStreamBuffer::TYPE_VIDEO; - buffer->timestamp = frame->GetTimestamp().InSecondsF(); + buffer->timestamp = frame->timestamp().InSecondsF(); buffer->format = format; buffer->size.width = size.width(); buffer->size.height = size.height(); diff --git a/content/renderer/pepper/pepper_video_source_host.cc b/content/renderer/pepper/pepper_video_source_host.cc index c6a6cd6..9996ec9 100644 --- a/content/renderer/pepper/pepper_video_source_host.cc +++ b/content/renderer/pepper/pepper_video_source_host.cc @@ -211,7 +211,7 @@ void PepperVideoSourceHost::SendGetFrameReply() { host_resource.SetHostResource(pp_instance(), resource.get()); // Convert a video timestamp to a PP_TimeTicks (a double, in seconds). - PP_TimeTicks timestamp = frame->GetTimestamp().InSecondsF(); + PP_TimeTicks timestamp = frame->timestamp().InSecondsF(); ppapi::proxy::SerializedHandle serialized_handle; serialized_handle.set_shmem(image_handle, byte_count); |