| Index: chromecast/media/cma/backend/video_pipeline_device_default.h
|
| diff --git a/chromecast/media/cma/backend/video_pipeline_device_default.h b/chromecast/media/cma/backend/video_pipeline_device_default.h
|
| index 49a4a0316ee0f503925a57cdf14f5585691d645c..8dd61d8a691326e5bc73f92cd37dfe3194155dfe 100644
|
| --- a/chromecast/media/cma/backend/video_pipeline_device_default.h
|
| +++ b/chromecast/media/cma/backend/video_pipeline_device_default.h
|
| @@ -8,32 +8,34 @@
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "chromecast/media/cma/backend/video_pipeline_device.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "base/threading/thread_checker.h"
|
| #include "chromecast/public/media/decoder_config.h"
|
| +#include "chromecast/public/media/video_pipeline_device.h"
|
|
|
| namespace chromecast {
|
| namespace media {
|
|
|
| class MediaClockDevice;
|
| class MediaComponentDeviceDefault;
|
| +struct MediaPipelineDeviceParams;
|
|
|
| class VideoPipelineDeviceDefault : public VideoPipelineDevice {
|
| public:
|
| - explicit VideoPipelineDeviceDefault(MediaClockDevice* media_clock_device);
|
| + VideoPipelineDeviceDefault(const MediaPipelineDeviceParams& params,
|
| + MediaClockDevice* media_clock_device);
|
| ~VideoPipelineDeviceDefault() override;
|
|
|
| // VideoPipelineDevice implementation.
|
| - void SetClient(const Client& client) override;
|
| + void SetClient(Client* client) override;
|
| State GetState() const override;
|
| bool SetState(State new_state) override;
|
| - bool SetStartPts(base::TimeDelta time) override;
|
| - FrameStatus PushFrame(
|
| - const scoped_refptr<DecryptContext>& decrypt_context,
|
| - const scoped_refptr<DecoderBufferBase>& buffer,
|
| - const FrameStatusCB& completion_cb) override;
|
| - base::TimeDelta GetRenderingTime() const override;
|
| - base::TimeDelta GetRenderingDelay() const override;
|
| - void SetVideoClient(const VideoClient& client) override;
|
| + bool SetStartPts(int64_t time_microseconds) override;
|
| + FrameStatus PushFrame(DecryptContext* decrypt_context,
|
| + CastDecoderBuffer* buffer,
|
| + FrameStatusCB* completion_cb) override;
|
| + RenderingDelay GetRenderingDelay() const override;
|
| + void SetVideoClient(VideoClient* client) override;
|
| bool SetConfig(const VideoConfig& config) override;
|
| bool GetStatistics(Statistics* stats) const override;
|
|
|
| @@ -43,6 +45,7 @@ class VideoPipelineDeviceDefault : public VideoPipelineDevice {
|
| VideoConfig config_;
|
| std::vector<uint8_t> config_extra_data_;
|
|
|
| + base::ThreadChecker thread_checker_;
|
| DISALLOW_COPY_AND_ASSIGN(VideoPipelineDeviceDefault);
|
| };
|
|
|
| @@ -50,4 +53,3 @@ class VideoPipelineDeviceDefault : public VideoPipelineDevice {
|
| } // namespace chromecast
|
|
|
| #endif // CHROMECAST_MEDIA_CMA_BACKEND_VIDEO_PIPELINE_DEVICE_DEFAULT_H_
|
| -
|
|
|