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

Side by Side Diff: media/base/pipeline_status.h

Issue 6686061: PipelineError is dead. Long live PipelineStatus! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: responses to 2nd CR Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/pipeline_impl_unittest.cc ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef MEDIA_BASE_PIPELINE_STATUS_H_ 5 #ifndef MEDIA_BASE_PIPELINE_STATUS_H_
6 #define MEDIA_BASE_PIPELINE_STATUS_H_ 6 #define MEDIA_BASE_PIPELINE_STATUS_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 9
10 namespace media { 10 namespace media {
11 11
12 // Error definitions for pipeline. All codes indicate an error except: 12 // Status states for pipeline. All codes except PIPELINE_OK indicate errors.
13 // PIPELINE_OK indicates the pipeline is running normally. 13 enum PipelineStatus {
14 enum PipelineError {
15 PIPELINE_OK, 14 PIPELINE_OK,
16 PIPELINE_ERROR_URL_NOT_FOUND, 15 PIPELINE_ERROR_URL_NOT_FOUND,
17 PIPELINE_ERROR_NETWORK, 16 PIPELINE_ERROR_NETWORK,
18 PIPELINE_ERROR_DECODE, 17 PIPELINE_ERROR_DECODE,
19 PIPELINE_ERROR_ABORT, 18 PIPELINE_ERROR_ABORT,
20 PIPELINE_ERROR_INITIALIZATION_FAILED, 19 PIPELINE_ERROR_INITIALIZATION_FAILED,
21 PIPELINE_ERROR_REQUIRED_FILTER_MISSING, 20 PIPELINE_ERROR_REQUIRED_FILTER_MISSING,
22 PIPELINE_ERROR_OUT_OF_MEMORY, 21 PIPELINE_ERROR_OUT_OF_MEMORY,
23 PIPELINE_ERROR_COULD_NOT_RENDER, 22 PIPELINE_ERROR_COULD_NOT_RENDER,
24 PIPELINE_ERROR_READ, 23 PIPELINE_ERROR_READ,
25 PIPELINE_ERROR_AUDIO_HARDWARE, 24 PIPELINE_ERROR_AUDIO_HARDWARE,
26 PIPELINE_ERROR_OPERATION_PENDING, 25 PIPELINE_ERROR_OPERATION_PENDING,
27 PIPELINE_ERROR_INVALID_STATE, 26 PIPELINE_ERROR_INVALID_STATE,
28 // Demuxer related errors. 27 // Demuxer related errors.
29 DEMUXER_ERROR_COULD_NOT_OPEN, 28 DEMUXER_ERROR_COULD_NOT_OPEN,
30 DEMUXER_ERROR_COULD_NOT_PARSE, 29 DEMUXER_ERROR_COULD_NOT_PARSE,
31 DEMUXER_ERROR_NO_SUPPORTED_STREAMS, 30 DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
32 DEMUXER_ERROR_COULD_NOT_CREATE_THREAD, 31 DEMUXER_ERROR_COULD_NOT_CREATE_THREAD,
33 // DataSourceFactory errors. 32 // DataSourceFactory errors.
34 DATASOURCE_ERROR_URL_NOT_SUPPORTED, 33 DATASOURCE_ERROR_URL_NOT_SUPPORTED,
35 }; 34 };
36 35
37 typedef Callback1<media::PipelineError>::Type PipelineStatusCallback; 36 typedef Callback1<media::PipelineStatus>::Type PipelineStatusCallback;
38 37
39 } // namespace media 38 } // namespace media
40 39
41 #endif // MEDIA_BASE_PIPELINE_STATUS_H_ 40 #endif // MEDIA_BASE_PIPELINE_STATUS_H_
OLDNEW
« no previous file with comments | « media/base/pipeline_impl_unittest.cc ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698