Bug 1750663 [Linux] Move mozva library and va headers to media direct…

…ory r=alwu,media-playback-reviewers Differential Revision: https://phabricator.services.mozilla.com/D136596
iaxat · Jan 24, 2022 · abf4251 · abf4251
1 parent 95de1ee
commit abf4251
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 9 deletions.
diff --git 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/.*

diff --git 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',
 ]
 

diff --git 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"]

diff --git 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',

diff --git 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',

diff --git a/media/ffvpx/moz.build b/media/ffvpx/moz.build
@@ -11,8 +11,3 @@ DIRS += [
     'libavutil',
     'libavcodec'
 ]
-
-if CONFIG['MOZ_WAYLAND']:
-    DIRS += [
-        'mozva',
-    ]
diff --git a/media/ffvpx/mozva/moz.build → media/mozva/moz.build b/media/ffvpx/mozva/moz.build → media/mozva/moz.build
@@ -8,6 +8,4 @@ SOURCES += [
     'mozva.c',
 ]
 
-LOCAL_INCLUDES += ['/media/ffvpx']
-
 Library('mozva')
diff --git a/media/ffvpx/mozva/mozva.c → media/mozva/mozva.c b/media/ffvpx/mozva/mozva.c → media/mozva/mozva.c
diff --git a/media/ffvpx/va/README → media/mozva/va/README b/media/ffvpx/va/README → media/mozva/va/README
diff --git a/media/ffvpx/va/va.h → media/mozva/va/va.h b/media/ffvpx/va/va.h → media/mozva/va/va.h
diff --git a/media/ffvpx/va/va.patch → media/mozva/va/va.patch b/media/ffvpx/va/va.patch → media/mozva/va/va.patch
diff --git a/media/ffvpx/va/va_dec_av1.h → media/mozva/va/va_dec_av1.h b/media/ffvpx/va/va_dec_av1.h → media/mozva/va/va_dec_av1.h
diff --git a/media/ffvpx/va/va_dec_vp8.h → media/mozva/va/va_dec_vp8.h b/media/ffvpx/va/va_dec_vp8.h → media/mozva/va/va_dec_vp8.h
diff --git a/media/ffvpx/va/va_dec_vp9.h → media/mozva/va/va_dec_vp9.h b/media/ffvpx/va/va_dec_vp9.h → media/mozva/va/va_dec_vp9.h
diff --git a/media/ffvpx/va/va_version.h → media/mozva/va/va_version.h b/media/ffvpx/va/va_version.h → media/mozva/va/va_version.h
diff --git 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']
+
diff --git 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/