diff options
| author | Basilisk-Dev <basiliskdev@protonmail.com> | 2023-10-04 21:54:40 -0400 |
|---|---|---|
| committer | Basilisk-Dev <basiliskdev@protonmail.com> | 2023-10-04 22:11:29 -0400 |
| commit | 1b5b970a53b1424d03a0c17e01e997ac3aa338bd (patch) | |
| tree | 2cf59535ce18640ec51805eff4d171548769bf92 | |
| parent | bf6ed5545d1eb51b63e3e65cd378c78bfbf2d469 (diff) | |
| download | uxp-1b5b970a53b1424d03a0c17e01e997ac3aa338bd.tar.gz | |
Issue #2332 - libvpx upgrade followup part 5
Port commits 39f9ab375b2bfd9e46df9695b78870cf1e9cf3c6 and ed7b08e6089de2dd9a1cee595d9ff7ed1fae919d to new libvpx version
| -rw-r--r-- | media/libvpx/libvpx/vp8/encoder/onyx_if.c | 4 | ||||
| -rw-r--r-- | media/libvpx/moz.build | 25 |
2 files changed, 6 insertions, 23 deletions
diff --git a/media/libvpx/libvpx/vp8/encoder/onyx_if.c b/media/libvpx/libvpx/vp8/encoder/onyx_if.c index 9717feb136..648a616c9e 100644 --- a/media/libvpx/libvpx/vp8/encoder/onyx_if.c +++ b/media/libvpx/libvpx/vp8/encoder/onyx_if.c @@ -1413,6 +1413,10 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) { last_h = cpi->oxcf.Height; prev_number_of_layers = cpi->oxcf.number_of_layers; + if (cpi->initial_width) { + oxcf->multi_threaded = cpi->oxcf.multi_threaded; + } + cpi->oxcf = *oxcf; switch (cpi->oxcf.Mode) { diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build index 529d93741a..bcf4b7f74a 100644 --- a/media/libvpx/moz.build +++ b/media/libvpx/moz.build @@ -21,7 +21,7 @@ if CONFIG['CPU_ARCH'] == 'x86_64': elif CONFIG['OS_TARGET'] == 'Darwin': ASFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ] CFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ] - else: # Android, Linux, BSDs, etc. + else: # Linux, BSDs, etc. ASFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ] CFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ] elif CONFIG['CPU_ARCH'] == 'x86': @@ -33,7 +33,7 @@ elif CONFIG['CPU_ARCH'] == 'x86': elif CONFIG['OS_TARGET'] == 'Darwin': ASFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ] CFLAGS += [ '-I%s/media/libvpx/config/mac/ia32/' % TOPSRCDIR ] - else: # Android, Linux, BSDs, etc. + else: # Linux, BSDs, etc. ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ] CFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ] elif CONFIG['CPU_ARCH'] == 'arm': @@ -57,11 +57,6 @@ elif CONFIG['CPU_ARCH'] == 'arm': if f.endswith('.c') and 'neon' in f: SOURCES[f].flags += CONFIG['VPX_ASFLAGS'] - if CONFIG['OS_TARGET'] == 'Android': - # For cpu-features.h - LOCAL_INCLUDES += [ - '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK'], - ] if CONFIG['CLANG_CXX']: ASFLAGS += [ '-no-integrated-as', @@ -83,16 +78,6 @@ FINAL_LIBRARY = 'gkmedias' DEFINES['HAVE_CONFIG_H'] = 'vpx_config.h' -if CONFIG['OS_TARGET'] == 'Android': - # Older versions of the Android NDK don't pre-define anything to indicate - # the OS they're on, so do it for them. - DEFINES['__linux__'] = True - - if not CONFIG['MOZ_WEBRTC']: - SOURCES += [ - '%%%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'], - ] - if CONFIG['CLANG_CL'] or not CONFIG['_MSC_VER']: for f in SOURCES: if f.endswith('.c'): @@ -129,9 +114,3 @@ CFLAGS += [ '-I%s/media/libvpx/libvpx' % TOPSRCDIR, '-I%s/media/libvpx/config' % TOPSRCDIR, # vpx_version.h ] - -if CONFIG['OS_TARGET'] == 'Android': - # For LIBVPX_RAND - ASFLAGS += [ - '-D__ANDROID__' - ] |