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 /media/base | |
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 'media/base')
-rw-r--r-- | media/base/video_frame.cc | 2 | ||||
-rw-r--r-- | media/base/video_frame.h | 4 | ||||
-rw-r--r-- | media/base/video_frame_pool.cc | 2 | ||||
-rw-r--r-- | media/base/video_frame_pool_unittest.cc | 2 | ||||
-rw-r--r-- | media/base/video_frame_unittest.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index 874e23a..1e33fbe 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -234,7 +234,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( DCHECK(frame->visible_rect().Contains(visible_rect)); scoped_refptr<VideoFrame> wrapped_frame(new VideoFrame( frame->format(), frame->coded_size(), visible_rect, natural_size, - frame->GetTimestamp(), frame->end_of_stream())); + frame->timestamp(), frame->end_of_stream())); for (size_t i = 0; i < NumPlanes(frame->format()); ++i) { wrapped_frame->strides_[i] = frame->stride(i); diff --git a/media/base/video_frame.h b/media/base/video_frame.h index aa9c078..8106a27 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h @@ -212,10 +212,10 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> { // Returns true if this VideoFrame represents the end of the stream. bool end_of_stream() const { return end_of_stream_; } - base::TimeDelta GetTimestamp() const { + base::TimeDelta timestamp() const { return timestamp_; } - void SetTimestamp(const base::TimeDelta& timestamp) { + void set_timestamp(const base::TimeDelta& timestamp) { timestamp_ = timestamp; } diff --git a/media/base/video_frame_pool.cc b/media/base/video_frame_pool.cc index a0f8682..800d047 100644 --- a/media/base/video_frame_pool.cc +++ b/media/base/video_frame_pool.cc @@ -75,7 +75,7 @@ scoped_refptr<VideoFrame> VideoFramePool::PoolImpl::CreateFrame( pool_frame->visible_rect() == visible_rect && pool_frame->natural_size() == natural_size) { frame = pool_frame; - frame->SetTimestamp(timestamp); + frame->set_timestamp(timestamp); break; } } diff --git a/media/base/video_frame_pool_unittest.cc b/media/base/video_frame_pool_unittest.cc index 7850e04..7f3694b 100644 --- a/media/base/video_frame_pool_unittest.cc +++ b/media/base/video_frame_pool_unittest.cc @@ -23,7 +23,7 @@ class VideoFramePoolTest : public ::testing::Test { base::TimeDelta::FromMilliseconds(timestamp_ms)); EXPECT_EQ(format, frame->format()); EXPECT_EQ(base::TimeDelta::FromMilliseconds(timestamp_ms), - frame->GetTimestamp()); + frame->timestamp()); EXPECT_EQ(coded_size, frame->coded_size()); EXPECT_EQ(visible_rect, frame->visible_rect()); EXPECT_EQ(natural_size, frame->natural_size()); diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index 9229b6a..8e7ce8f 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -170,7 +170,7 @@ TEST(VideoFrame, CreateBlackFrame) { ASSERT_TRUE(frame.get()); // Test basic properties. - EXPECT_EQ(0, frame->GetTimestamp().InMicroseconds()); + EXPECT_EQ(0, frame->timestamp().InMicroseconds()); EXPECT_FALSE(frame->end_of_stream()); // Test |frame| properties. |