Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ffmpeg compilation for rtd1296 architecture #3119

Closed
wants to merge 4 commits into from
Closed

Fix ffmpeg compilation for rtd1296 architecture #3119

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3249405
[FFMPEG] Fix compilation for rtd1296 (except x264)
m4tt075 Jan 11, 2018
6f1a7d6
[FFMPEG] Fix x264 compilation for rdt1296
m4tt075 Jan 20, 2018
db2261c
[FFMPEG] Enable neon for ARMv7 and ARMv8 and increment SPK version
m4tt075 Jan 21, 2018
4f3523f
[FFMPEG] Upgrade nasm to 2.13.02 to fix x264 compilation on x86 and x…
m4tt075 Jan 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cross/ffmpeg/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ ifeq ($(findstring $(ARCH),$(ARM7_ARCHES)),$(ARCH))
CONFIGURE_ARGS += --arch=arm --disable-neon --disable-armv6 --disable-armv6t2 --disable-vfp --disable-armv5te --disable-yasm --disable-asm
endif

ifeq ($(findstring $(ARCH),$(ARM8_ARCHES)),$(ARCH))
CONFIGURE_ARGS += --arch=arm64 --disable-neon --disable-yasm --disable-asm
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the disable-nepn required? Because Neon can make a huge performance impact, as far as I know from general programming. It's like SSE2/3 of ARM, so it seems very important on low power devices and I'm pretty sure this platform should support it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to https://developer.arm.com/technologies/neon we should consider NEON is available for both ARMv7 and ARMv8.
I propose to give a try to remove --disable-neon flag for these two architecture.
May you please build for rtd1297 this PR and submit to requester for "beta" testing ?

endif

ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH))
DEPENDS += native/yasm
ENV += PATH=$(YASM_PATH):$$PATH
Expand Down
4 changes: 4 additions & 0 deletions cross/libvpx/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ ifeq ($(findstring $(ARCH),$(ARM7_ARCHES)),$(ARCH))
CONFIGURE_ARGS += --target=armv7-linux-gcc
endif

ifeq ($(findstring $(ARCH),$(ARM8_ARCHES)),$(ARCH))
CONFIGURE_ARGS += --target=armv8-linux-gcc
endif

ifeq ($(findstring $(ARCH),$(x86_ARCHES)),$(ARCH))
DEPENDS += native/yasm
ENV += PATH=$(YASM_PATH):$$PATH
Expand Down
10 changes: 7 additions & 3 deletions cross/x264/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = x264
PKG_VERS = 20170730-2245-stable
PKG_VERS = 20180119-2245-stable
PKG_EXT = tar.bz2
PKG_DIST_NAME = $(PKG_NAME)-snapshot-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://download.videolan.org/x264/snapshots
Expand All @@ -19,11 +19,16 @@ CONFIGURE_ARGS = --enable-shared --prefix=$(INSTALL_PREFIX) --enable-pic --cross

include ../../mk/spksrc.cross-cc.mk

ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH))
ifeq ($(findstring $(ARCH), $(ARM5_ARCHES) $(ARM7_ARCHES)),$(ARCH))
ENV += x264_ARCH=ARM
CONFIGURE_ARGS += --disable-asm
endif

ifeq ($(findstring $(ARCH), $(ARM8_ARCHES)),$(ARCH))
ENV += x264_ARCH=aarch64
CONFIGURE_ARGS += --disable-asm --host=arm-linux
endif

ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH))
ENV += x264_ARCH=PPC
CONFIGURE_ARGS += --disable-asm
Expand All @@ -42,4 +47,3 @@ ENV += AS=$(YASM_PATH)/yasm
ENV += PATH=$(YASM_PATH):$$PATH
ENV += x264_ARCH=X86
endif

2 changes: 1 addition & 1 deletion cross/x264/PLIST
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
bin:bin/x264
lnk:lib/libx264.so
lib:lib/libx264.so.148
lib:lib/libx264.so.152
6 changes: 3 additions & 3 deletions cross/x264/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
x264-snapshot-20170730-2245-stable.tar.bz2 SHA1 115c685bb6d8e1155a53e9c925d4975e0493ae95
x264-snapshot-20170730-2245-stable.tar.bz2 SHA256 241b934ff8670905f9a707ddfc12589342a9ca27bcb883dc2a4f0de9d9789be3
x264-snapshot-20170730-2245-stable.tar.bz2 MD5 ccdf7e4d4a1320ea40430859a776c7e3
x264-snapshot-20180119-2245-stable.tar.bz2 SHA1 d83830aa5f463e88470b0bc2242ad66713e90fa9
x264-snapshot-20180119-2245-stable.tar.bz2 SHA256 32b54ad52ee29c82be3882b8907d0177832ec0aaa78210dd88f46784f771b04f
x264-snapshot-20180119-2245-stable.tar.bz2 MD5 7d570eb07c531217c9af917949443df3
5 changes: 5 additions & 0 deletions cross/x265/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ CMAKE_ARGS += -DCMAKE_CXX_FLAGS=-fPIC
CMAKE_ARGS += -DCMAKE_SYSTEM_PROCESSOR=armv7
endif

ifeq ($(findstring $(ARCH), $(ARM8_ARCHES)),$(ARCH))
CMAKE_ARGS += -DCMAKE_CXX_FLAGS=-fPIC
CMAKE_ARGS += -DCMAKE_SYSTEM_PROCESSOR=aarch64
endif

ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH))
CMAKE_ARGS += -DCMAKE_SYSTEM_PROCESSOR=ppc64
endif
Expand Down