commit 7bf160e6d5c4cfdbfba5262d24ecaa0276e4927b
author Mike Reed <reed@google.com> Fri May 17 16:50:51 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri May 17 21:25:48 2019 +0000
tree 5a37948f51dc6d3d21d375844229b0ca5331a396
parent 76346ac952c4006b41bbc8fd5a41c22a8b6e43b1

Revert "Revert "Experimental SkVideoDecoder, to wrap calls to ffmpeg""

fix google3 build (don't build the new gm)

This reverts commit 9cc53fa4bdf2c5c52463b8bf932a01fe04ff6d82.

Change-Id: I3de8aa4959f62a380f1d4aaf2b788d250775e194
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214442
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 87075af..42388de 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -21,6 +21,7 @@
   skia_use_angle = false
   skia_use_egl = false
   skia_use_expat = true
+  skia_use_ffmpeg = false
   skia_use_fontconfig = is_linux
   skia_use_fonthost_mac = is_mac
   skia_use_freetype = is_android || is_fuchsia || is_linux
@@ -1622,6 +1623,20 @@
     ]
   }
 
+  if (skia_use_ffmpeg) {
+    test_lib("video_decoder") {
+      sources = [
+        "experimental/ffmpeg/SkVideoDecoder.cpp",
+        "experimental/ffmpeg/SkVideoDecoder.h",
+      ]
+      libs = [
+        "avcodec",
+        "avformat",
+        "avutil",
+      ]
+    }
+  }
+
   import("gn/gm.gni")
   test_lib("gm") {
     sources = gm_sources
@@ -1638,6 +1653,11 @@
     public_deps = [
       ":gpu_tool_utils",
     ]
+
+    if (skia_use_ffmpeg) {
+      deps += [ ":video_decoder" ]
+      sources += [ "gm/video_decoder.cpp" ]
+    }
   }
 
   import("gn/tests.gni")