summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2011-06-23 10:53:55 +0300
committerMartin Storsjo <martin@martin.st>2012-08-16 15:58:43 +0300
commitadee070820d9b038ac811b3785de618349f35293 (patch)
tree192aa46e12cbdba09f5ac7ba0228af1297fc6f89 /media/libstagefright/codecs
parent2c3d9b7b9e34c9122c0a568d6b1fb24404021f55 (diff)
downloadframeworks_av-adee070820d9b038ac811b3785de618349f35293.zip
frameworks_av-adee070820d9b038ac811b3785de618349f35293.tar.gz
frameworks_av-adee070820d9b038ac811b3785de618349f35293.tar.bz2
aacenc/amrwbenc: Remove unused and dubious typedefs
These typedefs aren't used anywhere, and their description doesn't really match their actual definition. The VO_TCHAR type is even defined as pointer for one configuration and as non-pointer for another configuration. This gets rid of the last use of the LINUX define in the VO codecs (except for the amrwbenc sample application). Within the codecs, the use of this define is unclear - does it indicate code specific to android but not normal linux, linux but not other unixes, unix but not windows, or gcc but not other compilers, etc. Originally, prior to cleanup, the define has meant many different of these - these uses has now been cleaned up to use the proper feature detection macros (e.g. looking for defines automatically set by the compiler, instead of relying on manually setting this define). Change-Id: I1a675d653d6d305f558aa7f74c7255858dc62758
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/common/include/voType.h24
1 files changed, 0 insertions, 24 deletions
diff --git a/media/libstagefright/codecs/common/include/voType.h b/media/libstagefright/codecs/common/include/voType.h
index 5f659ab..da208d4 100644
--- a/media/libstagefright/codecs/common/include/voType.h
+++ b/media/libstagefright/codecs/common/include/voType.h
@@ -76,15 +76,6 @@ typedef char VO_CHAR;
/** VO_U16 is a 16 bit unsigned quantity that is 16 bit word aligned */
typedef unsigned short VO_U16;
-/** VO_WCHAR is a 16 bit unsigned quantity that is 16 bit word aligned */
-#if defined _WIN32
-typedef unsigned short VO_WCHAR;
-typedef unsigned short* VO_PWCHAR;
-#elif defined LINUX
-typedef unsigned char VO_WCHAR;
-typedef unsigned char* VO_PWCHAR;
-#endif
-
/** VO_S16 is a 16 bit signed quantity that is 16 bit word aligned */
typedef signed short VO_S16;
@@ -150,21 +141,6 @@ typedef char* VO_PCHAR;
*/
typedef unsigned char* VO_PBYTE;
-/** The VO_PTCHAR type is intended to be used to pass arrays of wchar such as
- unicode char between the application and the component and core. The VO_PTCHAR
- type is a 32 bit pointer to a zero terminated string. The pointer is word
- aligned and the string is byte aligned.
- */
-/*
-#if !defined LINUX
-typedef unsigned short* VO_PTCHAR;
-typedef unsigned short* VO_TCHAR;
-#else
-typedef char* VO_PTCHAR;
-typedef char VO_TCHAR;
-#endif
-*/
-
#ifndef NULL
#ifdef __cplusplus
#define NULL 0