Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / media / filters / gpu_video_decoder.h

diff --git a/src/media/filters/gpu_video_decoder.h b/src/media/filters/gpu_video_decoder.h
index 3307684..743c127 100644 (file)
--- a/src/media/filters/gpu_video_decoder.h
+++ b/src/media/filters/gpu_video_decoder.h
@@ -38,10 +38,10 @@ class MEDIA_EXPORT GpuVideoDecoder
       public VideoDecodeAccelerator::Client {
  public:
   explicit GpuVideoDecoder(
-      const scoped_refptr<GpuVideoAcceleratorFactories>& factories,
-      const scoped_refptr<MediaLog>& media_log);
+      const scoped_refptr<GpuVideoAcceleratorFactories>& factories);
 
   // VideoDecoder implementation.
+  virtual std::string GetDisplayName() const OVERRIDE;
   virtual void Initialize(const VideoDecoderConfig& config,
                           bool low_delay,
                           const PipelineStatusCB& status_cb,
@@ -152,8 +152,6 @@ class MEDIA_EXPORT GpuVideoDecoder
   // steady-state of the decoder.
   std::vector<SHMBuffer*> available_shm_segments_;
 
-  scoped_refptr<MediaLog> media_log_;
-
   std::map<int32, PendingDecoderBuffer> bitstream_buffers_in_decoder_;
   PictureBufferMap assigned_picture_buffers_;
   // PictureBuffers given to us by VDA via PictureReady, which we sent forward