diff options
| author | wjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 20:05:42 +0000 |
|---|---|---|
| committer | wjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-07 20:05:42 +0000 |
| commit | 84a661708faa4431cdba5833a33c7834389c65ef (patch) | |
| tree | 4143eefac3569a4523c4af4984ebddb95400274c /media/omx | |
| parent | 62dae71cec04b8d040ef86e1bfb4516d13080a97 (diff) | |
| download | chromium_src-84a661708faa4431cdba5833a33c7834389c65ef.zip chromium_src-84a661708faa4431cdba5833a33c7834389c65ef.tar.gz chromium_src-84a661708faa4431cdba5833a33c7834389c65ef.tar.bz2 | |
add support of OpenMAX EGL image decoding
add support of GLES2 EGL image rendering
OpenMAX system memory decoding almost works expect flow control in video renderer base
BUG=none
TEST=dev platform
Review URL: http://codereview.chromium.org/2456006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/omx')
| -rw-r--r-- | media/omx/omx_codec_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/omx/omx_codec_unittest.cc b/media/omx/omx_codec_unittest.cc index ebec9c9..92201d4 100644 --- a/media/omx/omx_codec_unittest.cc +++ b/media/omx/omx_codec_unittest.cc @@ -307,7 +307,7 @@ class OmxCodecTest : public testing::Test { void FillBufferDoneCallback(scoped_refptr<VideoFrame> frame) { output_units_.push_back(frame); - if (frame.get() == NULL) + if (frame->IsEndOfStream()) got_eos_ = true; } @@ -414,9 +414,9 @@ TEST_F(OmxCodecTest, NormalFlow) { // Send EndOfStream, expect eos flag. SendEOSInputBuffer(); - EXPECT_EQ(kBufferCount, static_cast<int>(input_units_.size())); + EXPECT_EQ(kBufferCount - 1, static_cast<int>(input_units_.size())); EXPECT_EQ(1, static_cast<int>(output_units_.size())); - EXPECT_EQ(count-1, static_cast<int>(output_pool_.size())); + EXPECT_EQ(count - 1, static_cast<int>(output_pool_.size())); EXPECT_EQ(true, got_eos_); // Shutdown. @@ -468,9 +468,9 @@ TEST_F(OmxCodecTest, RecycleInputBuffers) { // Send EndOfStream, expect eos flag. SendEOSInputBuffer(); - EXPECT_EQ(kBufferCount, static_cast<int>(input_units_.size())); + EXPECT_EQ(kBufferCount - 1, static_cast<int>(input_units_.size())); EXPECT_EQ(1, static_cast<int>(output_units_.size())); - EXPECT_EQ(count-1, static_cast<int>(output_pool_.size())); + EXPECT_EQ(count - 1, static_cast<int>(output_pool_.size())); EXPECT_EQ(true, got_eos_); // Shutdown. |