Initial implementation of stream switching in AdaptiveDemuxer.

media/base/pipeline_status.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_PIPELINE_STATUS_H_
 #define MEDIA_BASE_PIPELINE_STATUS_H_
 
+#include "base/callback.h"
 #include "base/callback_old.h"
 
 namespace media {
 
 // Status states for pipeline.  All codes except PIPELINE_OK indicate errors.
 enum PipelineStatus {
   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,
   // DataSourceFactory errors.
   DATASOURCE_ERROR_URL_NOT_SUPPORTED,
 };
 
 typedef Callback1<media::PipelineStatus>::Type PipelineStatusCallback;
+typedef base::Callback<void(PipelineStatus)> PipelineStatusCB;

[Ami GONE FROM CHROMIUM, 2011/05/19 20:27:37]

Does filters.h need a separate FilterStatusCB?
Use this type in base/mock_callback.{h,cc} instead of the explicit type?

[acolwell GONE FROM CHROMIUM, 2011/05/20 01:26:37]

No.
Yes.

I'll put this in a separate CL.

 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_STATUS_H_