Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-mplayer: Commit

external/mplayer


Commit MetaInfo

Revisión8001741f3adbbe3b75439d78ccdf74ad8f9fc45e (tree)
Tiempo2010-10-20 23:53:52
AutorOwen Kwon <pinebud@gmai...>
CommiterOwen Kwon

Log Message

enabled mplayer command line version

Cambiar Resumen

Diferencia

--- a/Android.mk
+++ b/Android.mk
@@ -700,15 +700,15 @@ LOCAL_SRC_FILES = $(SRCS_FAAD-yes)
700700 LOCAL_C_INCLUDES = $(LOCAL_PATH)/libfaad2
701701 include $(BUILD_STATIC_LIBRARY)
702702
703-#include $(CLEAR_VARS)
704-#LOCAL_MODULE = mplayer
705-#LOCAL_CFLAGS = $(FFCFLAGS) -D_POSIX_C_SOURCE
706-#LOCAL_MODULE_TAGS = debug
707-#LOCAL_SRC_FILES = $(SRCS_COMMON) $(SRCS_MPLAYER_EXE)
708-#LOCAL_C_INCLUDES = $(LOCAL_PATH) external/alsa-lib/include
709-#LOCAL_SHARED_LIBRARIES := libz libasound libc libcutils
710-#LOCAL_STATIC_LIBRARIES := libfaad2 $(FFMPEGPARTS)
711-#include $(BUILD_EXECUTABLE)
703+include $(CLEAR_VARS)
704+LOCAL_MODULE = mplayer
705+LOCAL_CFLAGS = $(FFCFLAGS) -D_POSIX_C_SOURCE
706+LOCAL_MODULE_TAGS = debug
707+LOCAL_SRC_FILES = $(SRCS_COMMON) $(SRCS_MPLAYER_EXE)
708+LOCAL_C_INCLUDES = $(LOCAL_PATH) external/alsa-lib/include
709+LOCAL_SHARED_LIBRARIES := libz libasound libc libcutils
710+LOCAL_STATIC_LIBRARIES := libfaad2 $(FFMPEGPARTS)
711+include $(BUILD_EXECUTABLE)
712712
713713 include $(CLEAR_VARS)
714714 LOCAL_MODULE = libmplayer
--- a/MPlayer.cpp
+++ b/MPlayer.cpp
@@ -125,6 +125,7 @@ namespace android {
125125 "-vo", "mem", "-framedrop",
126126 "-ao", "pcm_mem", "-noconsolecontrols", "-nojoystick",
127127 "-nolirc", "-nomouseinput", "-slave", "-zoom", "-fs",
128+ "-quiet",
128129 0};
129130 char url_buffer[100];
130131 char screenh_buffer[30];
--- a/libao2/ao_pcm_mem.c
+++ b/libao2/ao_pcm_mem.c
@@ -78,7 +78,10 @@ static void drain (void) {
7878 temp += temp2;
7979
8080 temp *= 1.03;
81+
82+ /*
8183 mp_msg(MSGT_AO, MSGL_INFO, "temp %d", temp);
84+ */
8285
8386 buffer-=temp;
8487 if (buffer<0){
--- a/mplayer.c
+++ b/mplayer.c
@@ -1,4 +1,4 @@
1-/)*
1+/*
22 * This file is part of MPlayer.
33 *
44 * MPlayer is free software; you can redistribute it and/or modify
@@ -3802,7 +3802,6 @@ if(!mpctx->sh_video) {
38023802
38033803 if(!quiet)
38043804 print_status(a_pos, 0, 0);
3805- con->a_pos = a_pos;
38063805
38073806 if(end_at.type == END_AT_TIME && end_at.pos < a_pos)
38083807 mpctx->eof = PT_NEXT_ENTRY;
Show on old repository browser