diff options
| -rw-r--r-- | bcm4329.ko | bin | 256115 -> 267700 bytes | |||
| -rw-r--r-- | device_base.mk | 1 | ||||
| -rw-r--r-- | kernel | bin | 2907316 -> 2906852 bytes | |||
| -rwxr-xr-x | libcolorconvertyv12/Android.mk | 27 | ||||
| -rwxr-xr-x | libcolorconvertyv12/IYV12ColorConverter.c | 76 | ||||
| -rw-r--r-- | media_profiles.xml | 54 | ||||
| -rw-r--r-- | sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c | 2 |
7 files changed, 55 insertions, 105 deletions
| Binary files differ diff --git a/device_base.mk b/device_base.mk index 4990ab9..e44ee58 100644 --- a/device_base.mk +++ b/device_base.mk @@ -123,7 +123,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ libcamera \ libstagefrighthw \ - libyv12colorconvert \ com.android.future.usb.accessory # Input device calibration files Binary files differdiff --git a/libcolorconvertyv12/Android.mk b/libcolorconvertyv12/Android.mk deleted file mode 100755 index ee95db0..0000000 --- a/libcolorconvertyv12/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -ifneq ($(filter crespo crespo4g,$(TARGET_DEVICE)),) - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := \ - IYV12ColorConverter.c - - -LOCAL_MODULE := libyv12colorconvert - -LOCAL_CFLAGS := - -LOCAL_ARM_MODE := arm - -LOCAL_STATIC_LIBRARIES := -LOCAL_SHARED_LIBRARIES := - -LOCAL_C_INCLUDES := \ - $(TOP)/frameworks/base/include/media/stagefright/openmax \ - $(TOP)/frameworks/media/libvideoeditor/include - -include $(BUILD_SHARED_LIBRARY) -endif - diff --git a/libcolorconvertyv12/IYV12ColorConverter.c b/libcolorconvertyv12/IYV12ColorConverter.c deleted file mode 100755 index 7855bde..0000000 --- a/libcolorconvertyv12/IYV12ColorConverter.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * - * Copyright 2011 Samsung Electronics S.LSI Co. LTD - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * @file IYV12ColorConverter.cpp - * @brief - * @author SeungBeom Kim (sbcrux.kim@samsung.com) - * @version 1.0 - * @history - * 2010.7.27 : Create - */ - -#include <media/stagefright/openmax/OMX_IVCommon.h> -#include <IYV12ColorConverter.h> - - -int SEC_getDecoderOutputFormat() -{ - return (int)OMX_COLOR_FormatYUV420Planar; -} - -int SEC_convertDecoderOutputToYV12( - void* decoderBits, int decoderWidth, int decoderHeight, - ARect decoderRect, void* dstBits) -{ - int ret = -1; - return ret; -} - -int SEC_getEncoderInputFormat() -{ - return (int)OMX_COLOR_FormatYUV420Planar; -} - -int SEC_convertYV12ToEncoderInput( - void* srcBits, int srcWidth, int srcHeight, - int encoderWidth, int encoderHeight, ARect encoderRect, - void* encoderBits) -{ - int ret = -1; - return ret; -} - -int SEC_getEncoderInputBufferInfo( - int srcWidth, int srcHeight, - int* encoderWidth, int* encoderHeight, - ARect* encoderRect, int* encoderBufferSize) -{ - int ret = -1; - return ret; -} - -void getYV12ColorConverter(IYV12ColorConverter *converter) -{ - converter->getDecoderOutputFormat = SEC_getDecoderOutputFormat; - converter->convertDecoderOutputToYV12 = SEC_convertDecoderOutputToYV12; - converter->getEncoderInputFormat = SEC_getEncoderInputFormat; - converter->convertDecoderOutputToYV12 = SEC_convertDecoderOutputToYV12; - converter->getEncoderInputBufferInfo = SEC_getEncoderInputBufferInfo; - return; -} - diff --git a/media_profiles.xml b/media_profiles.xml index 2556ef9..6db0b2e 100644 --- a/media_profiles.xml +++ b/media_profiles.xml @@ -111,6 +111,33 @@ </EncoderProfile> + <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60"> + <Video codec="h264" + bitRate="3000000" + width="720" + height="480" + frameRate="30" /> + + <!-- Audio settings are not used for timealpse video recording --> + <Audio codec="aac" + bitRate="96000" + sampleRate="16000" + channels="1" /> + </EncoderProfile> + + <EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="30"> + <Video codec="h264" + bitRate="256000" + width="176" + height="144" + frameRate="30" /> + <!-- Audio settings are not used for timealpse video recording --> + <Audio codec="amrnb" + bitRate="12200" + sampleRate="8000" + channels="1" /> + </EncoderProfile> + <ImageEncoding quality="90" /> <ImageEncoding quality="80" /> <ImageEncoding quality="70" /> @@ -147,6 +174,33 @@ </EncoderProfile> + <EncoderProfile quality="timelapse480p" fileFormat="mp4" duration="60"> + <Video codec="h264" + bitRate="1000000" + width="640" + height="480" + frameRate="15" /> + + <!-- Audio settings are not used for timealpse video recording --> + <Audio codec="aac" + bitRate="96000" + sampleRate="16000" + channels="1" /> + </EncoderProfile> + + <EncoderProfile quality="timelapseqcif" fileFormat="3gp" duration="30"> + <Video codec="h264" + bitRate="256000" + width="176" + height="144" + frameRate="15" /> + <!-- Audio settings are not used for timealpse video recording --> + <Audio codec="amrnb" + bitRate="12200" + sampleRate="8000" + channels="1" /> + </EncoderProfile> + <ImageEncoding quality="90" /> <ImageEncoding quality="80" /> <ImageEncoding quality="70" /> diff --git a/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c index 446af9a..3a71f03 100644 --- a/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c +++ b/sec_mm/sec_omx/sec_omx_component/video/dec/h264dec/SEC_OMX_H264dec.c @@ -884,6 +884,7 @@ OMX_ERRORTYPE SEC_MFC_H264_Decode(OMX_COMPONENTTYPE *pOMXComponent, SEC_OMX_DATA /** Update Frame Size **/ + pH264Dec->hMFCH264Handle.bConfiguredMFC = OMX_TRUE; if ((cropInfo.crop_left_offset != 0) || (cropInfo.crop_right_offset != 0) || (cropInfo.crop_top_offset != 0) || (cropInfo.crop_bottom_offset != 0)) { /* change width and height information */ @@ -923,7 +924,6 @@ OMX_ERRORTYPE SEC_MFC_H264_Decode(OMX_COMPONENTTYPE *pOMXComponent, SEC_OMX_DATA NULL); } - pH264Dec->hMFCH264Handle.bConfiguredMFC = OMX_TRUE; #ifdef ADD_SPS_PPS_I_FRAME ret = OMX_ErrorInputDataDecodeYet; #else |