Merge 279733 "Revert 279650 "Add VaapiVideoEncodeAccelerator for..."

media/media.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 641 matching lines @@
             '../third_party/libvpx/libvpx.gyp:libvpx',
             '../third_party/libyuv/libyuv.gyp:libyuv',
           ],
           'sources': [
             'formats/webm/chromeos/ebml_writer.cc',
             'formats/webm/chromeos/ebml_writer.h',
             'formats/webm/chromeos/webm_encoder.cc',
             'formats/webm/chromeos/webm_encoder.h',
           ],
         }],
-        # For VaapiVideoEncodeAccelerator.
-        ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
-          'sources': [
-            'filters/h264_bitstream_buffer.cc',
-            'filters/h264_bitstream_buffer.h',
-          ],
-        }],
         ['OS!="ios"', {
           'dependencies': [
             '../third_party/libyuv/libyuv.gyp:libyuv',
           ],
         }],
         ['use_alsa==1', {
           'link_settings': {
             'libraries': [
               '-lasound',
             ],
@@ skipping 544 matching lines @@
               'sources': [
                 'audio/cras/cras_input_unittest.cc',
                 'audio/cras/cras_unified_unittest.cc',
               ],
               'defines': [
                 'USE_CRAS',
               ],
             }],
           ],
         }],
-        ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
-          'sources': [
-            'filters/h264_bitstream_buffer_unittest.cc',
-          ],
-        }],
         ['use_alsa==0', {
           'sources!': [
             'audio/alsa/alsa_output_unittest.cc',
             'audio/audio_low_latency_input_output_unittest.cc',
           ],
         }],
         ['target_arch=="ia32" or target_arch=="x64"', {
           'sources': [
             'base/simd/convert_rgb_to_yuv_unittest.cc',
           ],
@@ skipping 502 matching lines @@
                   ],
                 }],
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }