Update ffmpeg binaries directories to support variants based off the target architecture.

BUG=20948
TEST=none

Review URL: http://codereview.chromium.org/215016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26630 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 49 insertions, 35 deletions

diff --git a/DEPS b/DEPS
index a070643..5231278 100644
--- a/DEPS
+++ b/DEPS
@@ -2,6 +2,7 @@ vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
   "webkit_revision": "48500",
+  "ffmpeg_revision": "26428",
 }
 
 deps = {
@@ -94,8 +95,8 @@ deps_os = {
     "src/third_party/python_24":
       "/trunk/deps/third_party/python_24@22967",
 
-    "src/third_party/ffmpeg/binaries/chromium":
-      "/trunk/deps/third_party/ffmpeg/binaries/win@25436",
+    "src/third_party/ffmpeg/binaries/chromium/win/ia32":
+      "/trunk/deps/third_party/ffmpeg/binaries/win@" + Var("ffmpeg_revision"),
 
     "src/third_party/pthreads-win32":
       "/trunk/deps/third_party/pthreads-win32@26337",
@@ -109,15 +110,31 @@ deps_os = {
       Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
     "src/third_party/WebKit/WebKitLibraries":
       Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
-    "src/third_party/ffmpeg/binaries/chromium":
-      "/trunk/deps/third_party/ffmpeg/binaries/mac@25436",
+
+    "src/third_party/ffmpeg/binaries/chromium/mac/ia32":
+      "/trunk/deps/third_party/ffmpeg/binaries/mac@" + Var("ffmpeg_revision"),
+    "src/third_party/ffmpeg/binaries/chromium/mac/ia32_dbg":
+      "/trunk/deps/third_party/ffmpeg/binaries/mac_dbg@" +
+      Var("ffmpeg_revision"),
   },
   "unix": {
     # Linux, really.
     "src/third_party/xdg-utils":
       "/trunk/deps/third_party/xdg-utils@26314",
-    "src/third_party/ffmpeg/binaries/chromium":
-      "/trunk/deps/third_party/ffmpeg/binaries/linux@25436",
+
+    "src/third_party/ffmpeg/binaries/chromium/linux/ia32":
+      "/trunk/deps/third_party/ffmpeg/binaries/linux@" +
+      Var("ffmpeg_revision"),
+    "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg":
+      "/trunk/deps/third_party/ffmpeg/binaries/linux_dbg@" +
+      Var("ffmpeg_revision"),
+
+    "src/third_party/ffmpeg/binaries/chromium/linux/x64":
+      "/trunk/deps/third_party/ffmpeg/binaries/linux_64@" +
+      Var("ffmpeg_revision"),
+    "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg":
+      "/trunk/deps/third_party/ffmpeg/binaries/linux_64_dbg@" +
+      Var("ffmpeg_revision"),
   },
 }
 
diff --git a/build/common.gypi b/build/common.gypi
index 78c62ad..23b5173 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -35,6 +35,9 @@
       # builds).
       'buildtype%': 'Dev',
 
+      # The architecture that we're building on.
+      'target_arch%': 'ia32',
+
       # We do want to build Chromium with Breakpad support in certain
       # situations. I.e. for Chrome bot.
       'linux_chromium_breakpad%': 0,
@@ -44,6 +47,7 @@
     # variables sub-dict above, unless overridden.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
+    'target_arch%': '<(target_arch)',
 
     # Override chromium_mac_pch and set it to 0 to suppress the use of
     # precompiled headers on the Mac.  Prefix header injection may still be
@@ -114,9 +118,6 @@
     # but that doesn't work as we'd like.
     'msvs_debug_link_incremental%': '2',
 
-    # The architecture that we're building on.
-    'target_arch%': 'ia32',
-
     # By default linux does not use views. To turn on views in Linux
     # set the variable GYP_DEFINES to "toolkit_views=1", or modify
     # ~/.gyp/include.gypi .
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 09d1e70..1ac3e76 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3241,10 +3241,13 @@
               'copies': [
                 {
                   'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS',
+                  # TODO(ajwong): This, and the parallel chromium stanza below
+                  # really should find a way to share file paths with
+                  # ffmpeg.gyp so they don't diverge.
                   'files': [
-                    '../third_party/ffmpeg/binaries/chrome/libavcodec.52.dylib',
-                    '../third_party/ffmpeg/binaries/chrome/libavformat.52.dylib',
-                    '../third_party/ffmpeg/binaries/chrome/libavutil.50.dylib',
+                    '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavcodec.52.dylib',
+                    '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavformat.52.dylib',
+                    '../third_party/ffmpeg/binaries/chrome/mac/ia32/libavutil.50.dylib',
                   ],
                 },
               ],
@@ -3257,9 +3260,9 @@
                 {
                   'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS',
                   'files': [
-                    '../third_party/ffmpeg/binaries/chromium/libavcodec.52.dylib',
-                    '../third_party/ffmpeg/binaries/chromium/libavformat.52.dylib',
-                    '../third_party/ffmpeg/binaries/chromium/libavutil.50.dylib',
+                    '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavcodec.52.dylib',
+                    '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavformat.52.dylib',
+                    '../third_party/ffmpeg/binaries/chromium/mac/ia32/libavutil.50.dylib',
                   ],
                 },
               ],
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 83bf3be..3a3a1db 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -506,14 +506,6 @@
               ['target_arch=="x64"', {
                 'deb_arch': 'amd64',
                 'rpm_arch': 'x86_64',
-                # TODO(mmoss) The ffmpeg libs are currently 32-bit only. Once
-                # we have 64-bit, this will need to copy the correct versions
-                # to the build output.
-                'input_files!': [
-                  '<(PRODUCT_DIR)/libavcodec.so.52',
-                  '<(PRODUCT_DIR)/libavformat.so.52',
-                  '<(PRODUCT_DIR)/libavutil.so.50',
-                ],
               }],
             ],
           },
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index fb01b84..b02c593 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -14,6 +14,7 @@
     # Allow overridding the selection of which ffmpeg binaries to copy via an
     # environment variable.  Affects the ffmpeg_binaries target.
     'ffmpeg_branding%': '<(branding)',
+    'ffmpeg_variant%': '<(target_arch)',
 
     'use_system_ffmpeg%': 0,
   },
@@ -190,9 +191,9 @@
       'variables': {
         'conditions': [
           [ 'ffmpeg_branding=="Chrome"', {
-               'branding_dir': 'chrome',
-          }, { # else ffmpeg_branding!="Chrome"
-               'branding_dir': 'chromium',
+            'ffmpeg_bin_dir': 'chrome/<(OS)/<(ffmpeg_variant)',
+          }, {  # else ffmpeg_branding!="Chrome", assume chromium.
+            'ffmpeg_bin_dir': 'chromium/<(OS)/<(ffmpeg_variant)',
           }],
         ],
       },
@@ -200,9 +201,9 @@
         ['OS=="win"', {
           'variables': {
             'source_files': [
-              'binaries/<(branding_dir)/avcodec-52.dll',
-              'binaries/<(branding_dir)/avformat-52.dll',
-              'binaries/<(branding_dir)/avutil-50.dll',
+              'binaries/<(ffmpeg_bin_dir)/avcodec-52.dll',
+              'binaries/<(ffmpeg_bin_dir)/avformat-52.dll',
+              'binaries/<(ffmpeg_bin_dir)/avutil-50.dll',
             ],
           },
           'dependencies': ['../../build/win/system.gyp:cygwin'],
@@ -211,9 +212,9 @@
             ['use_system_ffmpeg==0', {
               'variables': {
                 'source_files': [
-                  'binaries/<(branding_dir)/libavcodec.so.52',
-                  'binaries/<(branding_dir)/libavformat.so.52',
-                  'binaries/<(branding_dir)/libavutil.so.50',
+                  'binaries/<(ffmpeg_bin_dir)/libavcodec.so.52',
+                  'binaries/<(ffmpeg_bin_dir)/libavformat.so.52',
+                  'binaries/<(ffmpeg_bin_dir)/libavutil.so.50',
                 ],
               },
             }, {
@@ -225,9 +226,9 @@
         ], ['OS=="mac"', {
               'variables': {
                 'source_files': [
-                  'binaries/<(branding_dir)/libavcodec.52.dylib',
-                  'binaries/<(branding_dir)/libavformat.52.dylib',
-                  'binaries/<(branding_dir)/libavutil.50.dylib',
+                  'binaries/<(ffmpeg_bin_dir)/libavcodec.52.dylib',
+                  'binaries/<(ffmpeg_bin_dir)/libavformat.52.dylib',
+                  'binaries/<(ffmpeg_bin_dir)/libavutil.50.dylib',
                 ],
               },
         }],