VaapiVideoAccelerator: make Vaapi accelerator work with ozone

content/common/gpu/media/vaapi_video_encode_accelerator.h

 // Copyright 2014 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 CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_
 
 #include <list>
 #include <queue>
 
 #include "base/memory/linked_ptr.h"
 #include "base/threading/thread.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/media/h264_dpb.h"
 #include "content/common/gpu/media/va_surface.h"
 #include "content/common/gpu/media/vaapi_wrapper.h"
 #include "media/filters/h264_bitstream_buffer.h"
 #include "media/video/video_encode_accelerator.h"
 
 namespace content {
 
 // A VideoEncodeAccelerator implementation that uses VA-API
 // (http://www.freedesktop.org/wiki/Software/vaapi) for HW-accelerated
 // video encode.
 class CONTENT_EXPORT VaapiVideoEncodeAccelerator
     : public media::VideoEncodeAccelerator {
  public:
-  explicit VaapiVideoEncodeAccelerator(Display* x_display);
+  VaapiVideoEncodeAccelerator();
   virtual ~VaapiVideoEncodeAccelerator();
 
   // media::VideoEncodeAccelerator implementation.
   virtual bool Initialize(media::VideoFrame::Format format,
                           const gfx::Size& input_visible_size,
                           media::VideoCodecProfile output_profile,
                           uint32 initial_bitrate,
                           Client* client) OVERRIDE;
   virtual void Encode(const scoped_refptr<media::VideoFrame>& frame,
                       bool force_keyframe) OVERRIDE;
@@ skipping 106 matching lines @@
   void TryToReturnBitstreamBuffer();
 
   // Puts the encoder into en error state and notifies client about the error.
   void NotifyError(Error error);
 
   // Sets the encoder state on the correct thread.
   void SetState(State state);
 
   // VaapiWrapper is the owner of all HW resources (surfaces and buffers)
   // and will free them on destruction.
-  scoped_ptr<VaapiWrapper> vaapi_wrapper_;
+  scoped_refptr<VaapiWrapper> vaapi_wrapper_;
 
   // Input profile and sizes.
   media::VideoCodecProfile profile_;
   gfx::Size visible_size_;
   gfx::Size coded_size_;  // Macroblock-aligned.
   // Width/height in macroblocks.
   unsigned int mb_width_;
   unsigned int mb_height_;
 
   // Maximum size of the reference list 0.
   unsigned int max_ref_idx_l0_size_;
 
   // Initial QP.
   unsigned int qp_;
 
   // IDR frame period.
   unsigned int idr_period_;
   // I frame period.
   unsigned int i_period_;
   // IP period, i.e. how often do we need to have either an I or a P frame in
   // the stream. Period of 1 means we can have no B frames.
   unsigned int ip_period_;
 
   // Size in bytes required for input bitstream buffers.
   size_t output_buffer_byte_size_;
 
-  Display* x_display_;
-
   // All of the members below must be accessed on the encoder_thread_,
   // while it is running.
 
   // Encoder state. Encode tasks will only run in kEncoding state.
   State state_;
 
   // frame_num to be used for the next frame.
   unsigned int frame_num_;
   // frame_num of the previous IDR.
   unsigned int last_idr_frame_num_;
@@ skipping 61 matching lines @@
   // thread (it's a member of this class).
   base::WeakPtr<VaapiVideoEncodeAccelerator> weak_this_;
   base::WeakPtrFactory<VaapiVideoEncodeAccelerator> weak_this_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VaapiVideoEncodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VAAPI_VIDEO_ENCODE_ACCELERATOR_H_