diff options
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/omx_test/omx_test.cc | 5 | ||||
| -rw-r--r-- | media/tools/player_x11/gles_video_renderer.cc | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc index 2deddeb..2b39fee 100644 --- a/media/tools/omx_test/omx_test.cc +++ b/media/tools/omx_test/omx_test.cc @@ -112,7 +112,7 @@ class TestApp : public base::RefCountedThreadSafe<TestApp> { // There are some conditions we don't want to enqueue, for example when // the last buffer is an end-of-stream buffer, when we have stopped, and // when we have received an error. - bool eos = buffer->IsEndOfStream(); + bool eos = buffer.get() && buffer->IsEndOfStream(); if (!eos && !stopped_ && !error_) FeedInputBuffer(); } @@ -164,9 +164,6 @@ class TestApp : public base::RefCountedThreadSafe<TestApp> { NewRunnableMethod(this, &TestApp::InitializeDoneCallback)); - for (int i = 0; i < 20; ++i) - FeedInputBuffer(); - // Execute the message loop so that we can run tasks on it. This call // will return when we call message_loop_.Quit(). message_loop_.Run(); diff --git a/media/tools/player_x11/gles_video_renderer.cc b/media/tools/player_x11/gles_video_renderer.cc index ef02d75..4d14fee 100644 --- a/media/tools/player_x11/gles_video_renderer.cc +++ b/media/tools/player_x11/gles_video_renderer.cc @@ -483,7 +483,7 @@ void GlesVideoRenderer::CreateTextureAndProgramYuv2Rgb() { CreateShader(program, GL_VERTEX_SHADER, kVertexShader, sizeof(kVertexShader)); CreateShader(program, GL_FRAGMENT_SHADER, - kFragmentShaderEgl, sizeof(kFragmentShader)); + kFragmentShader, sizeof(kFragmentShader)); LinkProgram(program); // Bind parameters. |