diff options
author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-22 21:27:52 +0000 |
---|---|---|
committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-22 21:27:52 +0000 |
commit | 55424ebf0473d77fd3acdfd3d4d1fab52e5ecdf3 (patch) | |
tree | cc33197cf9a838dde3d9efbd62229c74e8f67320 /media/omx | |
parent | 6307cdcd4c47a404c48415b5ac2303f2590d00c3 (diff) | |
download | chromium_src-55424ebf0473d77fd3acdfd3d4d1fab52e5ecdf3.zip chromium_src-55424ebf0473d77fd3acdfd3d4d1fab52e5ecdf3.tar.gz chromium_src-55424ebf0473d77fd3acdfd3d4d1fab52e5ecdf3.tar.bz2 |
Implementation of OmxVideoDecodeEngine.
Also moves FFmpegVideoDecodeEngine FFmpegVideoDecoder, OmxVideoDecoder, and VideoDecoderImpl into their own files.
Refactors FFmpegDemuxerTest to be less of a characterization test, and to hopefully be less fragile.
Creates a set of utilities for handling Callbacks versus Tasks, and resource management related to Callbacks.
Re-enables the annexb filters for the chrome build of FFmpeg.
Added a BitstreamConverter class that abstracts the bitstream filter code.
Cleans up a few gyp mistakes with flag exporting.
Review URL: http://codereview.chromium.org/492023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/omx')
-rw-r--r-- | media/omx/omx_codec.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/omx/omx_codec.cc b/media/omx/omx_codec.cc index 6c42b3c..d67798d56 100644 --- a/media/omx/omx_codec.cc +++ b/media/omx/omx_codec.cc @@ -81,7 +81,8 @@ void OmxCodec::Feed(InputBuffer* buffer, FeedCallback* callback) { } void OmxCodec::Flush(Callback* callback) { - // TODO(hclam): implement. + callback->Run(); + delete callback; } OmxCodec::State OmxCodec::GetState() const { @@ -349,8 +350,9 @@ void OmxCodec::Transition_EmptyToLoaded() { else LOG(ERROR) << "Error: Unsupported codec " << codec_; // Assume QCIF. - port_format.format.video.nFrameWidth = 176; - port_format.format.video.nFrameHeight = 144; + // TODO(ajwong): This MUST come from the client library somehow. + port_format.format.video.nFrameWidth = 720; + port_format.format.video.nFrameHeight = 480; omxresult = OMX_SetParameter(decoder_handle_, OMX_IndexParamPortDefinition, &port_format); |