| OLD | NEW | 
|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") | 
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") | 
| 7 import("//media/gpu/args.gni") | 7 import("//media/gpu/args.gni") | 
| 8 import("//media/media_options.gni") | 8 import("//media/media_options.gni") | 
| 9 import("//testing/test.gni") | 9 import("//testing/test.gni") | 
| 10 | 10 | 
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 121 | 121 | 
| 122   if (is_mac) { | 122   if (is_mac) { | 
| 123     # On Mac, content/common reaches into here to do some pre-sandbox | 123     # On Mac, content/common reaches into here to do some pre-sandbox | 
| 124     # initialization. | 124     # initialization. | 
| 125     visibility += [ "//content/common" ] | 125     visibility += [ "//content/common" ] | 
| 126   } | 126   } | 
| 127 | 127 | 
| 128   defines = [ "MEDIA_GPU_IMPLEMENTATION" ] | 128   defines = [ "MEDIA_GPU_IMPLEMENTATION" ] | 
| 129 | 129 | 
| 130   sources = [ | 130   sources = [ | 
|  | 131     "accelerated_video_decoder.h", | 
| 131     "fake_jpeg_decode_accelerator.cc", | 132     "fake_jpeg_decode_accelerator.cc", | 
| 132     "fake_jpeg_decode_accelerator.h", | 133     "fake_jpeg_decode_accelerator.h", | 
| 133     "fake_video_decode_accelerator.cc", | 134     "fake_video_decode_accelerator.cc", | 
| 134     "fake_video_decode_accelerator.h", | 135     "fake_video_decode_accelerator.h", | 
| 135     "gpu_video_accelerator_util.cc", | 136     "gpu_video_accelerator_util.cc", | 
| 136     "gpu_video_accelerator_util.h", | 137     "gpu_video_accelerator_util.h", | 
| 137     "gpu_video_decode_accelerator_factory.cc", | 138     "gpu_video_decode_accelerator_factory.cc", | 
| 138     "gpu_video_decode_accelerator_factory.h", | 139     "gpu_video_decode_accelerator_factory.h", | 
| 139     "gpu_video_decode_accelerator_helpers.h", | 140     "gpu_video_decode_accelerator_helpers.h", | 
| 140     "gpu_video_encode_accelerator_factory.cc", | 141     "gpu_video_encode_accelerator_factory.cc", | 
| 141     "gpu_video_encode_accelerator_factory.h", | 142     "gpu_video_encode_accelerator_factory.h", | 
|  | 143     "h264_decoder.cc", | 
|  | 144     "h264_decoder.h", | 
|  | 145     "h264_dpb.cc", | 
|  | 146     "h264_dpb.h", | 
| 142     "shared_memory_region.cc", | 147     "shared_memory_region.cc", | 
| 143     "shared_memory_region.h", | 148     "shared_memory_region.h", | 
| 144   ] | 149   ] | 
| 145 | 150 | 
| 146   public_deps = [ | 151   public_deps = [ | 
| 147     "//base", | 152     "//base", | 
| 148     "//gpu", | 153     "//gpu", | 
| 149     "//media", | 154     "//media", | 
| 150     "//ui/gfx/geometry", | 155     "//ui/gfx/geometry", | 
| 151   ] | 156   ] | 
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 235     } | 240     } | 
| 236 | 241 | 
| 237     # TODO(xhwang): This is needed for AVDA to access the CDM directly. | 242     # TODO(xhwang): This is needed for AVDA to access the CDM directly. | 
| 238     # Remove this dependency after VDAs are also running as part of the mojo | 243     # Remove this dependency after VDAs are also running as part of the mojo | 
| 239     # media service. See http://crbug.com/522298 | 244     # media service. See http://crbug.com/522298 | 
| 240     if (mojo_media_host == "gpu") { | 245     if (mojo_media_host == "gpu") { | 
| 241       deps += [ "//media:cdm_manager" ] | 246       deps += [ "//media:cdm_manager" ] | 
| 242     } | 247     } | 
| 243   } | 248   } | 
| 244 | 249 | 
| 245   if (is_chromeos || is_win) { |  | 
| 246     sources += [ |  | 
| 247       "accelerated_video_decoder.h", |  | 
| 248       "h264_decoder.cc", |  | 
| 249       "h264_decoder.h", |  | 
| 250       "h264_dpb.cc", |  | 
| 251       "h264_dpb.h", |  | 
| 252     ] |  | 
| 253   } |  | 
| 254   if (is_chromeos) { | 250   if (is_chromeos) { | 
| 255     sources += [ | 251     sources += [ | 
| 256       "vp8_decoder.cc", | 252       "vp8_decoder.cc", | 
| 257       "vp8_decoder.h", | 253       "vp8_decoder.h", | 
| 258       "vp8_picture.cc", | 254       "vp8_picture.cc", | 
| 259       "vp8_picture.h", | 255       "vp8_picture.h", | 
| 260       "vp9_decoder.cc", | 256       "vp9_decoder.cc", | 
| 261       "vp9_decoder.h", | 257       "vp9_decoder.h", | 
| 262       "vp9_picture.cc", | 258       "vp9_picture.cc", | 
| 263       "vp9_picture.h", | 259       "vp9_picture.h", | 
| (...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 558     ] | 554     ] | 
| 559     if (use_x11) { | 555     if (use_x11) { | 
| 560       deps += [ "//ui/gfx/x" ] | 556       deps += [ "//ui/gfx/x" ] | 
| 561     } | 557     } | 
| 562     if (use_ozone) { | 558     if (use_ozone) { | 
| 563       deps += [ "//ui/ozone" ] | 559       deps += [ "//ui/ozone" ] | 
| 564     } | 560     } | 
| 565   } | 561   } | 
| 566 } | 562 } | 
| 567 | 563 | 
|  | 564 source_set("unit_tests") { | 
|  | 565   testonly = true | 
|  | 566   deps = [ | 
|  | 567     "//base", | 
|  | 568     "//media/base:test_support", | 
|  | 569     "//media/gpu", | 
|  | 570     "//testing/gmock", | 
|  | 571     "//testing/gtest", | 
|  | 572   ] | 
|  | 573   sources = [ | 
|  | 574     "h264_decoder_unittest.cc", | 
|  | 575   ] | 
|  | 576 | 
|  | 577   if (is_android) { | 
|  | 578     deps += [ | 
|  | 579       # The test needs the java dependencies to add the java classes for their | 
|  | 580       # native counterparts to the test apk. | 
|  | 581       ":android_video_decode_accelerator_unittests", | 
|  | 582       "//media/base/android:media_java", | 
|  | 583       "//ui/android:ui_java", | 
|  | 584     ] | 
|  | 585   } | 
|  | 586 } | 
|  | 587 | 
| 568 test("video_decode_accelerator_service_unittest") { | 588 test("video_decode_accelerator_service_unittest") { | 
| 569   sources = [ | 589   sources = [ | 
| 570     "ipc/service/gpu_jpeg_decode_accelerator_unittest.cc", | 590     "ipc/service/gpu_jpeg_decode_accelerator_unittest.cc", | 
| 571   ] | 591   ] | 
| 572 | 592 | 
| 573   deps = [ | 593   deps = [ | 
| 574     ":gpu", | 594     ":gpu", | 
| 575     "//base", | 595     "//base", | 
| 576     "//base/test:run_all_unittests", | 596     "//base/test:run_all_unittests", | 
| 577     "//base/test:test_support", | 597     "//base/test:test_support", | 
| 578     "//gpu:test_support", | 598     "//gpu:test_support", | 
| 579     "//media/gpu/ipc/common", | 599     "//media/gpu/ipc/common", | 
| 580     "//media/gpu/ipc/service", | 600     "//media/gpu/ipc/service", | 
| 581     "//testing/gmock", | 601     "//testing/gmock", | 
| 582     "//testing/gtest", | 602     "//testing/gtest", | 
| 583     "//ui/gfx:test_support", | 603     "//ui/gfx:test_support", | 
| 584     "//ui/gfx/geometry", | 604     "//ui/gfx/geometry", | 
| 585   ] | 605   ] | 
| 586 } | 606 } | 
| OLD | NEW | 
|---|