diff options
| author | Ziyan <jaraidaniel@gmail.com> | 2015-04-21 15:07:13 +0200 |
|---|---|---|
| committer | Andreas Blaesius <skate4life@gmx.de> | 2016-11-06 05:22:09 -0700 |
| commit | 2e39b85cae7025786fade45ba90583c1729ffe42 (patch) | |
| tree | 2d27177442ea7dc91b4d3e427030d6ed50d74838 | |
| parent | cb1cdffd7dfae7db36ecd06ce058eba505fb1b9d (diff) | |
| download | frameworks_av-2e39b85cae7025786fade45ba90583c1729ffe42.zip frameworks_av-2e39b85cae7025786fade45ba90583c1729ffe42.tar.gz frameworks_av-2e39b85cae7025786fade45ba90583c1729ffe42.tar.bz2 | |
libstagefright: wfd: don't use intra macroblock refresh mode on omap4
Most, if not all OMAP4 Ducatis doesn't support intra macroblock refresh mode,
causing the encoder to fail initializing.
This patch disables intra macroblock refresh mode for wifi display on omap4.
Note:
Ideally, the decoder shouldn't fail if intra macroblock refresh mode can't be
configured. However, that would trick higher layers into thinking that it's on,
because they set that parameter.
As of now, this mode seems to only ever be used for wifi display.
Change-Id: I9696af8f22db82cc436a351e4d93bf7323588f43
| -rw-r--r-- | media/libstagefright/wifi-display/Android.mk | 4 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/source/Converter.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/wifi-display/Android.mk b/media/libstagefright/wifi-display/Android.mk index fb28624..6f17747 100644 --- a/media/libstagefright/wifi-display/Android.mk +++ b/media/libstagefright/wifi-display/Android.mk @@ -33,6 +33,10 @@ LOCAL_SHARED_LIBRARIES:= \ LOCAL_CFLAGS += -Wno-multichar -Werror -Wall LOCAL_CLANG := true +ifeq ($(BOARD_NO_INTRA_MACROBLOCK_MODE_SUPPORT),true) +LOCAL_CFLAGS += -DBOARD_NO_INTRA_MACROBLOCK_MODE_SUPPORT +endif + LOCAL_MODULE:= libstagefright_wfd LOCAL_MODULE_TAGS:= optional diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp index 471152e..9a2d08a 100644 --- a/media/libstagefright/wifi-display/source/Converter.cpp +++ b/media/libstagefright/wifi-display/source/Converter.cpp @@ -173,8 +173,10 @@ status_t Converter::initEncoder() { mOutputFormat->setInt32("frame-rate", 30); mOutputFormat->setInt32("i-frame-interval", 15); // Iframes every 15 secs +#ifndef BOARD_NO_INTRA_MACROBLOCK_MODE_SUPPORT // Configure encoder to use intra macroblock refresh mode mOutputFormat->setInt32("intra-refresh-mode", OMX_VIDEO_IntraRefreshCyclic); +#endif int width, height, mbs; if (!mOutputFormat->findInt32("width", &width) |