summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk4
-rw-r--r--hypv-intercept/Android.mk2
-rw-r--r--libc2dcolorconvert/Android.mk3
-rw-r--r--libstagefrighthw/Android.mk3
-rw-r--r--libstagefrighthw/QComOMXMetadata.h2
-rw-r--r--mm-video-v4l2/vidc/common/Android.mk8
-rw-r--r--mm-video-v4l2/vidc/vdec/Android.mk18
-rw-r--r--mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h2
-rw-r--r--mm-video-v4l2/vidc/vdec/inc/omx_vdec.h1
-rw-r--r--mm-video-v4l2/vidc/vdec/inc/ts_parser.h1
-rw-r--r--mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp1
-rw-r--r--mm-video-v4l2/vidc/venc/Android.mk13
-rw-r--r--mm-video-v4l2/vidc/venc/inc/gpustats.h56
-rw-r--r--mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h19
14 files changed, 111 insertions, 22 deletions
diff --git a/Android.mk b/Android.mk
index 2602a804..8cd7b803 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,5 @@
+ifeq ($(call my-dir),$(call project-path-for,qcom-media))
+
QCOM_MEDIA_ROOT := $(call my-dir)
#Compile these for all targets under QCOM_BOARD_PLATFORMS list.
@@ -16,3 +18,5 @@ endif
include $(QCOM_MEDIA_ROOT)/hypv-intercept/Android.mk
endif
+
+endif
diff --git a/hypv-intercept/Android.mk b/hypv-intercept/Android.mk
index 00f066de..527d4cd7 100644
--- a/hypv-intercept/Android.mk
+++ b/hypv-intercept/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
hypv_intercept.cpp
-LOCAL_C_INCLUDES = $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc
+LOCAL_C_INCLUDES := $(call project-path-for,qcom-media)/mm-video-v4l2/vidc/common/inc
LOCAL_SHARED_LIBRARIES := liblog libdl
diff --git a/libc2dcolorconvert/Android.mk b/libc2dcolorconvert/Android.mk
index 9f5388d6..d88d8376 100644
--- a/libc2dcolorconvert/Android.mk
+++ b/libc2dcolorconvert/Android.mk
@@ -10,7 +10,7 @@ LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/qcom/display
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-LOCAL_SHARED_LIBRARIES := liblog libdl
+LOCAL_SHARED_LIBRARIES := liblog libdl libutils
LOCAL_MODULE_TAGS := optional
@@ -20,4 +20,5 @@ LOCAL_VENDOR_MODULE := true
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+LOCAL_HEADER_LIBRARIES += libhardware_headers
include $(BUILD_SHARED_LIBRARY)
diff --git a/libstagefrighthw/Android.mk b/libstagefrighthw/Android.mk
index 4979a21f..5d24d32b 100644
--- a/libstagefrighthw/Android.mk
+++ b/libstagefrighthw/Android.mk
@@ -48,6 +48,9 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libdl \
+LOCAL_HEADER_LIBRARIES := \
+ media_plugin_headers
+
LOCAL_MODULE := libstagefrighthw
LOCAL_VENDOR_MODULE := true
diff --git a/libstagefrighthw/QComOMXMetadata.h b/libstagefrighthw/QComOMXMetadata.h
index e6b4579e..f349c457 100644
--- a/libstagefrighthw/QComOMXMetadata.h
+++ b/libstagefrighthw/QComOMXMetadata.h
@@ -18,7 +18,7 @@
#ifndef QCOM_OMX_METADATA_H_
#define QCOM_OMX_METADATA_H_
-#include <system/window.h>
+#include <cutils/native_handle.h>
#include <media/hardware/MetadataBufferType.h>
namespace android {
diff --git a/mm-video-v4l2/vidc/common/Android.mk b/mm-video-v4l2/vidc/common/Android.mk
index 41321c5a..85f7c8ae 100644
--- a/mm-video-v4l2/vidc/common/Android.mk
+++ b/mm-video-v4l2/vidc/common/Android.mk
@@ -22,18 +22,22 @@ libmm-vidc-def += -D_ANDROID_ICS_
# ---------------------------------------------------------------------------------
libmm-vidc-inc := $(LOCAL_PATH)/inc
-libmm-vidc-inc += $(TOP)/hardware/qcom/media/mm-core/inc
+libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/mm-core/inc
libmm-vidc-inc += $(TARGET_OUT_HEADERS)/qcom/display
-libmm-vidc-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert
+libmm-vidc-inc += $(TOP)/$(call project-path-for,qcom-media)/libc2dcolorconvert
libmm-vidc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
LOCAL_MODULE := libOmxVidcCommon
LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
LOCAL_CFLAGS := $(libmm-vidc-def)
LOCAL_C_INCLUDES := $(libmm-vidc-inc)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
+LOCAL_HEADER_LIBRARIES := \
+ libutils_headers \
+ libhardware_headers \
LOCAL_SRC_FILES := src/extra_data_handler.cpp
LOCAL_SRC_FILES += src/vidc_color_converter.cpp
diff --git a/mm-video-v4l2/vidc/vdec/Android.mk b/mm-video-v4l2/vidc/vdec/Android.mk
index f4d462db..4abb8368 100644
--- a/mm-video-v4l2/vidc/vdec/Android.mk
+++ b/mm-video-v4l2/vidc/vdec/Android.mk
@@ -71,14 +71,14 @@ include $(CLEAR_VARS)
# Common Includes
libmm-vdec-inc := $(LOCAL_PATH)/inc
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/mm-core/inc
+libmm-vdec-inc += $(call project-path-for,qcom-media)/mm-video-v4l2/vidc/common/inc
+libmm-vdec-inc += $(call project-path-for,qcom-media)/mm-core/inc
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/qcom/display
libmm-vdec-inc += $(TARGET_OUT_HEADERS)/adreno
libmm-vdec-inc += $(TOP)/frameworks/native/include/media/openmax
libmm-vdec-inc += $(TOP)/frameworks/native/include/media/hardware
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/libc2dcolorconvert
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/hypv-intercept
+libmm-vdec-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
+libmm-vdec-inc += $(call project-path-for,qcom-media)/hypv-intercept
libmm-vdec-inc += frameworks/native/libs/nativewindow/include/
libmm-vdec-inc += frameworks/native/libs/arect/include/
libmm-vdec-inc += frameworks/native/libs/nativebase/include
@@ -88,7 +88,7 @@ libmm-vdec-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
ifeq ($(PLATFORM_SDK_VERSION), 18) #JB_MR2
libmm-vdec-def += -DANDROID_JELLYBEAN_MR2=1
-libmm-vdec-inc += $(TOP)/hardware/qcom/media/libstagefrighthw
+libmm-vdec-inc += $(call project-path-for,qcom-media)/libstagefrighthw
endif
# Common Dependencies
@@ -132,9 +132,13 @@ LOCAL_VENDOR_MODULE := true
LOCAL_CFLAGS := $(libmm-vdec-def) -Werror
LOCAL_C_INCLUDES += $(libmm-vdec-inc)
LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-vdec-add-dep)
+LOCAL_HEADER_LIBRARIES := \
+ libnativebase_headers \
+ libhardware_headers \
+ media_plugin_headers \
LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libutils
LOCAL_SHARED_LIBRARIES += libqdMetaData libhypv_intercept
@@ -166,7 +170,7 @@ LOCAL_C_INCLUDES += $(libmm-vdec-inc)
LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-vdec-add-dep)
LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := liblog libcutils
+LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
LOCAL_SHARED_LIBRARIES += libswvdec
LOCAL_SRC_FILES := src/omx_swvdec.cpp
diff --git a/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h b/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h
index a6502abd..083eb238 100644
--- a/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h
+++ b/mm-video-v4l2/vidc/vdec/inc/omx_swvdec_utils.h
@@ -42,7 +42,7 @@
#include <queue>
#include <pthread.h>
-#include <cutils/log.h>
+#include <log/log.h>
extern unsigned int g_omx_swvdec_logmask;
///< global OMX SwVdec logmask variable extern declaration
diff --git a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
index bcc61816..e32d79a8 100644
--- a/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
+++ b/mm-video-v4l2/vidc/vdec/inc/omx_vdec.h
@@ -68,7 +68,6 @@ static ptrdiff_t x;
//#include <binder/MemoryHeapIon.h>
//#else
#endif
-#include <ui/ANativeObjectBase.h>
extern "C" {
#include <utils/Log.h>
}
diff --git a/mm-video-v4l2/vidc/vdec/inc/ts_parser.h b/mm-video-v4l2/vidc/vdec/inc/ts_parser.h
index 2d5d1a40..6d576ad2 100644
--- a/mm-video-v4l2/vidc/vdec/inc/ts_parser.h
+++ b/mm-video-v4l2/vidc/vdec/inc/ts_parser.h
@@ -36,6 +36,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdio.h>
#include <inttypes.h>
+#include <pthread.h>
#ifdef _ANDROID_
extern "C" {
diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
index 2a3829c7..2ac3144b 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
@@ -54,6 +54,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "hypv_intercept.h"
#include <media/hardware/HardwareAPI.h>
#include <sys/eventfd.h>
+#include <nativebase/nativebase.h>
#if !defined(_ANDROID_) || defined(SYS_IOCTL)
#include <sys/ioctl.h>
diff --git a/mm-video-v4l2/vidc/venc/Android.mk b/mm-video-v4l2/vidc/venc/Android.mk
index 13503f65..2c1941de 100644
--- a/mm-video-v4l2/vidc/venc/Android.mk
+++ b/mm-video-v4l2/vidc/venc/Android.mk
@@ -94,9 +94,9 @@ endif
# Common Includes
libmm-venc-inc := $(LOCAL_PATH)/inc
-libmm-venc-inc += $(TOP)/hardware/qcom/media/mm-video-v4l2/vidc/common/inc
-libmm-venc-inc += hardware/qcom/media/mm-core/inc
-libmm-venc-inc += hardware/qcom/media/libstagefrighthw
+libmm-venc-inc += $(call project-path-for,qcom-media)/mm-video-v4l2/vidc/common/inc
+libmm-venc-inc += $(call project-path-for,qcom-media)/mm-core/inc
+libmm-venc-inc += $(call project-path-for,qcom-media)/libstagefrighthw
libmm-venc-inc += $(TARGET_OUT_HEADERS)/qcom/display
libmm-venc-inc += $(TARGET_OUT_HEADERS)/adreno
libmm-venc-inc += frameworks/native/include/media/hardware
@@ -104,8 +104,8 @@ libmm-venc-inc += frameworks/native/libs/nativewindow/include/
libmm-venc-inc += frameworks/native/libs/arect/include/
libmm-venc-inc += frameworks/native/libs/nativebase/include
libmm-venc-inc += frameworks/native/include/media/openmax
-libmm-venc-inc += hardware/qcom/media/libc2dcolorconvert
-libmm-venc-inc += hardware/qcom/media/hypv-intercept
+libmm-venc-inc += $(call project-path-for,qcom-media)/libc2dcolorconvert
+libmm-venc-inc += $(call project-path-for,qcom-media)/hypv-intercept
libmm-venc-inc += $(TARGET_OUT_HEADERS)/libvqzip
libmm-venc-inc += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
ifeq ($(call is-board-platform-in-list, $(TARGETS_THAT_SUPPORT_PQ)),true)
@@ -138,6 +138,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(libmm-venc-add-dep)
LOCAL_PRELINK_MODULE := false
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
+LOCAL_HEADER_LIBRARIES := \
+ media_plugin_headers \
+ libhardware_headers \
ifeq ($(BOARD_USES_ADRENO), true)
LOCAL_SHARED_LIBRARIES += libc2dcolorconvert
diff --git a/mm-video-v4l2/vidc/venc/inc/gpustats.h b/mm-video-v4l2/vidc/venc/inc/gpustats.h
new file mode 100644
index 00000000..6b1492d8
--- /dev/null
+++ b/mm-video-v4l2/vidc/venc/inc/gpustats.h
@@ -0,0 +1,56 @@
+/*
+ * Extrapolated / reversed header for PQ encoding
+ */
+
+#ifndef GPUSTATS_H
+#define GPUSTATS_H
+
+#define ADAPTIVE_QP 1
+
+enum color_compression_format {
+ LINEAR_NV12,
+ UBWC_NV12
+};
+
+enum perf_hint {
+ LOW = 1,
+ NORMAL = 2,
+ HIGH = 3,
+};
+
+struct gpu_stats_lib_buffer_params_t {
+ int fd;
+ int data_offset;
+ int alloc_len;
+ int filled_len;
+};
+
+struct gpu_stats_lib_caps_t {
+ unsigned int max_width;
+ unsigned int max_height;
+ int color_formats;
+ int max_mb_per_sec;
+};
+
+struct adaptive_qp_config_params_t {
+ float gain;
+ float offset;
+ uint roi_enabled;
+ uint pq_enabled;
+ int minDeltaQPlimit;
+ int maxDeltaQPlimit;
+};
+
+struct gpu_stats_lib_input_config {
+ struct adaptive_qp_config_params_t a_qp;
+ int algo;
+ int height;
+ int width;
+ int mb_height;
+ int mb_width;
+ int stride;
+};
+
+enum gpu_stats_lib_op_status { /* somethings supposed to go in here but ¯\_(ツ)_/¯ */ };
+
+#endif /* GPUSTATS_H */
diff --git a/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h b/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
index 88a419b8..0125f539 100644
--- a/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
+++ b/mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h
@@ -35,9 +35,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "QComOMXMetadata.h"
#include "OMX_QCOMExtns.h"
#include "qc_omx_component.h"
-#ifdef _VQZIP_
-#include "VQZip.h"
-#endif
#ifdef _PQ_
#include "gpustats.h"
@@ -311,6 +308,22 @@ enum rc_modes {
| RC_CBR_VFR | RC_CBR_CFR | RC_MBR_CFR | RC_MBR_VFR)
};
+#ifdef _VQZIP_
+struct VQZipConfig {
+ uint32_t dummy;
+ void* pSEIPayload;
+ uint16_t nWidth;
+ uint16_t nHeight;
+};
+
+struct VQZipStats {
+ uint32_t nCount;
+ uint32_t stats[16];
+};
+
+typedef int32_t VQZipStatus;
+#endif
+
class venc_dev
{
public:
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 13:12:41 +0000