1.disable libmad library. 2.fix tplayer gain set func.
This commit is contained in:
parent
a21dd54468
commit
02d79150f3
|
@ -151,7 +151,7 @@ AudioRenderComp* AudioRenderCompSetGain(AudioRenderComp* a, float gain){
|
||||||
int AudioRenderCompStart(AudioRenderComp* p)
|
int AudioRenderCompStart(AudioRenderComp* p)
|
||||||
{
|
{
|
||||||
//return BaseCompStart(&p->base, NULL, NULL);
|
//return BaseCompStart(&p->base, NULL, NULL);
|
||||||
return BaseCompStart(&p->base, NULL, &p->gain);
|
return BaseCompStartWithGain(&p->base, NULL, NULL, p->gain);
|
||||||
}
|
}
|
||||||
|
|
||||||
int AudioRenderCompStop(AudioRenderComp* p)
|
int AudioRenderCompStop(AudioRenderComp* p)
|
||||||
|
|
|
@ -86,7 +86,22 @@ int BaseCompStart(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg)
|
||||||
.execute = p->handler.start,
|
.execute = p->handler.start,
|
||||||
.replySem = &p->replySem[MESSAGE_ID_START],
|
.replySem = &p->replySem[MESSAGE_ID_START],
|
||||||
.result = &reply,
|
.result = &reply,
|
||||||
.gain = *((float*)arg),
|
};
|
||||||
|
|
||||||
|
BaseCompPostAndWait(p, &msg, afterPostBeforeWait, arg);
|
||||||
|
|
||||||
|
return reply;
|
||||||
|
}
|
||||||
|
|
||||||
|
int BaseCompStartWithGain(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg, float gain)
|
||||||
|
{
|
||||||
|
int reply = 0;
|
||||||
|
AwMessage msg = {
|
||||||
|
.messageId = MESSAGE_ID_START,
|
||||||
|
.execute = p->handler.start,
|
||||||
|
.replySem = &p->replySem[MESSAGE_ID_START],
|
||||||
|
.result = &reply,
|
||||||
|
.gain = gain,
|
||||||
};
|
};
|
||||||
|
|
||||||
BaseCompPostAndWait(p, &msg, afterPostBeforeWait, arg);
|
BaseCompPostAndWait(p, &msg, afterPostBeforeWait, arg);
|
||||||
|
|
|
@ -92,6 +92,8 @@ typedef void (*task_t)(void *);
|
||||||
|
|
||||||
int BaseCompStart(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg);
|
int BaseCompStart(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg);
|
||||||
|
|
||||||
|
int BaseCompStartWithGain(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg, float gain);
|
||||||
|
|
||||||
int BaseCompStop(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg);
|
int BaseCompStop(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg);
|
||||||
|
|
||||||
int BaseCompPause(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg);
|
int BaseCompPause(BaseCompCtx *p, task_t afterPostBeforeWait, void *arg);
|
||||||
|
|
|
@ -14,7 +14,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=utils
|
SECTION:=utils
|
||||||
CATEGORY:=Netease
|
CATEGORY:=Netease
|
||||||
TITLE:=$(PKG_NAME)(compatible with DLNA)
|
TITLE:=$(PKG_NAME)(compatible with DLNA)
|
||||||
DEPENDS:=+liballwinner +libmad +libstdcpp +KPlatinum +libjson-c $(MAKE_COMMON_DEPEND)
|
DEPENDS:=+liballwinner +libstdcpp +KPlatinum +libjson-c $(MAKE_COMMON_DEPEND)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/$(PKG_NAME)/description
|
define Package/$(PKG_NAME)/description
|
||||||
|
|
|
@ -15,7 +15,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=utils
|
SECTION:=utils
|
||||||
CATEGORY:=Netease
|
CATEGORY:=Netease
|
||||||
TITLE:=$(PKG_NAME) app
|
TITLE:=$(PKG_NAME) app
|
||||||
DEPENDS:=+liballwinner +libmad +libstdcpp +KPlatinum +libjson-c $(MAKE_COMMON_DEPEND)
|
DEPENDS:=+liballwinner +libstdcpp +KPlatinum +libjson-c $(MAKE_COMMON_DEPEND)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/$(PKG_NAME)/description
|
define Package/$(PKG_NAME)/description
|
||||||
|
|
|
@ -6,7 +6,7 @@ DEMO_NAME:=SPlayer-demo
|
||||||
PKG_VERSION:=1
|
PKG_VERSION:=1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
ALLDEPENDS := +liballwinner +libmad +libstdcpp +libjson-c +sraop +libavahi-compat-libdnssd +mdnsresponder +alsa-lib $(MAKE_COMMON_DEPEND)
|
ALLDEPENDS := +liballwinner +libstdcpp +libjson-c +sraop +libavahi-compat-libdnssd +mdnsresponder +alsa-lib $(MAKE_COMMON_DEPEND)
|
||||||
|
|
||||||
PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME)
|
PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME)
|
||||||
DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME)
|
DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME)
|
||||||
|
|
|
@ -5,7 +5,7 @@ DEMO_NAME:=blueKC-demo
|
||||||
PKG_VERSION:=1
|
PKG_VERSION:=1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
ALLDEPENDS := +curl +liballwinner +libmad +libpthread +libstdcpp +libdbus +libuv +libjson-c +libuvdbus +libs2json +libcjson +libsqlite3
|
ALLDEPENDS := +curl +liballwinner +libpthread +libstdcpp +libdbus +libuv +libjson-c +libuvdbus +libs2json +libcjson +libsqlite3
|
||||||
PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME)
|
PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME)
|
||||||
DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME)
|
DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME)
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=utils
|
SECTION:=utils
|
||||||
CATEGORY:=Netease
|
CATEGORY:=Netease
|
||||||
TITLE:=$(PKG_NAME) app
|
TITLE:=$(PKG_NAME) app
|
||||||
DEPENDS:=+netease_voice +libmad +libjson-c +cppunit +libuws +libspeech +libcedarx +alsa-utils +libuapi $(MAKE_COMMON_DEPEND)
|
DEPENDS:=+netease_voice +libjson-c +cppunit +libuws +libspeech +libcedarx +alsa-utils +libuapi $(MAKE_COMMON_DEPEND)
|
||||||
ifeq ('$(CONFIG_XUNFEI_TTS_SDK)_$(CONFIG_TTS_TEXT_XUNFEI)', 'y_y')
|
ifeq ('$(CONFIG_XUNFEI_TTS_SDK)_$(CONFIG_TTS_TEXT_XUNFEI)', 'y_y')
|
||||||
DEPENDS+=+libmsc
|
DEPENDS+=+libmsc
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit d7b4254835e164235d99c3aa45cd219f69a1ca8b
|
Subproject commit 702ee4d770310b2c865fc21ff1ee5f33e7bcb4c8
|
|
@ -15,7 +15,7 @@ define Package/$(PKG_NAME)
|
||||||
SECTION:=utils
|
SECTION:=utils
|
||||||
CATEGORY:=Netease
|
CATEGORY:=Netease
|
||||||
TITLE:=$(PKG_NAME) app
|
TITLE:=$(PKG_NAME) app
|
||||||
DEPENDS:=+liballwinner +libmad +libstdcpp +libjson-c $(MAKE_COMMON_DEPEND)
|
DEPENDS:=+liballwinner +libstdcpp +libjson-c $(MAKE_COMMON_DEPEND)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/$(PKG_NAME)/description
|
define Package/$(PKG_NAME)/description
|
||||||
|
|
|
@ -6,7 +6,7 @@ DEMO_NAME:=wirelessTest-demo
|
||||||
PKG_VERSION:=1
|
PKG_VERSION:=1
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
ALLDEPENDS := +liballwinner +libmad +libstdcpp +libjson-c $(MAKE_COMMON_DEPEND)
|
ALLDEPENDS := +liballwinner +libstdcpp +libjson-c $(MAKE_COMMON_DEPEND)
|
||||||
|
|
||||||
PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME)
|
PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME)
|
||||||
DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME)
|
DEMO_BUILD_DIR := $(COMPILE_DIR)/$(DEMO_NAME)
|
||||||
|
|
|
@ -1538,7 +1538,7 @@ CONFIG_PACKAGE_softap-demo=y
|
||||||
# CONFIG_PACKAGE_tina-app-upgrade is not set
|
# CONFIG_PACKAGE_tina-app-upgrade is not set
|
||||||
# CONFIG_PACKAGE_tina-upgrade is not set
|
# CONFIG_PACKAGE_tina-upgrade is not set
|
||||||
# CONFIG_PACKAGE_tinacvr is not set
|
# CONFIG_PACKAGE_tinacvr is not set
|
||||||
CONFIG_PACKAGE_tinymp3=y
|
# CONFIG_PACKAGE_tinymp3 is not set
|
||||||
# CONFIG_PACKAGE_tsc_demo is not set
|
# CONFIG_PACKAGE_tsc_demo is not set
|
||||||
# CONFIG_PACKAGE_uevent-monitor is not set
|
# CONFIG_PACKAGE_uevent-monitor is not set
|
||||||
# CONFIG_PACKAGE_usb-gadget is not set
|
# CONFIG_PACKAGE_usb-gadget is not set
|
||||||
|
@ -2516,7 +2516,7 @@ CONFIG_PACKAGE_libjson-c=y
|
||||||
# CONFIG_PACKAGE_liblua is not set
|
# CONFIG_PACKAGE_liblua is not set
|
||||||
# CONFIG_PACKAGE_liblz4 is not set
|
# CONFIG_PACKAGE_liblz4 is not set
|
||||||
# CONFIG_PACKAGE_liblzo is not set
|
# CONFIG_PACKAGE_liblzo is not set
|
||||||
CONFIG_PACKAGE_libmad=y
|
# CONFIG_PACKAGE_libmad is not set
|
||||||
# CONFIG_PACKAGE_libmcrypt is not set
|
# CONFIG_PACKAGE_libmcrypt is not set
|
||||||
# CONFIG_PACKAGE_libmicrohttpd is not set
|
# CONFIG_PACKAGE_libmicrohttpd is not set
|
||||||
# CONFIG_PACKAGE_libmijia is not set
|
# CONFIG_PACKAGE_libmijia is not set
|
||||||
|
@ -2663,28 +2663,28 @@ CONFIG_PACKAGE_zlib=y
|
||||||
#
|
#
|
||||||
# Translations
|
# Translations
|
||||||
#
|
#
|
||||||
# CONFIG_LUCI_LANG_uk is not set
|
|
||||||
# CONFIG_LUCI_LANG_hu is not set
|
# CONFIG_LUCI_LANG_hu is not set
|
||||||
# CONFIG_LUCI_LANG_pt is not set
|
# CONFIG_LUCI_LANG_pt is not set
|
||||||
# CONFIG_LUCI_LANG_ro is not set
|
# CONFIG_LUCI_LANG_sk is not set
|
||||||
|
# CONFIG_LUCI_LANG_no is not set
|
||||||
# CONFIG_LUCI_LANG_en is not set
|
# CONFIG_LUCI_LANG_en is not set
|
||||||
# CONFIG_LUCI_LANG_pl is not set
|
# CONFIG_LUCI_LANG_pl is not set
|
||||||
# CONFIG_LUCI_LANG_sk is not set
|
# CONFIG_LUCI_LANG_uk is not set
|
||||||
# CONFIG_LUCI_LANG_ja is not set
|
# CONFIG_LUCI_LANG_ru is not set
|
||||||
# CONFIG_LUCI_LANG_vi is not set
|
# CONFIG_LUCI_LANG_vi is not set
|
||||||
# CONFIG_LUCI_LANG_he is not set
|
# CONFIG_LUCI_LANG_he is not set
|
||||||
# CONFIG_LUCI_LANG_no is not set
|
# CONFIG_LUCI_LANG_ro is not set
|
||||||
# CONFIG_LUCI_LANG_ms is not set
|
# CONFIG_LUCI_LANG_ms is not set
|
||||||
# CONFIG_LUCI_LANG_zh-cn is not set
|
# CONFIG_LUCI_LANG_zh-cn is not set
|
||||||
# CONFIG_LUCI_LANG_de is not set
|
# CONFIG_LUCI_LANG_de is not set
|
||||||
# CONFIG_LUCI_LANG_zh-tw is not set
|
# CONFIG_LUCI_LANG_zh-tw is not set
|
||||||
# CONFIG_LUCI_LANG_tr is not set
|
# CONFIG_LUCI_LANG_tr is not set
|
||||||
# CONFIG_LUCI_LANG_sv is not set
|
# CONFIG_LUCI_LANG_sv is not set
|
||||||
# CONFIG_LUCI_LANG_ru is not set
|
# CONFIG_LUCI_LANG_ja is not set
|
||||||
# CONFIG_LUCI_LANG_pt-br is not set
|
|
||||||
# CONFIG_LUCI_LANG_el is not set
|
# CONFIG_LUCI_LANG_el is not set
|
||||||
# CONFIG_LUCI_LANG_ca is not set
|
# CONFIG_LUCI_LANG_ca is not set
|
||||||
# CONFIG_LUCI_LANG_es is not set
|
# CONFIG_LUCI_LANG_es is not set
|
||||||
|
# CONFIG_LUCI_LANG_pt-br is not set
|
||||||
# CONFIG_LUCI_LANG_cs is not set
|
# CONFIG_LUCI_LANG_cs is not set
|
||||||
# CONFIG_LUCI_LANG_fr is not set
|
# CONFIG_LUCI_LANG_fr is not set
|
||||||
# CONFIG_LUCI_LANG_it is not set
|
# CONFIG_LUCI_LANG_it is not set
|
||||||
|
|
Loading…
Reference in New Issue