Backed out 6 changesets (bug 1869332) for causing build bustages. CLO…

…SED TREE

Backed out changeset 4f8c19f9dfcf (bug 1869332)
Backed out changeset 661e520c2991 (bug 1869332)
Backed out changeset 74e2acabc439 (bug 1869332)
Backed out changeset 1c4b5311ac03 (bug 1869332)
Backed out changeset af22bc552759 (bug 1869332)
Backed out changeset f557e130d997 (bug 1869332)

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.
 
-Bug 1869332 - Move libaom to libgkcodecs
+Modified build files in third_party/libwebrtc - Bug 1864008 - Move libvpx to libgkcodecs

config/external/gkcodecs/gkcodecs.symbols

@@ -102,52 +102,3 @@ 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

config/system-headers.mozbuild

@@ -1025,9 +1025,6 @@ 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"]:

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"

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"
 

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"

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"

media/ffvpx/config_components_audio_video.h

@@ -800,7 +800,7 @@
 #define CONFIG_ILBC_AT_ENCODER 0
 #define CONFIG_PCM_ALAW_AT_ENCODER 0
 #define CONFIG_PCM_MULAW_AT_ENCODER 0
-#define CONFIG_LIBAOM_AV1_ENCODER 1
+#define CONFIG_LIBAOM_AV1_ENCODER 0
 #define CONFIG_LIBCODEC2_ENCODER 0
 #define CONFIG_LIBFDK_AAC_ENCODER 0
 #define CONFIG_LIBGSM_ENCODER 0

media/ffvpx/libavcodec/codec_list.c

@@ -55,8 +55,5 @@ static const FFCodec * const codec_list[] = {
 #endif
 #if CONFIG_LIBVPX_VP9_ENCODER
     &ff_libvpx_vp9_encoder,
-#endif
-#if CONFIG_LIBAOM_AV1_ENCODER
-    &ff_libaom_av1_encoder,
 #endif
     NULL };