diff options
| -rw-r--r-- | src/Android.mk | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/lnc_cmdbuf.h | 4 | ||||
| -rw-r--r-- | src/pnw_cmdbuf.h | 4 | ||||
| -rw-r--r-- | src/psb_buffer.c | 1 | ||||
| -rw-r--r-- | src/psb_drv_debug.h | 3 | ||||
| -rw-r--r-- | src/psb_drv_video.h | 4 | ||||
| -rw-r--r-- | src/psb_texture.c | 1 | ||||
| -rw-r--r-- | src/psb_ws_driver.h | 4 |
9 files changed, 26 insertions, 4 deletions
diff --git a/src/Android.mk b/src/Android.mk index a88907a..9086d38 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -108,7 +108,7 @@ LOCAL_SRC_FILES += \ tng_VP8.c \ tng_jpegdec.c \ tng_cmdbuf.c tng_hostheader.c tng_hostcode.c tng_picmgmt.c tng_hostbias.c \ - tng_H264ES.c tng_H263ES.c tng_MPEG4ES.c tng_jpegES.c tng_slotorder.c \ + tng_H264ES.c tng_H263ES.c tng_MPEG4ES.c tng_jpegES.c tng_slotorder.c tng_hostair.c\ LOCAL_SRC_FILES += \ vsp_VPP.c \ vsp_cmdbuf.c diff --git a/src/Makefile.am b/src/Makefile.am index 6672964..bd47600 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,9 +37,10 @@ pvr_drv_video_la_SOURCES = psb_drv_video.c object_heap.c psb_buffer.c psb_buffer pnw_hostheader.c pnw_hostcode.c pnw_rotate.c\ pnw_cmdbuf.c pnw_H264ES.c pnw_H263ES.c pnw_MPEG4ES.c \ pnw_H264.c pnw_MPEG2.c pnw_MPEG4.c pnw_hostjpeg.c pnw_jpeg.c pnw_VC1.c tng_VP8.c \ - tng_cmdbuf.c tng_hostheader.c tng_hostcode.c tng_picmgmt.c tng_hostbias.c \ - tng_slotorder.c tng_H264ES.c tng_H263ES.c tng_jpegES.c tng_trace.c tng_MPEG4ES.c \ - psb_output.c psb_overlay.c psb_texture.c psb_texstreaming.c\ + tng_cmdbuf.c tng_hostheader.c tng_hostcode.c \ + tng_picmgmt.c tng_hostbias.c tng_slotorder.c tng_hostair.c \ + tng_H264ES.c tng_H263ES.c tng_jpegES.c tng_trace.c tng_MPEG4ES.c \ + psb_output.c psb_overlay.c psb_texture.c \ x11/psb_x11.c x11/psb_coverlay.c x11/psb_xrandr.c x11/psb_xvva.c x11/psb_ctexture.c \ psb_surface_attrib.c psb_drv_debug.c tng_jpegdec.c tng_vld_dec.c # vc1_ap_i.c vc1_ap_p.c vc1_ap_utils.c vc1_bitplane.c \ diff --git a/src/lnc_cmdbuf.h b/src/lnc_cmdbuf.h index 6811159..d204751 100644 --- a/src/lnc_cmdbuf.h +++ b/src/lnc_cmdbuf.h @@ -35,7 +35,11 @@ #include "psb_drv_video.h" #include "psb_surface.h" #include "psb_buffer.h" +#ifdef ANDROID #include <linux/psb_drm.h> +#else +#include "psb_drm.h" +#endif #include <stdint.h> diff --git a/src/pnw_cmdbuf.h b/src/pnw_cmdbuf.h index 7aab79f..eeec0d5 100644 --- a/src/pnw_cmdbuf.h +++ b/src/pnw_cmdbuf.h @@ -34,7 +34,11 @@ #include "psb_drv_video.h" #include "psb_surface.h" #include "psb_buffer.h" +#ifdef ANDROID #include <linux/psb_drm.h> +#else +#include <psb_drm.h> +#endif #include <stdint.h> diff --git a/src/psb_buffer.c b/src/psb_buffer.c index 34ebb07..45302aa 100644 --- a/src/psb_buffer.c +++ b/src/psb_buffer.c @@ -40,6 +40,7 @@ #else #include <psb_drm.h> #endif + #include "psb_def.h" #include "psb_drv_debug.h" diff --git a/src/psb_drv_debug.h b/src/psb_drv_debug.h index bab2a9e..b2b04c7 100644 --- a/src/psb_drv_debug.h +++ b/src/psb_drv_debug.h @@ -70,6 +70,9 @@ typedef enum VIDEO_DECODE_DEBUG = 0x100, VIDEO_ENCODE_DEBUG = 0x200, VIDEO_DISPLAY_DEBUG = 0x400, + + VIDEO_ENCODE_PDUMP = 0x1000, + VIDEO_ENCODE_HEADER = 0x2000, } DEBUG_LEVEL; /**************************** diff --git a/src/psb_drv_video.h b/src/psb_drv_video.h index a20e053..6cae08e 100644 --- a/src/psb_drv_video.h +++ b/src/psb_drv_video.h @@ -40,11 +40,14 @@ #include "psb_def.h" //#include "psb_drv_debug.h" #include "xf86drm.h" +#ifdef ANDROID #include <linux/psb_drm.h> +#endif #include "psb_overlay.h" #include "psb_texture.h" #include <stdint.h> #ifndef ANDROID +#include <psb_drm.h> #include <X11/Xlibint.h> #include <X11/X.h> #include <X11/extensions/Xv.h> @@ -77,6 +80,7 @@ #define _TOPAZHP_OLD_LIBVA_ #define FORCED_REFERENCE 1 #define LTREFHEADER 1 +//#define _TP_DEBUG_MMU_ //#define _TOPAZHP_REC_ /* diff --git a/src/psb_texture.c b/src/psb_texture.c index 3c1c0d5..be8b41c 100644 --- a/src/psb_texture.c +++ b/src/psb_texture.c @@ -37,6 +37,7 @@ #else #include <psb_drm.h> #endif + #include <va/va_backend.h> #include <va/va_dricommon.h> #include "psb_drv_debug.h" diff --git a/src/psb_ws_driver.h b/src/psb_ws_driver.h index 32f3b76..2f81758 100644 --- a/src/psb_ws_driver.h +++ b/src/psb_ws_driver.h @@ -33,7 +33,11 @@ #include <linux/types.h> #include <wsbm/wsbm_util.h> #include <wsbm/wsbm_driver.h> +#ifdef ANDROID #include <linux/psb_drm.h> +#else +#include <psb_drm.h> +#endif struct _PsbDrmValidateNode { struct _ValidateNode base; |