VAVDA: Use the new, generic video decoder and accelerator infrastructure.

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_h264_dpb.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
@@ skipping 177 matching lines @@
 
   // Current SPS, PPS and their packed versions. Packed versions are their NALUs
   // in AnnexB format *without* emulation prevention three-byte sequences
   // (those will be added by the driver).
   media::H264SPS current_sps_;
   media::H264BitstreamBuffer packed_sps_;
   media::H264PPS current_pps_;
   media::H264BitstreamBuffer packed_pps_;
 
   // Picture currently being prepared for encode.
-  VaapiH264Picture current_pic_;
+  scoped_refptr<H264Picture> current_pic_;
 
   // VA surfaces available for reuse.
   std::vector<VASurfaceID> available_va_surface_ids_;
 
   // VA buffers for coded frames.
   std::vector<VABufferID> available_va_buffer_ids_;
 
   // Currently active reference surfaces.
   RefPicList ref_pic_list0_;
 
@@ skipping 27 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_