Bug 1284803 part 5 - Enable JPEG r=jesup
authorSotaro Ikeda <sotaro.ikeda.g@gmail.com>
Mon, 25 Jul 2016 23:59:57 -0700
changeset 346695 8f4c3438f8445e98b99c9d46c1e188711f063df5
parent 346694 6e7013ad8460f6065b8ad1f636c10815bce28138
child 346696 df6e1dfde6e3778d34580182c9537bbfa09db550
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1284803
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1284803 part 5 - Enable JPEG r=jesup
media/libyuv/libyuv.gyp
media/libyuv/moz.build
--- a/media/libyuv/libyuv.gyp
+++ b/media/libyuv/libyuv.gyp
@@ -75,16 +75,24 @@
             ['target_arch != "arm64"', {
               'cflags': [
                 '-mfpu=neon',
                 # '-marm',  # arm32 not thumb
               ],
             }],
           ],
         }],
+        ['build_with_mozilla == 1', {
+          'defines': [
+            'HAVE_JPEG'
+          ],
+          'cflags_mozilla': [
+            '$(MOZ_JPEG_CFLAGS)',
+          ],
+        }],
         ['OS != "ios" and libyuv_disable_jpeg != 1 and build_with_mozilla != 1', {
           'defines': [
             'HAVE_JPEG'
           ],
           'conditions': [
             # Caveat system jpeg support may not support motion jpeg
             [ 'use_system_libjpeg == 1', {
               'dependencies': [
--- a/media/libyuv/moz.build
+++ b/media/libyuv/moz.build
@@ -6,16 +6,17 @@
 
 include('/build/gyp.mozbuild')
 
 GYP_DIRS += ['.']
 
 libyuv_non_unified_sources = [
     'source/convert.cc',
     'source/convert_from.cc',
+    'source/mjpeg_decoder.cc',
     'source/rotate_argb.cc',
     'source/row_common.cc',
     'source/scale.cc',
     'source/scale_common.cc',
 ]
 GYP_DIRS['.'].input = 'libyuv.gyp'
 GYP_DIRS['.'].variables = gyp_vars
 GYP_DIRS['.'].sandbox_vars['FINAL_LIBRARY'] = 'xul'