Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(521)

Unified Diff: media/filters/omx_video_decode_engine.cc

Issue 1226001: Merged VideoSurface, VideoFrame and VideoFrameImpl in VideoFrame. (Closed)
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/omx_video_decode_engine.h ('k') | media/filters/video_decode_engine.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/omx_video_decode_engine.cc
diff --git a/media/filters/omx_video_decode_engine.cc b/media/filters/omx_video_decode_engine.cc
index 4b6d08142c058db1ca2ca00a7c97ce2338cd03fe..be4bd8df04b33a6ab52d03873b69521ecd547cc1 100644
--- a/media/filters/omx_video_decode_engine.cc
+++ b/media/filters/omx_video_decode_engine.cc
@@ -136,8 +136,8 @@ void OmxVideoDecodeEngine::Flush(Task* done_cb) {
omx_codec_->Flush(TaskToCallbackAdapter::NewCallback(done_cb));
}
-VideoSurface::Format OmxVideoDecodeEngine::GetSurfaceFormat() const {
- return VideoSurface::YV12;
+VideoFrame::Format OmxVideoDecodeEngine::GetSurfaceFormat() const {
+ return VideoFrame::YV12;
}
void OmxVideoDecodeEngine::Stop(Callback0::Type* done_cb) {
« no previous file with comments | « media/filters/omx_video_decode_engine.h ('k') | media/filters/video_decode_engine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698