Bug 1869332 - Move libaom to libgkcodecs. r=glandium,media-playback-r…

…eviewers,chunmin Differential Revision: https://phabricator.services.mozilla.com/D196058
dothq · Dec 13, 2023 · 9b4c4a5 · 9b4c4a5
1 parent e772c19
commit 9b4c4a5
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 7 deletions.
diff --git a/CLOBBER b/CLOBBER
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Modified build files in third_party/libwebrtc - Bug 1864008 - Move libvpx to libgkcodecs
+Bug 1869332 - Move libaom to libgkcodecs
diff --git a/config/external/gkcodecs/gkcodecs.symbols b/config/external/gkcodecs/gkcodecs.symbols
@@ -102,3 +102,52 @@ vpx_img_alloc
 vpx_img_free
 vpx_img_wrap
 #endif
+aom_codec_av1_cx
+aom_codec_av1_dx
+aom_codec_build_config
+aom_codec_control_
+aom_codec_dec_init_ver
+aom_codec_decode
+aom_codec_destroy
+aom_codec_destroy
+aom_codec_enc_config_default
+aom_codec_enc_init_ver
+aom_codec_encode
+aom_codec_err_to_string
+aom_codec_error
+aom_codec_error_detail
+aom_codec_get_caps
+aom_codec_get_cx_data
+aom_codec_get_frame
+aom_codec_peek_stream_info
+aom_codec_version
+aom_codec_version_str
+aom_img_plane_height
+aom_img_plane_width
+aom_img_wrap
+av1_get_quantizer
+av1_initialize_enc
+av1_convert_sect5obus_to_annexb
+timebase_units_to_ticks
+ticks_to_timebase_units
+av1_copy_new_frame_enc
+av1_quantizer_to_qindex
+av1_get_compressed_data
+av1_set_active_map
+av1_get_preview_raw_frame
+av1_apply_encoding_flags
+av1_remove_compressor
+av1_create_compressor
+av1_get_active_map
+av1_qindex_to_quantizer
+av1_set_internal_size
+av1_copy_reference_enc
+av1_get_last_show_frame
+av1_receive_raw_frame
+write_obu_header
+av1_set_reference_enc
+av1_change_config
+av1_get_global_headers
+write_uleb_obu_size
+av1_use_as_reference
+aom_img_free
diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
@@ -1025,6 +1025,9 @@ system_headers = [
     "vpx/vpx_frame_buffer.h",
     "vpx/vpx_image.h",
     "vpx_mem/vpx_mem.h",
+    "aom/aom_image.h",
+    "aom/aomdx.h",
+    "aom/aom_decoder.h",
 ]
 
 if CONFIG["MOZ_X11"]:

diff --git a/dom/media/platforms/agnostic/AOMDecoder.cpp b/dom/media/platforms/agnostic/AOMDecoder.cpp
@@ -13,8 +13,8 @@
 #include "ImageContainer.h"
 #include "MediaResult.h"
 #include "TimeUnits.h"
-#include "aom/aom_image.h"
-#include "aom/aomdx.h"
+#include <aom/aom_image.h>
+#include <aom/aomdx.h>
 #include "gfx2DGlue.h"
 #include "gfxUtils.h"
 #include "mozilla/PodOperations.h"

diff --git a/dom/media/platforms/agnostic/AOMDecoder.h b/dom/media/platforms/agnostic/AOMDecoder.h
@@ -10,7 +10,7 @@
 
 #  include "PerformanceRecorder.h"
 #  include "PlatformDecoderModule.h"
-#  include "aom/aom_decoder.h"
+#  include <aom/aom_decoder.h>
 #  include "mozilla/Span.h"
 #  include "VideoUtils.h"
 

diff --git a/image/decoders/nsAVIFDecoder.cpp b/image/decoders/nsAVIFDecoder.cpp
@@ -8,7 +8,7 @@
 
 #include "nsAVIFDecoder.h"
 
-#include "aom/aomdx.h"
+#include <aom/aomdx.h>
 
 #include "DAV1DDecoder.h"
 #include "gfxPlatform.h"

diff --git a/image/decoders/nsAVIFDecoder.h b/image/decoders/nsAVIFDecoder.h
@@ -14,7 +14,7 @@
 #include "SampleIterator.h"
 #include "SurfacePipe.h"
 
-#include "aom/aom_decoder.h"
+#include <aom/aom_decoder.h>
 #include "dav1d/dav1d.h"
 
 #include "mozilla/Telemetry.h"

diff --git a/media/libaom/moz.build b/media/libaom/moz.build
@@ -73,7 +73,8 @@ else:
 # We allow warnings for third-party code that can be updated from upstream.
 AllowCompilerWarnings()
 
-FINAL_LIBRARY = 'gkmedias'
+FINAL_LIBRARY = 'gkcodecs'
+NoVisibilityFlags()
 
 if CONFIG['OS_TARGET'] == 'Android':
     # Older versions of the Android NDK don't pre-define anything to indicate