diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 21:56:26 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-12 21:56:26 +0000 |
| commit | 4790db572ffcb4f10ec64abaa77696e8ee6ace03 (patch) | |
| tree | cc01860fa6b1e54db66bd72a8c4649179d1cfea1 /media/base | |
| parent | ae6012416ae8adb0a2ed3cd1f5d3964bd5a0c8e9 (diff) | |
| download | chromium_src-4790db572ffcb4f10ec64abaa77696e8ee6ace03.zip chromium_src-4790db572ffcb4f10ec64abaa77696e8ee6ace03.tar.gz chromium_src-4790db572ffcb4f10ec64abaa77696e8ee6ace03.tar.bz2 | |
Remove media::StreamSample::IsDiscontinuous() and friends.
We don't rely on samples identifying themselves as discontinuous and instead have the pipeline force a flush as part of a seek.
BUG=54110
TEST=media_unittests and layout tests
Review URL: http://codereview.chromium.org/4878001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/buffers.cc | 7 | ||||
| -rw-r--r-- | media/base/buffers.h | 12 | ||||
| -rw-r--r-- | media/base/data_buffer_unittest.cc | 6 | ||||
| -rw-r--r-- | media/base/video_frame_unittest.cc | 5 |
4 files changed, 2 insertions, 28 deletions
diff --git a/media/base/buffers.cc b/media/base/buffers.cc index 5b18ff7..4708726 100644 --- a/media/base/buffers.cc +++ b/media/base/buffers.cc @@ -9,11 +9,8 @@ namespace media { const base::TimeDelta kNoTimestamp = base::TimeDelta::FromMicroseconds(kint64min); -StreamSample::StreamSample() - : discontinuous_(false) { -} +StreamSample::StreamSample() {} -StreamSample::~StreamSample() { -} +StreamSample::~StreamSample() {} } // namespace media diff --git a/media/base/buffers.h b/media/base/buffers.h index 82667fe..525450d 100644 --- a/media/base/buffers.h +++ b/media/base/buffers.h @@ -53,12 +53,6 @@ class StreamSample : public base::RefCountedThreadSafe<StreamSample> { // depending on specific data. virtual bool IsEndOfStream() const = 0; - // Indicates that this sample is discontinuous from the previous one, for - // example, following a seek. - bool IsDiscontinuous() const { - return discontinuous_; - } - // Sets the timestamp of this buffer in microseconds. void SetTimestamp(const base::TimeDelta& timestamp) { timestamp_ = timestamp; @@ -69,11 +63,6 @@ class StreamSample : public base::RefCountedThreadSafe<StreamSample> { duration_ = duration; } - // Sets the value returned by IsDiscontinuous(). - void SetDiscontinuous(bool discontinuous) { - discontinuous_ = discontinuous; - } - protected: friend class base::RefCountedThreadSafe<StreamSample>; StreamSample(); @@ -81,7 +70,6 @@ class StreamSample : public base::RefCountedThreadSafe<StreamSample> { base::TimeDelta timestamp_; base::TimeDelta duration_; - bool discontinuous_; private: DISALLOW_COPY_AND_ASSIGN(StreamSample); diff --git a/media/base/data_buffer_unittest.cc b/media/base/data_buffer_unittest.cc index 8c870cf..f22e05e 100644 --- a/media/base/data_buffer_unittest.cc +++ b/media/base/data_buffer_unittest.cc @@ -23,16 +23,10 @@ TEST(DataBufferTest, StreamSampleImpl) { EXPECT_TRUE(kTimestampA == buffer->GetTimestamp()); EXPECT_TRUE(kDurationA == buffer->GetDuration()); EXPECT_TRUE(buffer->IsEndOfStream()); - EXPECT_FALSE(buffer->IsDiscontinuous()); buffer->SetTimestamp(kTimestampB); buffer->SetDuration(kDurationB); EXPECT_TRUE(kTimestampB == buffer->GetTimestamp()); EXPECT_TRUE(kDurationB == buffer->GetDuration()); - - buffer->SetDiscontinuous(true); - EXPECT_TRUE(buffer->IsDiscontinuous()); - buffer->SetDiscontinuous(false); - EXPECT_FALSE(buffer->IsDiscontinuous()); } TEST(DataBufferTest, Constructors) { diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index 633ccc0..dac228d 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc @@ -106,7 +106,6 @@ TEST(VideoFrame, CreateFrame) { EXPECT_EQ(kDurationA.InMicroseconds(), frame->GetDuration().InMicroseconds()); EXPECT_FALSE(frame->IsEndOfStream()); - EXPECT_FALSE(frame->IsDiscontinuous()); frame->SetTimestamp(kTimestampB); frame->SetDuration(kDurationB); EXPECT_EQ(kTimestampB.InMicroseconds(), @@ -114,10 +113,6 @@ TEST(VideoFrame, CreateFrame) { EXPECT_EQ(kDurationB.InMicroseconds(), frame->GetDuration().InMicroseconds()); EXPECT_FALSE(frame->IsEndOfStream()); - frame->SetDiscontinuous(true); - EXPECT_TRUE(frame->IsDiscontinuous()); - frame->SetDiscontinuous(false); - EXPECT_FALSE(frame->IsDiscontinuous()); // Test VideoFrame implementation. EXPECT_EQ(media::VideoFrame::TYPE_SYSTEM_MEMORY, frame->type()); |