| Index: chromecast/media/cma/adapter/media_component_device.h
|
| diff --git a/chromecast/public/media/media_component_device.h b/chromecast/media/cma/adapter/media_component_device.h
|
| similarity index 82%
|
| rename from chromecast/public/media/media_component_device.h
|
| rename to chromecast/media/cma/adapter/media_component_device.h
|
| index b6f6255938beff663ca3d655050338d0a06d15e2..f8feab8b747db5feb6bd6fd2dfd3e13a24e719cd 100644
|
| --- a/chromecast/public/media/media_component_device.h
|
| +++ b/chromecast/media/cma/adapter/media_component_device.h
|
| @@ -2,13 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROMECAST_PUBLIC_MEDIA_MEDIA_COMPONENT_DEVICE_H_
|
| -#define CHROMECAST_PUBLIC_MEDIA_MEDIA_COMPONENT_DEVICE_H_
|
| +#ifndef CHROMECAST_MEDIA_CMA_ADAPTER_MEDIA_COMPONENT_DEVICE_H_
|
| +#define CHROMECAST_MEDIA_CMA_ADAPTER_MEDIA_COMPONENT_DEVICE_H_
|
|
|
| #include <stdint.h>
|
| #include <string>
|
|
|
| -#include "cast_key_system.h"
|
| +#include "chromecast/public/media/cast_key_system.h"
|
| +#include "chromecast/public/media/media_pipeline_backend.h"
|
|
|
| namespace chromecast {
|
| namespace media {
|
| @@ -70,25 +71,8 @@ class MediaComponentDevice {
|
|
|
| // The statistics are computed since the media component left the idle state.
|
| // For video, a sample is defined as a frame.
|
| - struct Statistics {
|
| - uint64_t decoded_bytes;
|
| - uint64_t decoded_samples;
|
| - uint64_t dropped_samples;
|
| - };
|
| -
|
| - // Info on pipeline latency: amount of data in pipeline not rendered yet,
|
| - // and timestamp of system clock (must be CLOCK_MONOTONIC) at which delay
|
| - // measurement was taken. Both times in microseconds.
|
| - struct RenderingDelay {
|
| - RenderingDelay()
|
| - : delay_microseconds(INT64_MIN), timestamp_microseconds(INT64_MIN) {}
|
| - RenderingDelay(int64_t delay_microseconds_in,
|
| - int64_t timestamp_microseconds_in)
|
| - : delay_microseconds(delay_microseconds_in),
|
| - timestamp_microseconds(timestamp_microseconds_in) {}
|
| - int64_t delay_microseconds;
|
| - int64_t timestamp_microseconds;
|
| - };
|
| + typedef MediaPipelineBackend::Decoder::Statistics Statistics;
|
| + typedef MediaPipelineBackend::AudioDecoder::RenderingDelay RenderingDelay;
|
|
|
| virtual ~MediaComponentDevice() {}
|
|
|
| @@ -139,4 +123,4 @@ class MediaComponentDevice {
|
| } // namespace media
|
| } // namespace chromecast
|
|
|
| -#endif // CHROMECAST_MEDIA_CMA_BACKEND_MEDIA_COMPONENT_DEVICE_H_
|
| +#endif // CHROMECAST_MEDIA_CMA_ADAPTER_MEDIA_COMPONENT_DEVICE_H_
|
|
|