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

content/content_common.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../components/tracing.gyp:tracing',
     '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
     '../net/net.gyp:net',
@@ skipping 802 matching lines @@
             '-e', '<(extra_header)',
             '-s', '<(stubs_filename_root)',
             '-p', '<(project_path)',
             '<@(_inputs)',
           ],
           'process_outputs_as_sources': 1,
           'message': 'Generating libv4l2 stubs for dynamic loading',
         },
       ],
     }],
+    ['chromeos==1', {
+      'sources': [
+        'common/gpu/media/accelerated_video_decoder.h',
+        'common/gpu/media/h264_decoder.cc',
+        'common/gpu/media/h264_decoder.h',
+        'common/gpu/media/h264_dpb.cc',
+        'common/gpu/media/h264_dpb.h',
+      ],
+    }],
     ['chromeos==1 and use_v4l2_codec==1', {
       'direct_dependent_settings': {
         'defines': [
           'USE_V4L2_CODEC'
         ],
       },
       'defines': [
         'USE_V4L2_CODEC'
       ],
       'dependencies': [
         '../media/media.gyp:media',
       ],
       'sources': [
-        'common/gpu/media/accelerated_video_decoder.h',
         'common/gpu/media/generic_v4l2_device.cc',
         'common/gpu/media/generic_v4l2_device.h',
-        'common/gpu/media/h264_decoder.cc',
-        'common/gpu/media/h264_decoder.h',
-        'common/gpu/media/h264_dpb.cc',
-        'common/gpu/media/h264_dpb.h',
         'common/gpu/media/v4l2_device.cc',
         'common/gpu/media/v4l2_device.h',
         'common/gpu/media/v4l2_image_processor.cc',
         'common/gpu/media/v4l2_image_processor.h',
         'common/gpu/media/v4l2_slice_video_decode_accelerator.cc',
         'common/gpu/media/v4l2_slice_video_decode_accelerator.h',
         'common/gpu/media/v4l2_video_decode_accelerator.cc',
         'common/gpu/media/v4l2_video_decode_accelerator.h',
         'common/gpu/media/v4l2_video_encode_accelerator.cc',
         'common/gpu/media/v4l2_video_encode_accelerator.h',
@@ skipping 12 matching lines @@
         'common/gpu/media/tegra_v4l2_device.h',
       ],
     }],
     ['target_arch != "arm" and chromeos == 1', {
       'dependencies': [
         '../media/media.gyp:media',
         '../third_party/libyuv/libyuv.gyp:libyuv',
       ],
       'sources': [
         'common/gpu/media/va_surface.h',
-        'common/gpu/media/vaapi_h264_decoder.cc',
-        'common/gpu/media/vaapi_h264_decoder.h',
-        'common/gpu/media/vaapi_h264_dpb.cc',
-        'common/gpu/media/vaapi_h264_dpb.h',
         'common/gpu/media/vaapi_jpeg_decoder.cc',
         'common/gpu/media/vaapi_jpeg_decoder.h',
         'common/gpu/media/vaapi_picture.cc',
         'common/gpu/media/vaapi_picture.h',
         'common/gpu/media/vaapi_video_decode_accelerator.cc',
         'common/gpu/media/vaapi_video_decode_accelerator.h',
         'common/gpu/media/vaapi_video_encode_accelerator.cc',
         'common/gpu/media/vaapi_video_encode_accelerator.h',
         'common/gpu/media/vaapi_wrapper.cc',
         'common/gpu/media/vaapi_wrapper.h',
@@ skipping 160 matching lines @@
         'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc',
         'common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.h',
         'common/gpu/gpu_memory_buffer_factory_ozone.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc',
         'common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h',
       ],
     }],
   ],
 }