summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Blaesius <skate4life@gmx.de>2016-11-08 03:24:23 -0700
committerAndreas Blaesius <skate4life@gmx.de>2016-11-08 05:25:37 -0700
commit1c6e16c0b4082c0edaca4fcc0838f33bf14ffac8 (patch)
tree6f2137febfbdff00321421987e49a04b79584ac4 /media
parent2e39b85cae7025786fade45ba90583c1729ffe42 (diff)
downloadframeworks_av-1c6e16c0b4082c0edaca4fcc0838f33bf14ffac8.zip
frameworks_av-1c6e16c0b4082c0edaca4fcc0838f33bf14ffac8.tar.gz
frameworks_av-1c6e16c0b4082c0edaca4fcc0838f33bf14ffac8.tar.bz2
Allow to use baseline profile for AVC recording
- some encoder seem to crash using higher h264 profiles Change-Id: I2beb881e76519f872e3e99957f8b981eeaa53b56
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/ACodec.cpp2
-rw-r--r--media/libstagefright/Android.mk4
2 files changed, 5 insertions, 1 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index e00e673..d2389f6 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -3568,7 +3568,7 @@ status_t ACodec::setupAVCEncoderParameters(const sp<AMessage> &msg) {
// XXX
// Allow higher profiles to be set since the encoder seems to support
-#if 0
+#ifdef USE_AVC_BASELINE_PROFILE
if (h264type.eProfile != OMX_VIDEO_AVCProfileBaseline) {
ALOGW("Use baseline profile instead of %d for AVC recording",
h264type.eProfile);
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 29fb418..792c139 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -173,6 +173,10 @@ ifeq ($(TARGET_BOARD_PLATFORM),omap4)
LOCAL_CFLAGS += -DBOARD_CANT_REALLOCATE_OMX_BUFFERS
endif
+ifeq ($(TARGET_USE_AVC_BASELINE_PROFILE), true)
+LOCAL_CFLAGS += -DUSE_AVC_BASELINE_PROFILE
+endif
+
ifeq ($(call is-vendor-board-platform,QCOM),true)
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true)