summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 18:06:25 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 18:06:25 +0000
commit35751ccc3151bdca7383a3368d26834511125f24 (patch)
treec5123b55aec70f35cea48a7a77e60d2a022d3f3b /media/base
parent048539b80280b675fb545ad846e3b912da1c7a0f (diff)
downloadchromium_src-35751ccc3151bdca7383a3368d26834511125f24.zip
chromium_src-35751ccc3151bdca7383a3368d26834511125f24.tar.gz
chromium_src-35751ccc3151bdca7383a3368d26834511125f24.tar.bz2
Checking in media::FFmpegDemuxer and tests.
FFmpegDemuxer is a Demuxer implemenation using FFmpeg's libavformat. It is written in a way to work with any format and assume that the downstream decoders can interpret FFmpeg's CodecID enumerations. Review URL: http://codereview.chromium.org/39295 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/pipeline.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index da3dfc4..58883cc 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -31,7 +31,12 @@ enum PipelineError {
PIPELINE_ERROR_REQUIRED_FILTER_MISSING,
PIPELINE_ERROR_OUT_OF_MEMORY,
PIPELINE_ERROR_COULD_NOT_RENDER,
- PIPELINE_ERROR_READ
+ PIPELINE_ERROR_READ,
+
+ // Demuxer related errors.
+ DEMUXER_ERROR_COULD_NOT_OPEN,
+ DEMUXER_ERROR_COULD_NOT_PARSE,
+ DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
};
// Base class for Pipeline class which allows for read-only access to members.