| Revision | a17f476f79479c17000939bdd0c1026fc4a70fed (tree) |
|---|---|
| Zeit | 2016-10-11 04:41:18 |
| Autor | Jaap Jan Meijer <jjmeijer88@gmai...> |
| Commiter | Jaap Jan Meijer |
Merge remote-tracking branch 'cm/cm-14.0' into cm-14.0-x86
media/libstagefright/Android.mk (diff)
media/libstagefright/CameraSource.cpp (diff) media/libstagefright/omx/GraphicBufferSource.cpp (diff) media/mediaserver/Android.mk (diff)| @@ -133,6 +133,14 @@ LOCAL_SHARED_LIBRARIES += \ | ||
| 133 | 133 | libdl \ |
| 134 | 134 | libRScpp \ |
| 135 | 135 | |
| 136 | +ifeq ($(BOARD_USE_SAMSUNG_CAMERAFORMAT_NV21), true) | |
| 137 | +# This needs flag requires the following string constant in | |
| 138 | +# CameraParametersExtra.h: | |
| 139 | +# | |
| 140 | +# const char CameraParameters::PIXEL_FORMAT_YUV420SP_NV21[] = "nv21"; | |
| 141 | +LOCAL_CFLAGS += -DUSE_SAMSUNG_CAMERAFORMAT_NV21 | |
| 142 | +endif | |
| 143 | + | |
| 136 | 144 | LOCAL_CFLAGS += -Wno-multichar -Werror -Wno-error=deprecated-declarations -Wall |
| 137 | 145 | |
| 138 | 146 | LOCAL_C_INCLUDES += $(call project-path-for,qcom-media)/mm-core/inc |
| @@ -135,6 +135,13 @@ static int32_t getColorFormat(const char* colorFormat) { | ||
| 135 | 135 | #endif |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | +#ifdef USE_SAMSUNG_CAMERAFORMAT_NV21 | |
| 139 | + if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV420SP_NV21)) { | |
| 140 | + static const int OMX_SEC_COLOR_FormatNV21Linear = 0x7F000011; | |
| 141 | + return OMX_SEC_COLOR_FormatNV21Linear; | |
| 142 | + } | |
| 143 | +#endif /* USE_SAMSUNG_CAMERAFORMAT_NV21 */ | |
| 144 | + | |
| 138 | 145 | if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV422I)) { |
| 139 | 146 | return OMX_COLOR_FormatYCbYCr; |
| 140 | 147 | } |
| @@ -564,6 +564,7 @@ void GraphicBufferSource::onDataSpaceChanged_l( | ||
| 564 | 564 | aspects.mTransfer, asString(aspects.mTransfer), |
| 565 | 565 | err, asString(err)); |
| 566 | 566 | |
| 567 | +#ifndef QCOM_BSP_LEGACY | |
| 567 | 568 | // signal client that the dataspace has changed; this will update the output format |
| 568 | 569 | // TODO: we should tie this to an output buffer somehow, and signal the change |
| 569 | 570 | // just before the output buffer is returned to the client, but there are many |
| @@ -573,6 +574,7 @@ void GraphicBufferSource::onDataSpaceChanged_l( | ||
| 573 | 574 | OMX_EventDataSpaceChanged, dataSpace, |
| 574 | 575 | (aspects.mRange << 24) | (aspects.mPrimaries << 16) |
| 575 | 576 | | (aspects.mMatrixCoeffs << 8) | aspects.mTransfer); |
| 577 | +#endif | |
| 576 | 578 | } |
| 577 | 579 | } |
| 578 | 580 |
| @@ -35,10 +35,6 @@ LOCAL_C_INCLUDES := \ | ||
| 35 | 35 | frameworks/av/services/camera/libcameraservice \ |
| 36 | 36 | frameworks/av/services/mediaresourcemanager \ |
| 37 | 37 | |
| 38 | -ifneq ($(BOARD_NUMBER_OF_CAMERAS),) | |
| 39 | - LOCAL_CFLAGS += -DMAX_CAMERAS=$(BOARD_NUMBER_OF_CAMERAS) | |
| 40 | -endif | |
| 41 | - | |
| 42 | 38 | LOCAL_MODULE:= mediaserver |
| 43 | 39 | LOCAL_32_BIT_ONLY := true |
| 44 | 40 |
| @@ -46,4 +42,8 @@ LOCAL_INIT_RC := mediaserver.rc | ||
| 46 | 42 | |
| 47 | 43 | LOCAL_CFLAGS := -Werror -Wall |
| 48 | 44 | |
| 45 | +ifneq ($(BOARD_NUMBER_OF_CAMERAS),) | |
| 46 | + LOCAL_CFLAGS += -DMAX_CAMERAS=$(BOARD_NUMBER_OF_CAMERAS) | |
| 47 | +endif | |
| 48 | + | |
| 49 | 49 | include $(BUILD_EXECUTABLE) |
Android-x86
Fork