1148639 - Update libvpx

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Ralph Giles (:rillian)]

It's been a while since we updated libvpx, primarily because they haven't made a release. This bug is to update us to whatever commit chrome was using when I started this patch.

Comment 1

[Ralph Giles (:rillian)]

Attachment: Part 1 - Fix update.py and patches for new upstream.

Comment 2

[Ralph Giles (:rillian)]

Attachment: Part 2: Update libvpx

Result of running the new update script on commit afad1a84c15b9af8298a37c0fa449e0af40931fd.

Comment 3

[Ralph Giles (:rillian)]

Attachment: Part 2: Update libvpx v2

forgot to add new source files.

Comment 4

[Ralph Giles (:rillian)]

Attachment: Part 1 - Fix update.py and patches for new upstream v3

Move a couple of asm files which assume they're on x86_64.

Comment 5

[Ralph Giles (:rillian)]

Attachment: Part 2 - Update libvpx v3

Result of running the new update script.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

FYI, this doesn't build locally for me with MSVC2013.

Unified_c_media_libvpx7.c
Warning: C4005 in media\libvpx\vpx_config_x86_64-win64-vs12.h: 'HAVE_STDINT_H' : macro redefinition
media\libvpx\vpx_config_x86_64-win64-vs12.h(34) : warning C4005: 'HAVE_STDINT_H' : macro redefinition
        objdir-fx-64\media\libvpx\../../dist/include/mozilla-config.h(37) : see previous definition of 'HAVE_STDINT_H'
Unified_c_media_libvpx6.c
Warning: C4005 in media\libvpx\vpx_config_x86_64-win64-vs12.h: 'HAVE_STDINT_H' : macro redefinition
media\libvpx\vpx_config_x86_64-win64-vs12.h(34) : warning C4005: 'HAVE_STDINT_H' : macro redefinition
        objdir-fx-64\media\libvpx\../../dist/include/mozilla-config.h(37) : see previous definition of 'HAVE_STDINT_H'
media\libvpx\vp9\decoder\./vp9_thread.h(49) : error C2059: syntax error : 'type'
media\libvpx\vp9\decoder\./vp9_thread.h(62) : error C2143: syntax error : missing ')' before '('
media\libvpx\vp9\decoder\./vp9_thread.h(62) : error C2091: function returns function
media\libvpx\vp9\decoder\./vp9_thread.h(62) : error C2143: syntax error : missing ')' before ','

Comment 7

[jimbankoski]

Filed :  https://code.google.com/p/webm/issues/detail?id=986

To look into the issue.

Comment 8

[jimbankoski]

This isn't an issue with the libvpx build system. It has something to do with the include order in the c file : Unified_c_media_libvpx7.c 

We recommend someone familiar with the build system to further separate the libvpx sources.

Comment 9

[Ralph Giles (:rillian)]

(In reply to Ryan VanderMeulen [:RyanVM UTC-4] from comment #6)

> media\libvpx\vp9\decoder\./vp9_thread.h(49) : error C2059: syntax error :
> 'type'

Yeah, sorry, I should have been updating the bug. Was trying to remember how to build on windows to find a fix for that one. Jim's theory of unified build bustage is a likely one. There have been several similar issues with the updated code.

Comment 10

[Ralph Giles (:rillian)]

Attachment: Part 1 - Fix update.py and patches for new upstream v4

Rebase after bug 1061339.

Comment 11

[Ralph Giles (:rillian)]

Attachment: Part 2 - Update libvpx v4

Comment 12

[Ralph Giles (:rillian)]

Attachment: Part 3 - Disabled unified build

Disable unified build for all libvpx source files. This avoids problems with the previous patch set on MSVC and possible other miscompilation issues. f=derf from irc.

Comment 13

[Ralph Giles (:rillian)]

Green on try. https://treeherder.mozilla.org/#/jobs?repo=try&revision=c2be547c963c

Comment 14

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/8f2814bc943b
https://hg.mozilla.org/integration/mozilla-inbound/rev/7cfa6632f4ce
https://hg.mozilla.org/integration/mozilla-inbound/rev/7a16421424ad

Comment 15

[Ralph Giles (:rillian)]

Thanks for the review!

Comment 16

[Ryan VanderMeulen [:RyanVM]]

Touch CLOBBER.
https://hg.mozilla.org/integration/mozilla-inbound/rev/9f8939858166

Comment 17

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/8f2814bc943b
https://hg.mozilla.org/mozilla-central/rev/7cfa6632f4ce
https://hg.mozilla.org/mozilla-central/rev/7a16421424ad
https://hg.mozilla.org/mozilla-central/rev/9f8939858166