| Index: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
|
| diff --git a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
|
| index 04ef6ca257a88eb62db2f90370cd6391e464ea2b..8a7b5131c5f3c3a898653690722aa7910de92e27 100644
|
| --- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
|
| +++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
|
| @@ -22,10 +22,6 @@
|
| #include "media/capture/video/video_capture_jpeg_decoder.h"
|
| #include "media/video/jpeg_decode_accelerator.h"
|
|
|
| -namespace gpu {
|
| -class GpuChannelHost;
|
| -}
|
| -
|
| namespace content {
|
|
|
| // Adapter to GpuJpegDecodeAccelerator for VideoCaptureDevice::Client. It takes
|
| @@ -66,27 +62,12 @@ class CONTENT_EXPORT VideoCaptureGpuJpegDecoder
|
| media::JpegDecodeAccelerator::Error error) override;
|
|
|
| private:
|
| - // Initialization helper, to establish GPU channel.
|
| - static void EstablishGpuChannelOnUIThread(
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| - base::WeakPtr<VideoCaptureGpuJpegDecoder> weak_this);
|
| -
|
| - static void GpuChannelEstablishedOnUIThread(
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| - base::WeakPtr<VideoCaptureGpuJpegDecoder> weak_this,
|
| - scoped_refptr<gpu::GpuChannelHost> established_channel_host);
|
| -
|
| - void FinishInitialization(
|
| - scoped_refptr<gpu::GpuChannelHost> gpu_channel_host);
|
| -
|
| // Returns true if the decoding of last frame is not finished yet.
|
| bool IsDecoding_Locked() const;
|
|
|
| // Records |decoder_status_| to histogram.
|
| void RecordInitDecodeUMA_Locked();
|
|
|
| - scoped_refptr<gpu::GpuChannelHost> gpu_channel_host_;
|
| -
|
| // The underlying JPEG decode accelerator.
|
| std::unique_ptr<media::JpegDecodeAccelerator> decoder_;
|
|
|
|
|