Bug 1750663 [Linux] Move mozva library and va headers to media directory r=alwu,media-playback-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D136596
2022-01-24 10:19:51 +00:00 · 2022-01-24 10:19:51 +00:00 · 7b0c28a7d1
commit 7b0c28a7d1
parent 748da20408
17 changed files with 10 additions and 9 deletions
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@ -157,6 +157,7 @@ media/libvorbis/.*
 media/libvpx/.*
 media/libwebp/.*
 media/libyuv/.*
+media/mozva/va/.*
 media/openmax_dl/.*
 media/openmax_il/.*
 media/webrtc/signaling/src/sdp/sipcc/.*
--- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
+++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
@ -12,7 +12,7 @@ UNIFIED_SOURCES += [
 ]
 LOCAL_INCLUDES += [
    '..',
-    '/media/ffvpx',
+    '/media/mozva',
    'include',
 ]

--- a/dom/media/platforms/ffmpeg/ffvpx/moz.build
+++ b/dom/media/platforms/ffmpeg/ffvpx/moz.build
@ -21,7 +21,7 @@ SOURCES += [
 LOCAL_INCLUDES += [
    "..",
    "../ffmpeg58/include",
-    "/media/ffvpx",
+    "/media/mozva",
 ]

 CXXFLAGS += ["-Wno-deprecated-declarations"]
--- a/media/ffvpx/libavcodec/moz.build
+++ b/media/ffvpx/libavcodec/moz.build
@ -103,6 +103,7 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
        'vp9recon.c'
    ]
    if CONFIG['MOZ_WAYLAND']:
+        LOCAL_INCLUDES += ['/media/mozva']
        SOURCES += [
            'atsc_a53.c',
            'libdav1d.c',
--- a/media/ffvpx/libavutil/moz.build
+++ b/media/ffvpx/libavutil/moz.build
@ -60,6 +60,7 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
        'video_enc_params.c'
    ]
    if CONFIG["MOZ_WAYLAND"]:
+        LOCAL_INCLUDES += ['/media/mozva']
        SOURCES += [
            'hwcontext_vaapi.c',
            'mastering_display_metadata.c',
--- a/media/ffvpx/moz.build
+++ b/media/ffvpx/moz.build
@ -11,8 +11,3 @@ DIRS += [
    'libavutil',
    'libavcodec'
 ]
-
-if CONFIG['MOZ_WAYLAND']:
-    DIRS += [
-        'mozva',
-    ]
--- a/media/ffvpx/mozva/moz.build
+++ b/media/ffvpx/mozva/moz.build
@ -8,6 +8,4 @@ SOURCES += [
    'mozva.c',
 ]

-LOCAL_INCLUDES += ['/media/ffvpx']
-
 Library('mozva')
--- a/media/ffvpx/mozva/mozva.c
+++ b/media/ffvpx/mozva/mozva.c
--- a/media/mozva/va/README
+++ b/media/mozva/va/README
--- a/media/mozva/va/va.h
+++ b/media/mozva/va/va.h
--- a/media/mozva/va/va.patch
+++ b/media/mozva/va/va.patch
--- a/media/mozva/va/va_dec_av1.h
+++ b/media/mozva/va/va_dec_av1.h
--- a/media/mozva/va/va_dec_vp8.h
+++ b/media/mozva/va/va_dec_vp8.h
--- a/media/mozva/va/va_dec_vp9.h
+++ b/media/mozva/va/va_dec_vp9.h
--- a/media/mozva/va/va_version.h
+++ b/media/mozva/va/va_version.h
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@ -193,3 +193,7 @@ if CONFIG['ENABLE_TESTS']:

 if CONFIG['FUZZING']:
    DIRS += ['/tools/fuzzing']
+
+if CONFIG['MOZ_WAYLAND']:
+    DIRS += ['/media/mozva']
+
--- a/tools/rewriting/ThirdPartyPaths.txt
+++ b/tools/rewriting/ThirdPartyPaths.txt
@ -119,6 +119,7 @@ media/libvorbis/
 media/libvpx/
 media/libwebp/
 media/libyuv/
+media/mozva/va
 media/mp4parse-rust/
 media/openmax_dl/
 media/openmax_il/