From 7ca3bf19a6b39994eaf3eee4eac334cc1a181e72 Mon Sep 17 00:00:00 2001 From: Owen Kwon Date: Fri, 9 Jul 2010 14:26:08 +0900 Subject: [PATCH] modified fb driver to not to change fb settings disabled libfaad --- Android.mk | 5 +++-- codec-cfg | Bin 21455 -> 21455 bytes config.h | 10 +++++----- libavcodec/test.c | 6 ++++++ libvo/vo_fbdev.c | 9 +++++++++ mplayer.c | 5 +++++ preconfig_x86_mmx_sse.mak | 9 +++++---- 7 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 libavcodec/test.c diff --git a/Android.mk b/Android.mk index cd5b120..57e4b35 100644 --- a/Android.mk +++ b/Android.mk @@ -682,7 +682,8 @@ FFMPEGPARTS = libavformat \ libavcodec \ libavutil -FFCFLAGS += -include $(LOCAL_PATH)/config.h +FFCFLAGS += -include $(LOCAL_PATH)/config.h -DPROFILE -DANAYSIS + include $(CLEAR_VARS) LOCAL_MODULE = libfaad2 LOCAL_CFLAGS = -D_GNU_SOURCE -DHAVE_CONFIG_H @@ -695,6 +696,6 @@ LOCAL_MODULE = mplayer LOCAL_CFLAGS = $(FFCFLAGS) -D_POSIX_C_SOURCE LOCAL_SRC_FILES = $(SRCS_COMMON) $(SRCS_MPLAYER) LOCAL_C_INCLUDES = $(LOCAL_PATH) external/alsa-lib/include -LOCAL_SHARED_LIBRARIES := libz libasound +LOCAL_SHARED_LIBRARIES := libz libasound libc LOCAL_STATIC_LIBRARIES := libfaad2 $(FFMPEGPARTS) include $(BUILD_EXECUTABLE) diff --git a/codec-cfg b/codec-cfg index 4468f049b0444441eb4cf89320819732fc2ee351..91c75f7b593295aca0ed36ebf1e340a506a34954 100755 GIT binary patch delta 43 zcmX@Vobmi}#tr)ZjOLRK`~z6bjZF+DxA@z$n421zPd@Ii#$s+_VZQmJ|2<{^L;ntl delta 43 zcmX@Vobmi}#tr)ZjAoM!`~z4lOihd?xA@z$SeP4GPCo9h#$sV+VY&IE|2<{^MAQzJ diff --git a/config.h b/config.h index ad0b296..615e2d0 100644 --- a/config.h +++ b/config.h @@ -104,7 +104,7 @@ /* system-specific features */ #define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t" #define HAVE_BUILTIN_EXPECT 1 -#define HAVE_LIBDL 1 +#undef HAVE_LIBDL #define HAVE_DOS_PATHS 0 #define EXTERN_ASM #define EXTERN_PREFIX "" @@ -206,8 +206,8 @@ /* codec libraries */ #undef CONFIG_FAAC -#define CONFIG_FAAD 1 -#define CONFIG_FAAD_INTERNAL 1 +#undef CONFIG_FAAD +#undef CONFIG_FAAD_INTERNAL #undef CONFIG_LIBA52 #undef CONFIG_LIBDCA #undef CONFIG_LIBDV095 @@ -446,8 +446,8 @@ #define HAVE_LLRINTF 1 #define HAVE_LOCAL_ALIGNED_8 1 #define HAVE_LOCAL_ALIGNED_16 1 -#define HAVE_LOG2 1 -#define HAVE_LOG2F 1 +#define HAVE_LOG2 0 +#define HAVE_LOG2F 0 #define HAVE_LRINT 1 #define CONFIG_MEMALIGN_HACK 0 #define CONFIG_MLIB 0 diff --git a/libavcodec/test.c b/libavcodec/test.c new file mode 100644 index 0000000..9414164 --- /dev/null +++ b/libavcodec/test.c @@ -0,0 +1,6 @@ +int main (void) +{ + printf ("howdi\n"); + + return 0; +} diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index 7ddf2ad..d4a8b0f 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -827,6 +827,8 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, fb_tty_fd = -1; } + mp_msg(MSGT_VO, MSGL_INFO, "change to best fitting mode is disabled for Android\n"); + /* if (ioctl(fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_vinfo)) // Intel drivers fail if we request a transparency channel fb_vinfo.transp.length = fb_vinfo.transp.offset = 0; @@ -837,6 +839,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, } return 1; } + */ + + /* get the screeninfo for safety */ + ioctl (fb_dev_fd, FBIOPUT_VSCREENINFO, &fb_vinfo); fb_pixel_size = fb_vinfo.bits_per_pixel / 8; fb_bpp = fb_vinfo.bits_per_pixel; @@ -896,6 +902,8 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, break; case FB_VISUAL_DIRECTCOLOR: mp_msg(MSGT_VO, MSGL_V, "creating cmap for directcolor\n"); + mp_msg(MSGT_VO, MSGL_INFO, "setting cmap is disabled for Android\n"); + /* if (ioctl(fb_dev_fd, FBIOGETCMAP, &fb_oldcmap)) { mp_msg(MSGT_VO, MSGL_ERR, "can't get cmap: %s\n", strerror(errno)); @@ -913,6 +921,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, free(cmap->green); free(cmap->blue); free(cmap); + */ break; default: mp_msg(MSGT_VO, MSGL_ERR, "visual: %d not yet supported\n", diff --git a/mplayer.c b/mplayer.c index 575239a..0dd0b92 100644 --- a/mplayer.c +++ b/mplayer.c @@ -3524,6 +3524,7 @@ mpctx->sh_audio=mpctx->d_audio->sh; mpctx->sh_video=mpctx->d_video->sh; if(mpctx->sh_video){ + mp_msg(MSGT_CPLAYER,MSGL_FATAL,"before video_read_properties\n"); current_module="video_read_properties"; if(!video_read_properties(mpctx->sh_video)) { @@ -3569,8 +3570,10 @@ if(!mpctx->sh_video && !mpctx->sh_audio){ goto goto_next_file; // exit_player(MSGTR_Exit_error); } + mp_msg(MSGT_CPLAYER,MSGL_FATAL,"before demux_info_print\n"); /* display clip info */ demux_info_print(mpctx->demuxer); + mp_msg(MSGT_CPLAYER,MSGL_FATAL,"after demux_info_print\n"); //================== Read SUBTITLES (DVD & TEXT) ========================== if(vo_spudec==NULL && @@ -3621,7 +3624,9 @@ if (mpctx->global_sub_size) { print_file_properties(mpctx, filename); + mp_msg(MSGT_CPLAYER,MSGL_FATAL,"before goto main\n"); if(!mpctx->sh_video) goto main; // audio-only + mp_msg(MSGT_CPLAYER,MSGL_FATAL,"after goto main\n"); if(!reinit_video_chain()) { if(!mpctx->sh_video){ diff --git a/preconfig_x86_mmx_sse.mak b/preconfig_x86_mmx_sse.mak index d0d1b37..0f704fe 100644 --- a/preconfig_x86_mmx_sse.mak +++ b/preconfig_x86_mmx_sse.mak @@ -1,8 +1,9 @@ # -------- Generated by configure ----------- -FFCFLAGS = -Wstrict-prototypes -Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -std=gnu99 -Wall -Wno-switch -Wpointer-arith -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I. -D_REENTRANT -fgnu89-inline -Wundef +FFCFLAGS := -Wno-sign-compare -Wno-switch -fno-stack-check -std=gnu99 -fomit-frame-pointer -fgnu89-inline -D_REENTRANT -ffast-math +#FFCFLAGS = -Wstrict-prototypes -Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -std=gnu99 -Wall -Wno-switch -Wpointer-arith -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I. -D_REENTRANT -fgnu89-inline -Wundef FFASFLAGS = $(CFLAGS) -FFCXXFLAGS = -Wstrict-prototypes -Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -std=gnu99 -Wall -Wno-switch -Wpointer-arith -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I. -D_REENTRANT -fgnu89-inline -Wundef +#FFCXXFLAGS = -Wstrict-prototypes -Wmissing-prototypes -Wdisabled-optimization -Wno-pointer-sign -Wdeclaration-after-statement -std=gnu99 -Wall -Wno-switch -Wpointer-arith -O4 -march=native -mtune=native -pipe -ffast-math -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -I. -D_REENTRANT -fgnu89-inline -Wundef #CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = -mno-omit-leaf-frame-pointer @@ -69,8 +70,8 @@ DXR2 = no DXR3 = no ESD = no FAAC=no -FAAD = yes -FAAD_INTERNAL = yes +FAAD = no +FAAD_INTERNAL = no FASTMEMCPY = yes FBDEV = yes FREETYPE = no -- 2.11.0