diff options
author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 15:56:29 +0000 |
---|---|---|
committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 15:56:29 +0000 |
commit | b6c2955681cc0959a9754c02cab67b317fc59e8a (patch) | |
tree | 65bd81c3fe1ec4d0bde03510bcad2d4b222e1c21 /media/base/pipeline.h | |
parent | 42d2ebcb5bd1b2efc9cd32baf8656c859dff8313 (diff) | |
download | chromium_src-b6c2955681cc0959a9754c02cab67b317fc59e8a.zip chromium_src-b6c2955681cc0959a9754c02cab67b317fc59e8a.tar.gz chromium_src-b6c2955681cc0959a9754c02cab67b317fc59e8a.tar.bz2 |
Refactoring code to use factories to create DataSource objects.
BUG=72485
TEST=None for now. Existing unit tests cover this code.
Review URL: http://codereview.chromium.org/6480050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline.h')
-rw-r--r-- | media/base/pipeline.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/media/base/pipeline.h b/media/base/pipeline.h index 8e7a8db..802903d 100644 --- a/media/base/pipeline.h +++ b/media/base/pipeline.h @@ -12,6 +12,7 @@ #include <string> #include "base/callback.h" +#include "media/base/pipeline_status.h" namespace base { class TimeDelta; @@ -19,29 +20,6 @@ class TimeDelta; namespace media { -// Error definitions for pipeline. All codes indicate an error except: -// PIPELINE_OK indicates the pipeline is running normally. -enum PipelineError { - PIPELINE_OK, - PIPELINE_ERROR_URL_NOT_FOUND, - PIPELINE_ERROR_NETWORK, - PIPELINE_ERROR_DECODE, - PIPELINE_ERROR_ABORT, - PIPELINE_ERROR_INITIALIZATION_FAILED, - PIPELINE_ERROR_REQUIRED_FILTER_MISSING, - PIPELINE_ERROR_OUT_OF_MEMORY, - PIPELINE_ERROR_COULD_NOT_RENDER, - PIPELINE_ERROR_READ, - PIPELINE_ERROR_AUDIO_HARDWARE, - PIPELINE_ERROR_OPERATION_PENDING, - PIPELINE_ERROR_INVALID_STATE, - // Demuxer related errors. - DEMUXER_ERROR_COULD_NOT_OPEN, - DEMUXER_ERROR_COULD_NOT_PARSE, - DEMUXER_ERROR_NO_SUPPORTED_STREAMS, - DEMUXER_ERROR_COULD_NOT_CREATE_THREAD, -}; - struct PipelineStatistics { PipelineStatistics() : audio_bytes_decoded(0), |