diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 22:27:56 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 22:27:56 +0000 |
| commit | 1590b7ba918f421004a50330851836c6397595c8 (patch) | |
| tree | 707f3f2ac976a353eb43a12274367324d6b384ea /media/tools | |
| parent | a5faf8bbc066f23192ac55d9a3741876b3a16eb4 (diff) | |
| download | chromium_src-1590b7ba918f421004a50330851836c6397595c8.zip chromium_src-1590b7ba918f421004a50330851836c6397595c8.tar.gz chromium_src-1590b7ba918f421004a50330851836c6397595c8.tar.bz2 | |
Add status parameter to DemuxerStream::ReadCB
BUG=122913
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10669022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 8 | ||||
| -rw-r--r-- | media/tools/seek_tester/seek_tester.cc | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index bc8ef38..83e12ef 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <X11/XKBlib.h> -#include <X11/Xlib.h> #include <signal.h> #include <iostream> // NOLINT @@ -31,6 +29,12 @@ #include "media/filters/file_data_source.h" #include "media/filters/video_renderer_base.h" #include "media/tools/player_x11/data_source_logger.h" + +// Include X11 headers here because X11/Xlib.h #define's Status +// which causes compiler errors with Status enum declarations +// in media::DemuxerStream & media::AudioDecoder. +#include <X11/XKBlib.h> +#include <X11/Xlib.h> #include "media/tools/player_x11/gl_video_renderer.h" #include "media/tools/player_x11/x11_video_renderer.h" diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc index dcc30f7..0f948c8 100644 --- a/media/tools/seek_tester/seek_tester.cc +++ b/media/tools/seek_tester/seek_tester.cc @@ -42,7 +42,9 @@ void QuitMessageLoop(MessageLoop* loop, media::PipelineStatus status) { void TimestampExtractor(uint64* timestamp_ms, MessageLoop* loop, + media::DemuxerStream::Status status, const scoped_refptr<media::DecoderBuffer>& buffer) { + CHECK_EQ(status, media::DemuxerStream::kOk); if (buffer->GetTimestamp() == media::kNoTimestamp()) *timestamp_ms = -1; else |