Commit b884b516 authored by Paul Adenot's avatar Paul Adenot
Browse files

Bug 1889978 - Vendor ffmpeg master, after 7.0, update and reapply patch,... 

Bug 1889978 - Vendor ffmpeg master, after 7.0, update and reapply patch, remove old files, move bsf files into the bsf directory. r=media-playback-reviewers,alwu

This stubs out `libavcodec/dovi_rpu.h`.

Differential Revision: https://phabricator.services.mozilla.com/D206923
parent aba8d4f0

CLOBBER

+1 −1
Original line number Diff line number Diff line
@@ -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 1888181 - Vendor libwebrtc from 414c94290a
 
Bug 1889978 - Changed system header list

config/system-headers.mozbuild

+2 −0
Original line number Diff line number Diff line
@@ -412,6 +412,8 @@ system_headers = [ 
    "LFocusBox.h",

    "LGrafPortView.h",

    "LHandleStream.h",

    "libavutil/mem.h",

    "libavutil/cpu.h",

    "libc_r.h",

    "libelf.h",

    "libelf/libelf.h",

media/ffvpx/README_MOZILLA

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ Then, make sure the files: 
include conditional compilation directives, by probably reverting them (or

reverting and adjusting them if new codecs are added).



Revert and adjust libavcodec `dovi_rpu.h` so that it contains just the necessary

stubs to compile.



## Add headers for a new major ffmpeg version



If a new major version of ffmpeg is being imported in the tree, it's necessary

media/ffvpx/changes.patch

+61 −57
Original line number Diff line number Diff line 
diff --git a/media/ffvpx/libavutil/eval.c b/media/ffvpx/libavutil/eval.c

index 7642b91..e938bd5 100644

--- a/media/ffvpx/libavutil/eval.c

+++ b/media/ffvpx/libavutil/eval.c

@@ -34,7 +34,7 @@

 #include "internal.h"

 #include "log.h"

 #include "mathematics.h"

-#include "time.h"

+#include "fftime.h"

 #include "avstring.h"

 #include "timer.h"

 

diff --git a/media/ffvpx/libavutil/time.c b/media/ffvpx/libavutil/time.c

index dbaee02..69419e6 100644

--- a/media/ffvpx/libavutil/time.c

+++ b/media/ffvpx/libavutil/time.c

@@ -33,7 +33,7 @@

--- a/libavutil/time.c	2024-02-14 14:57:10.389087159 +0100

+++ b/libavutil/time.c	2024-04-05 14:43:19.097889433 +0200

@@ -28,17 +28,17 @@

 #endif

 #if HAVE_UNISTD_H

 #include <unistd.h>

 #endif

 #if HAVE_WINDOWS_H

 #include <windows.h>

 #endif
@@ -24,11 +14,19 @@ index dbaee02..69419e6 100644 
 #include "error.h"

 

 int64_t av_gettime(void)

diff --git a/media/ffvpx/libavutil/parseutils.c b/media/ffvpx/libavutil/parseutils.c

index 9fb8d0a..97ad3b9 100644

--- a/media/ffvpx/libavutil/parseutils.c

+++ b/media/ffvpx/libavutil/parseutils.c

@@ -28,7 +28,7 @@

 {

 #if HAVE_GETTIMEOFDAY

     struct timeval tv;

     gettimeofday(&tv, NULL);

     return (int64_t)tv.tv_sec * 1000000 + tv.tv_usec;

--- a/libavutil/parseutils.c	2024-03-26 14:03:12.080640731 +0100

+++ b/libavutil/parseutils.c	2024-04-05 14:44:56.508766832 +0200

@@ -23,20 +23,20 @@

 

 #include <time.h>

 

 #include "avstring.h"

 #include "avutil.h"

 #include "common.h"

 #include "eval.h"

 #include "log.h"
@@ -36,8 +34,22 @@ index 9fb8d0a..97ad3b9 100644 
+/* #include "random_seed.h" */

 #include "time_internal.h"

 #include "parseutils.h"

-#include "time.h"

+#include "fftime.h"

 

 #ifdef TEST

 

@@ -367,7 +367,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,

 #define av_get_random_seed av_get_random_seed_deterministic

 static uint32_t av_get_random_seed_deterministic(void);

 

 #define av_gettime() 1331972053200000

 

@@ -370,17 +370,17 @@

     av_strlcpy(color_string2, color_string + hex_offset,

                FFMIN(slen-hex_offset+1, sizeof(color_string2)));

     if ((tail = strchr(color_string2, ALPHA_SEP)))

         *tail++ = 0;

     len = strlen(color_string2);

     rgba_color[3] = 255;

 

     if (!av_strcasecmp(color_string2, "random") || !av_strcasecmp(color_string2, "bikeshed")) {
@@ -46,37 +58,29 @@ index 9fb8d0a..97ad3b9 100644 
         rgba_color[0] = rgba >> 24;

         rgba_color[1] = rgba >> 16;

         rgba_color[2] = rgba >> 8;

diff -up media/ffvpx/libavutil/fftime.h media/ffvpx/libavutil/fftime.h

--- media/ffvpx/libavutil/fftime.h	2021-12-06 14:51:40.378642713 +0100

+++ media/ffvpx/libavutil/fftime.h	2021-12-06 14:51:54.618098212 +0100

@@ -22,6 +22,7 @@

 #define AVUTIL_TIME_H

 

 #include <stdint.h>

+#include <time.h>

 

 /**

  * Get the current time in microseconds.

  *

diff --git a/media/ffvpx/compat/w32pthreads.h b/media/ffvpx/compat/w32pthreads.h

--- a/media/ffvpx/compat/w32pthreads.h

+++ b/media/ffvpx/compat/w32pthreads.h

@@ -39,17 +39,17 @@

 #include <windows.h>

 #include <process.h>

 #include <time.h>

 

 #include "libavutil/attributes.h"

 #include "libavutil/common.h"

 #include "libavutil/internal.h"

 #include "libavutil/mem.h"

-#include "libavutil/time.h"

+#include "libavutil/fftime.h"

 

 typedef struct pthread_t {

     void *handle;

     void *(*func)(void* arg);

     void *arg;

     void *ret;

 } pthread_t;

         rgba_color[3] = rgba;

     } else if (hex_offset ||

                strspn(color_string2, "0123456789ABCDEFabcdef") == len) {

         char *tail;

         unsigned int rgba = strtoul(color_string2, &tail, 16);

--- a/libavutil/eval.c	2024-04-05 14:40:56.917791496 +0200

+++ b/libavutil/eval.c	2024-04-05 17:39:45.061516936 +0200

@@ -31,17 +31,17 @@

 #include "avutil.h"

 #include "common.h"

 #include "eval.h"

 #include "ffmath.h"

 #include "log.h"

 #include "mathematics.h"

 #include "mem.h"

 #include "sfc64.h"

-#include "time.h"

+#include "fftime.h"

 #include "avstring.h"

 #include "reverse.h"

 

 typedef struct Parser {

     const AVClass *class;

     int stack_index;

     char *s;

     const double *const_values;

media/ffvpx/libavcodec/allcodecs.c

+2 −10
Original line number Diff line number Diff line
@@ -61,10 +61,6 @@ extern const FFCodec ff_avrn_decoder; 
extern const FFCodec ff_avs_decoder;

extern const FFCodec ff_avui_encoder;

extern const FFCodec ff_avui_decoder;

#if FF_API_AYUV_CODECID

extern const FFCodec ff_ayuv_encoder;

extern const FFCodec ff_ayuv_decoder;

#endif

extern const FFCodec ff_bethsoftvid_decoder;

extern const FFCodec ff_bfi_decoder;

extern const FFCodec ff_bink_decoder;
@@ -152,7 +148,6 @@ extern const FFCodec ff_h263p_encoder; 
extern const FFCodec ff_h263p_decoder;

extern const FFCodec ff_h263_v4l2m2m_decoder;

extern const FFCodec ff_h264_decoder;

extern const FFCodec ff_h264_crystalhd_decoder;

extern const FFCodec ff_h264_v4l2m2m_decoder;

extern const FFCodec ff_h264_mediacodec_decoder;

extern const FFCodec ff_h264_mediacodec_encoder;
@@ -211,13 +206,11 @@ extern const FFCodec ff_mpeg2video_encoder; 
extern const FFCodec ff_mpeg2video_decoder;

extern const FFCodec ff_mpeg4_encoder;

extern const FFCodec ff_mpeg4_decoder;

extern const FFCodec ff_mpeg4_crystalhd_decoder;

extern const FFCodec ff_mpeg4_v4l2m2m_decoder;

extern const FFCodec ff_mpeg4_mmal_decoder;

extern const FFCodec ff_mpegvideo_decoder;

extern const FFCodec ff_mpeg1_v4l2m2m_decoder;

extern const FFCodec ff_mpeg2_mmal_decoder;

extern const FFCodec ff_mpeg2_crystalhd_decoder;

extern const FFCodec ff_mpeg2_v4l2m2m_decoder;

extern const FFCodec ff_mpeg2_qsv_decoder;

extern const FFCodec ff_mpeg2_mediacodec_decoder;
@@ -228,7 +221,6 @@ extern const FFCodec ff_msmpeg4v2_encoder; 
extern const FFCodec ff_msmpeg4v2_decoder;

extern const FFCodec ff_msmpeg4v3_encoder;

extern const FFCodec ff_msmpeg4v3_decoder;

extern const FFCodec ff_msmpeg4_crystalhd_decoder;

extern const FFCodec ff_msp2_decoder;

extern const FFCodec ff_msrle_encoder;

extern const FFCodec ff_msrle_decoder;
@@ -365,7 +357,6 @@ extern const FFCodec ff_vbn_encoder; 
extern const FFCodec ff_vbn_decoder;

extern const FFCodec ff_vble_decoder;

extern const FFCodec ff_vc1_decoder;

extern const FFCodec ff_vc1_crystalhd_decoder;

extern const FFCodec ff_vc1image_decoder;

extern const FFCodec ff_vc1_mmal_decoder;

extern const FFCodec ff_vc1_qsv_decoder;
@@ -402,7 +393,6 @@ extern const FFCodec ff_wmv1_decoder; 
extern const FFCodec ff_wmv2_encoder;

extern const FFCodec ff_wmv2_decoder;

extern const FFCodec ff_wmv3_decoder;

extern const FFCodec ff_wmv3_crystalhd_decoder;

extern const FFCodec ff_wmv3image_decoder;

extern const FFCodec ff_wnv1_decoder;

extern const FFCodec ff_xan_wc3_decoder;
@@ -786,6 +776,8 @@ extern const FFCodec ff_libilbc_encoder; 
extern const FFCodec ff_libilbc_decoder;

extern const FFCodec ff_libjxl_decoder;

extern const FFCodec ff_libjxl_encoder;

extern const FFCodec ff_liblc3_encoder;

extern const FFCodec ff_liblc3_decoder;

extern const FFCodec ff_libmp3lame_encoder;

extern const FFCodec ff_libopencore_amrnb_encoder;

extern const FFCodec ff_libopencore_amrnb_decoder;