| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/filters/omx_video_decoder.h" | 5 #include "media/filters/omx_video_decoder.h" |
| 6 | 6 |
| 7 #include "base/waitable_event.h" | 7 #include "base/waitable_event.h" |
| 8 #include "media/filters/ffmpeg_common.h" | 8 #include "media/ffmpeg/ffmpeg_common.h" |
| 9 #include "media/filters/omx_video_decode_engine.h" | 9 #include "media/filters/omx_video_decode_engine.h" |
| 10 | 10 |
| 11 namespace media { | 11 namespace media { |
| 12 | 12 |
| 13 // static | 13 // static |
| 14 FilterFactory* OmxVideoDecoder::CreateFactory() { | 14 FilterFactory* OmxVideoDecoder::CreateFactory() { |
| 15 return new FilterFactoryImpl1<OmxVideoDecoder, OmxVideoDecodeEngine*>( | 15 return new FilterFactoryImpl1<OmxVideoDecoder, OmxVideoDecodeEngine*>( |
| 16 new OmxVideoDecodeEngine()); | 16 new OmxVideoDecodeEngine()); |
| 17 } | 17 } |
| 18 | 18 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 } | 50 } |
| 51 | 51 |
| 52 void OmxVideoDecoder::Stop() { | 52 void OmxVideoDecoder::Stop() { |
| 53 // TODO(ajwong): This is a total hack. Make async. | 53 // TODO(ajwong): This is a total hack. Make async. |
| 54 base::WaitableEvent event(false, false); | 54 base::WaitableEvent event(false, false); |
| 55 omx_engine_->Stop(NewCallback(&event, &base::WaitableEvent::Signal)); | 55 omx_engine_->Stop(NewCallback(&event, &base::WaitableEvent::Signal)); |
| 56 event.Wait(); | 56 event.Wait(); |
| 57 } | 57 } |
| 58 | 58 |
| 59 } // namespace media | 59 } // namespace media |
| OLD | NEW |