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

Jump to bottom

Libva header fix #54

Closed
wants to merge 2 commits into from
Closed

Libva header fix #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fff614e
Updated Flags to fix build error.
ankithbti52509 Jun 13, 2024
82b4ee7
Add libva_headers to address build issue
JeevakaPrabu Oct 17, 2024
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: 2 additions & 2 deletions _studio/mfx_lib/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ LOCAL_CFLAGS_32 := $(MFX_CFLAGS_INTERNAL_32)

LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_HEADER_LIBRARIES := libmfx_headers libva_headers
LOCAL_WHOLE_STATIC_LIBRARIES := $(MFX_LOCAL_STATIC_LIBRARIES_HW)
LOCAL_SHARED_LIBRARIES := libva

Expand Down Expand Up @@ -334,7 +334,7 @@ LOCAL_CFLAGS_64 := $(MFX_CFLAGS_INTERNAL_64)

LOCAL_LDFLAGS := $(MFX_LOCAL_LDFLAGS_HW)

LOCAL_HEADER_LIBRARIES := libmfx_headers
LOCAL_HEADER_LIBRARIES := libmfx_headers libva_headers
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi Jeevaka, could you please share where libva_headers is declared in MediaSDK? I don't see it in this change. By the way, why do we need this change here? Is it for the compiling issue on Android 15?

Thanks,
Tianmi

LOCAL_WHOLE_STATIC_LIBRARIES := $(MFX_LOCAL_STATIC_LIBRARIES_HW)
LOCAL_SHARED_LIBRARIES := libva

Expand Down
2 changes: 1 addition & 1 deletion _studio/shared/include/mfx_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ template <class F>
struct result_of;

template <typename TRes, typename... TArgs>
struct result_of<TRes(TArgs...)> : std::result_of<TRes(TArgs...)> {};
struct result_of<TRes(TArgs...)> {};

template <typename TRes, typename... TArgs>
struct result_of<TRes(*const&)(TArgs...)>
Expand Down
3 changes: 3 additions & 0 deletions android/mfx_defs.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ MEDIA_VERSION_ALL := $(MEDIA_VERSION).pre$(MEDIA_VERSION_EXTRA)
MFX_CFLAGS += -DMEDIA_VERSION_STR=\"\\\"${MEDIA_VERSION_ALL}\\\"\"

# Android version preference:
ifneq ($(filter 15 15.% V% ,$(PLATFORM_VERSION)),)
MFX_ANDROID_VERSION:= MFX_V
endif
ifneq ($(filter 14 14.% U% ,$(PLATFORM_VERSION)),)
MFX_ANDROID_VERSION:= MFX_U
endif
Expand Down