diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cutils/logger.h | 46 | ||||
| -rw-r--r-- | include/cutils/logprint.h | 4 | ||||
| -rw-r--r-- | include/pixelflinger/format.h | 11 |
3 files changed, 56 insertions, 5 deletions
diff --git a/include/cutils/logger.h b/include/cutils/logger.h new file mode 100644 index 0000000..3a08019 --- /dev/null +++ b/include/cutils/logger.h @@ -0,0 +1,46 @@ +/* utils/logger.h +** +** Copyright 2007, The Android Open Source Project +** +** This file is dual licensed. It may be redistributed and/or modified +** under the terms of the Apache 2.0 License OR version 2 of the GNU +** General Public License. +*/ + +#ifndef _UTILS_LOGGER_H +#define _UTILS_LOGGER_H + +#include <stdint.h> + +struct logger_entry { + uint16_t len; /* length of the payload */ + uint16_t __pad; /* no matter what, we get 2 bytes of padding */ + int32_t pid; /* generating process's pid */ + int32_t tid; /* generating process's tid */ + int32_t sec; /* seconds since Epoch */ + int32_t nsec; /* nanoseconds */ + char msg[0]; /* the entry's payload */ +}; + +#define LOGGER_LOG_MAIN "log/main" +#define LOGGER_LOG_RADIO "log/radio" +#define LOGGER_LOG_EVENTS "log/events" + +#define LOGGER_ENTRY_MAX_LEN (4*1024) +#define LOGGER_ENTRY_MAX_PAYLOAD \ + (LOGGER_ENTRY_MAX_LEN - sizeof(struct logger_entry)) + +#ifdef HAVE_IOCTL + +#include <sys/ioctl.h> + +#define __LOGGERIO 0xAE + +#define LOGGER_GET_LOG_BUF_SIZE _IO(__LOGGERIO, 1) /* size of log */ +#define LOGGER_GET_LOG_LEN _IO(__LOGGERIO, 2) /* used log len */ +#define LOGGER_GET_NEXT_ENTRY_LEN _IO(__LOGGERIO, 3) /* next entry len */ +#define LOGGER_FLUSH_LOG _IO(__LOGGERIO, 4) /* flush log */ + +#endif // HAVE_IOCTL + +#endif /* _UTILS_LOGGER_H */ diff --git a/include/cutils/logprint.h b/include/cutils/logprint.h index c010809..d6ec480 100644 --- a/include/cutils/logprint.h +++ b/include/cutils/logprint.h @@ -17,8 +17,8 @@ #ifndef _LOGPRINT_H #define _LOGPRINT_H -#include <utils/Log.h> -#include <utils/logger.h> +#include <cutils/log.h> +#include <cutils/logger.h> #include <cutils/event_tag_map.h> #include <pthread.h> diff --git a/include/pixelflinger/format.h b/include/pixelflinger/format.h index 308e560..6b2050c 100644 --- a/include/pixelflinger/format.h +++ b/include/pixelflinger/format.h @@ -42,8 +42,10 @@ enum GGLPixelFormat { // YCbCr formats (SP=semi-planar, P=planar) GGL_PIXEL_FORMAT_YCbCr_422_SP= 0x10, GGL_PIXEL_FORMAT_YCbCr_420_SP= 0x11, - GGL_PIXEL_FORMAT_YCbCr_422_P = 0x14, - GGL_PIXEL_FORMAT_YCbCr_420_P = 0x15, + GGL_PIXEL_FORMAT_YCbCr_422_P = 0x12, + GGL_PIXEL_FORMAT_YCbCr_420_P = 0x13, + GGL_PIXEL_FORMAT_YCbCr_422_I = 0x14, + GGL_PIXEL_FORMAT_YCbCr_420_I = 0x15, // reserved/special formats GGL_PIXEL_FORMAT_Z_16 = 0x18, @@ -60,7 +62,10 @@ enum GGLFormatComponents { GGL_RGBA = 0x1908, GGL_LUMINANCE = 0x1909, GGL_LUMINANCE_ALPHA = 0x190A, - GGL_Y_CB_CR = 0x8000, + GGL_Y_CB_CR_SP = 0x8000, + GGL_Y_CB_CR = GGL_Y_CB_CR_SP, + GGL_Y_CB_CR_P = 0x8001, + GGL_Y_CB_CR_I = 0x8002, }; enum GGLFormatComponentIndex { |