diff options
Diffstat (limited to 'libvideoeditor/vss/stagefrightshells/inc')
10 files changed, 0 insertions, 661 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditor3gpReader.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditor3gpReader.h deleted file mode 100755 index 7a9a012..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditor3gpReader.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditor3gpReader.cpp -* @brief StageFright shell 3GP Reader -************************************************************************* -*/ -#ifndef VIDEOEDITOR_3GPREADER_H -#define VIDEOEDITOR_3GPREADER_H - -#include "M4READER_Common.h" - -M4OSA_ERR VideoEditor3gpReader_getInterface( - M4READER_MediaType *pMediaType, - M4READER_GlobalInterface **pRdrGlobalInterface, - M4READER_DataInterface **pRdrDataInterface); - -#endif /* VIDEOEDITOR_3GPREADER_H */ - diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h deleted file mode 100755 index 0d3b801..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioDecoder.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditorAudioDecoder.cpp -* @brief StageFright shell Audio Decoder -************************************************************************* -*/ -#ifndef VIDEOEDITOR_AUDIODECODER_H -#define VIDEOEDITOR_AUDIODECODER_H - -#include "M4AD_Common.h" - -M4OSA_ERR VideoEditorAudioDecoder_getInterface_AAC(M4AD_Type* pDecoderType, - M4AD_Interface** pDecoderInterface); - -M4OSA_ERR VideoEditorAudioDecoder_getInterface_AMRNB(M4AD_Type* pDecoderType, - M4AD_Interface** pDecoderInterface); - -M4OSA_ERR VideoEditorAudioDecoder_getInterface_AMRWB(M4AD_Type* pDecoderType, - M4AD_Interface** pDecoderInterface); - -M4OSA_ERR VideoEditorAudioDecoder_getInterface_MP3(M4AD_Type* pDecoderType, - M4AD_Interface** pDecoderInterface); - -#endif /* VIDEOEDITOR_AUDIODECODER_H */ diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h deleted file mode 100755 index f4f6b04..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorAudioEncoder.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditorAudioEncoder.cpp -* @brief StageFright shell Audio Encoder -************************************************************************* -*/ -#ifndef VIDEOEDITOR_AUDIOENCODER_H -#define VIDEOEDITOR_AUDIOENCODER_H - -#include "M4OSA_CoreID.h" -#include "M4OSA_Memory.h" -#include "M4ENCODER_AudioCommon.h" - -M4OSA_ERR VideoEditorAudioEncoder_getInterface_AAC( - M4ENCODER_AudioFormat* pFormat, - M4ENCODER_AudioGlobalInterface** pEncoderInterface); - -M4OSA_ERR VideoEditorAudioEncoder_getInterface_AMRNB( - M4ENCODER_AudioFormat* pFormat, - M4ENCODER_AudioGlobalInterface** pEncoderInterface); - -M4OSA_ERR VideoEditorAudioEncoder_getInterface_MP3( - M4ENCODER_AudioFormat* pFormat, - M4ENCODER_AudioGlobalInterface** pEncoderInterface); - -#endif /* VIDEOEDITOR_AUDIOENCODER_H */ diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorBuffer.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorBuffer.h deleted file mode 100755 index 3aff6a7..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorBuffer.h +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditorBuffer.c -* @brief StageFright shell Buffer -************************************************************************* -*/ -#ifndef VIDEOEDITOR_BUFFER_H -#define VIDEOEDITOR_BUFFER_H - -#include "M4OSA_Types.h" -#include "M4OSA_Debug.h" -#include "M4OSA_Memory.h" -#include "M4OSA_CharStar.h" -#include "M4_Utils.h" - -#include "LV_Macros.h" - -/*--- Core id for VIDEOEDITOR Buffer allocations ---*/ -#define VIDEOEDITOR_BUFFER_EXTERNAL 0x012F - -/* ----- errors -----*/ -#define M4ERR_NO_BUFFER_AVAILABLE \ - M4OSA_ERR_CREATE(M4_ERR,VIDEOEDITOR_BUFFER_EXTERNAL,0x000001) -#define M4ERR_NO_BUFFER_MATCH \ - M4OSA_ERR_CREATE(M4_ERR,VIDEOEDITOR_BUFFER_EXTERNAL,0x000002) - -typedef enum { - VIDEOEDITOR_BUFFER_kEmpty = 0, - VIDEOEDITOR_BUFFER_kFilled, -} VIDEOEDITOR_BUFFER_State; - -/** - ************************************************************************ - * Structure LVOMX_BUFFER_Buffer - * @brief One OMX Buffer and data related to it - ************************************************************************ -*/ -typedef struct { - M4OSA_Void* pData; /**< Pointer to the data*/ - M4OSA_UInt32 size; - VIDEOEDITOR_BUFFER_State state; /**< Buffer state */ - M4OSA_UInt32 idx; /**< Index of the buffer inside the pool */ - M4_MediaTime buffCTS; /**< Time stamp of the buffer */ -} VIDEOEDITOR_BUFFER_Buffer; - -/** - ************************************************************************ - * Structure LVOMX_BUFFER_Pool - * @brief Structure to manage buffers - ************************************************************************ -*/ -typedef struct { - VIDEOEDITOR_BUFFER_Buffer* pNXPBuffer; - M4OSA_UInt32 NB; - M4OSA_Char* poolName; -} VIDEOEDITOR_BUFFER_Pool; - -#ifdef __cplusplus -extern "C" -{ -#endif //__cplusplus - -/** - ************************************************************************ - M4OSA_ERR VIDEOEDITOR_BUFFER_allocatePool(VIDEOEDITOR_BUFFER_Pool** ppool, - * M4OSA_UInt32 nbBuffers) - * @brief Allocate a pool of nbBuffers buffers - * - * @param ppool : IN The buffer pool to create - * @param nbBuffers : IN The number of buffers in the pool - * @param poolName : IN a name given to the pool - * @return Error code - ************************************************************************ -*/ -M4OSA_ERR VIDEOEDITOR_BUFFER_allocatePool(VIDEOEDITOR_BUFFER_Pool** ppool, - M4OSA_UInt32 nbBuffers, M4OSA_Char* poolName); - -/** - ************************************************************************ - M4OSA_ERR VIDEOEDITOR_BUFFER_freePool(LVOMX_BUFFER_Pool* ppool) - * @brief Deallocate a buffer pool - * - * @param ppool : IN The buffer pool to free - * @return Error code - ************************************************************************ -*/ -M4OSA_ERR VIDEOEDITOR_BUFFER_freePool(VIDEOEDITOR_BUFFER_Pool* ppool); - -/** - ************************************************************************ - M4OSA_ERR VIDEOEDITOR_BUFFER_getBuffer(VIDEOEDITOR_BUFFER_Pool* ppool, - * VIDEOEDITOR_BUFFER_Buffer** pNXPBuffer) - * @brief Returns a buffer in a given state - * - * @param ppool : IN The buffer pool - * @param desiredState : IN The buffer state - * @param pNXPBuffer : IN The selected buffer - * @return Error code - ************************************************************************ -*/ -M4OSA_ERR VIDEOEDITOR_BUFFER_getBuffer(VIDEOEDITOR_BUFFER_Pool* ppool, - VIDEOEDITOR_BUFFER_State desiredState, - VIDEOEDITOR_BUFFER_Buffer** pNXPBuffer); - - -M4OSA_ERR VIDEOEDITOR_BUFFER_initPoolBuffers(VIDEOEDITOR_BUFFER_Pool* ppool, - M4OSA_UInt32 lSize); - -M4OSA_ERR VIDEOEDITOR_BUFFER_getOldestBuffer(VIDEOEDITOR_BUFFER_Pool *pool, - VIDEOEDITOR_BUFFER_State desiredState, - VIDEOEDITOR_BUFFER_Buffer** pNXPBuffer); - -#ifdef __cplusplus -} -#endif //__cplusplus -#endif /*VIDEOEDITOR_BUFFER_H*/ - diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMain.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMain.h deleted file mode 100755 index 4c3b517..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMain.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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. - */ - -#ifndef __VIDEO_EDITOR_API_H__ -#define __VIDEO_EDITOR_API_H__ - -#include "M4OSA_Types.h" - -typedef enum -{ - MSG_TYPE_PROGRESS_INDICATION, // Playback progress indication event - MSG_TYPE_PLAYER_ERROR, // Playback error - MSG_TYPE_PREVIEW_END, // Preview of clips is complete - MSG_TYPE_OVERLAY_UPDATE, // update overlay during preview - MSG_TYPE_OVERLAY_CLEAR, // clear the overlay -} progress_callback_msg_type; - -typedef struct { - int overlaySettingsIndex; - int clipIndex; -} VideoEditorCurretEditInfo; - -typedef struct -{ - M4OSA_Void *pFile; /** PCM file path */ - M4OSA_Bool bRemoveOriginal; /** If true, the original audio track - is not taken into account */ - M4OSA_UInt32 uiNbChannels; /** Number of channels (1=mono, 2=stereo) of BGM clip*/ - M4OSA_UInt32 uiSamplingFrequency; /** Sampling audio frequency (8000 for amr, 16000 or - more for aac) of BGM clip*/ - M4OSA_UInt32 uiExtendedSamplingFrequency; /** Extended frequency for AAC+, - eAAC+ streams of BGM clip*/ - M4OSA_UInt32 uiAddCts; /** Time, in milliseconds, at which the added - audio track is inserted */ - M4OSA_UInt32 uiAddVolume; /** Volume, in percentage, of the added audio track */ - M4OSA_UInt32 beginCutMs; - M4OSA_UInt32 endCutMs; - M4OSA_Int32 fileType; - M4OSA_Bool bLoop; /** Looping on/off **/ - /* Audio ducking */ - M4OSA_UInt32 uiInDucking_threshold; /** Threshold value at which - background music shall duck */ - M4OSA_UInt32 uiInDucking_lowVolume; /** lower the background track to - this factor of current level */ - M4OSA_Bool bInDucking_enable; /** enable ducking */ - M4OSA_UInt32 uiBTChannelCount; /** channel count for BT */ - M4OSA_Void *pPCMFilePath; -} M4xVSS_AudioMixingSettings; - -typedef struct -{ - M4OSA_Void *pBuffer; /* YUV420 buffer of frame to be rendered*/ - M4OSA_UInt32 timeMs; /* time stamp of the frame to be rendered*/ - M4OSA_UInt32 uiSurfaceWidth; /* Surface display width*/ - M4OSA_UInt32 uiSurfaceHeight; /* Surface display height*/ - M4OSA_UInt32 uiFrameWidth; /* Frame width*/ - M4OSA_UInt32 uiFrameHeight; /* Frame height*/ - M4OSA_Bool bApplyEffect; /* Apply video effects before render*/ - M4OSA_UInt32 clipBeginCutTime; /* Clip begin cut time relative to storyboard */ - M4OSA_UInt32 clipEndCutTime; /* Clip end cut time relative to storyboard */ - M4OSA_UInt32 videoRotationDegree; /* Video rotation degree */ - -} VideoEditor_renderPreviewFrameStr; -#endif /*__VIDEO_EDITOR_API_H__*/ diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMp3Reader.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMp3Reader.h deleted file mode 100755 index 5b3be40..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMp3Reader.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditorMp3Reader.cpp -* @brief StageFright shell MP3 Reader -************************************************************************* -*/ -#ifndef VIDEOEDITOR_MP3READER_H -#define VIDEOEDITOR_MP3READER_H - -#include "M4READER_Common.h" - -M4OSA_ERR VideoEditorMp3Reader_getInterface( - M4READER_MediaType *pMediaType, - M4READER_GlobalInterface **pRdrGlobalInterface, - M4READER_DataInterface **pRdrDataInterface); - -#endif /* VIDEOEDITOR_MP3READER_H */ diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h deleted file mode 100755 index a21b21d..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditorUtils.cpp -* @brief StageFright shell Utilities -************************************************************************* -*/ -#ifndef ANDROID_UTILS_H_ -#define ANDROID_UTILS_H_ - -/******************* - * HEADERS * - *******************/ - -#include "M4OSA_Debug.h" - -#include "utils/Log.h" -#include <utils/RefBase.h> -#include <utils/threads.h> -#include <media/stagefright/MediaSource.h> -#include <media/stagefright/MetaData.h> - -/** - ************************************************************************* - * VIDEOEDITOR_CHECK(test, errCode) - * @note This macro displays an error message and goes to function cleanUp label - * if the test fails. - ************************************************************************* - */ -#define VIDEOEDITOR_CHECK(test, errCode) \ -{ \ - if( !(test) ) { \ - ALOGV("!!! %s (L%d) check failed : " #test ", yields error 0x%.8x", \ - __FILE__, __LINE__, errCode); \ - err = (errCode); \ - goto cleanUp; \ - } \ -} - -/** - ************************************************************************* - * SAFE_FREE(p) - * @note This macro calls free and makes sure the pointer is set to NULL. - ************************************************************************* - */ -#define SAFE_FREE(p) \ -{ \ - if(M4OSA_NULL != (p)) { \ - free((p)) ; \ - (p) = M4OSA_NULL ; \ - } \ -} - -/** - ************************************************************************* - * SAFE_MALLOC(p, type, count, comment) - * @note This macro allocates a buffer, checks for success and fills the buffer - * with 0. - ************************************************************************* - */ -#define SAFE_MALLOC(p, type, count, comment) \ -{ \ - (p) = (type*)M4OSA_32bitAlignedMalloc(sizeof(type)*(count), 0xFF,(M4OSA_Char*)comment);\ - VIDEOEDITOR_CHECK(M4OSA_NULL != (p), M4ERR_ALLOC); \ - memset((void *)(p), 0,sizeof(type)*(count)); \ -} - - - /******************** - * UTILITIES * - ********************/ - - -namespace android { - -/*--------------------------*/ -/* DISPLAY METADATA CONTENT */ -/*--------------------------*/ -void displayMetaData(const sp<MetaData> meta); - -// Build the AVC codec spcific info from the StageFright encoders output -status_t buildAVCCodecSpecificData(uint8_t **outputData, size_t *outputSize, - const uint8_t *data, size_t size, MetaData *param); - -}//namespace android - - -#endif //ANDROID_UTILS_H_ diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h deleted file mode 100755 index 1eea3a6..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditorVideoDecoder.cpp -* @brief StageFright shell video decoder -************************************************************************* -*/ -#ifndef VIDEOEDITOR_VIDEODECODER_H -#define VIDEOEDITOR_VIDEODECODER_H - -#include "M4DECODER_Common.h" - -M4OSA_ERR VideoEditorVideoDecoder_getInterface_MPEG4( - M4DECODER_VideoType *pDecoderType, - M4OSA_Context *pDecoderInterface); - -M4OSA_ERR VideoEditorVideoDecoder_getInterface_H264( - M4DECODER_VideoType *pDecoderType, - M4OSA_Context *pDecoderInterface); - -M4OSA_ERR VideoEditorVideoDecoder_getSoftwareInterface_MPEG4( - M4DECODER_VideoType *pDecoderType, - M4OSA_Context *pDecInterface); - -M4OSA_ERR VideoEditorVideoDecoder_getSoftwareInterface_H264( - M4DECODER_VideoType *pDecoderType, - M4OSA_Context *pDecInterface); - -M4OSA_ERR VideoEditorVideoDecoder_getVideoDecodersAndCapabilities( - M4DECODER_VideoDecoders** decoders); - -#endif // VIDEOEDITOR_VIDEODECODER_H diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h deleted file mode 100755 index 6762643..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoDecoder_internal.h +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditorVideoDecoder_Internal.h -* @brief StageFright shell video decoder internal header file* -************************************************************************* -*/ - -#include "M4OSA_Types.h" -#include "M4OSA_Debug.h" -#include "M4OSA_Memory.h" -#include "M4_Common.h" -#include "M4OSA_CoreID.h" - -#include "M4DA_Types.h" -#include "M4READER_Common.h" -#include "M4VIFI_FiltersAPI.h" -#include "M4TOOL_VersionInfo.h" -#include "M4DECODER_Common.h" -#include "M4OSA_Semaphore.h" -#include "VideoEditorBuffer.h" -#include "M4VD_Tools.h" -#include "I420ColorConverter.h" - -#include <utils/RefBase.h> -#include <android/rect.h> -#include <OMX_Video.h> -#include <media/stagefright/MediaErrors.h> -#include <media/stagefright/OMXCodec.h> -#include <media/stagefright/OMXClient.h> -#include <media/stagefright/MediaSource.h> -#include <media/stagefright/MediaBuffer.h> -#include <media/stagefright/MediaBufferGroup.h> -#include <media/stagefright/MediaDefs.h> - -#define VIDEOEDITOR_VIDEC_SHELL_VER_MAJOR 0 -#define VIDEOEDITOR_VIDEC_SHELL_VER_MINOR 0 -#define VIDEOEDITOR_VIDEC_SHELL_VER_REVISION 1 - -/* ERRORS */ -#define M4ERR_SF_DECODER_RSRC_FAIL M4OSA_ERR_CREATE(M4_ERR, 0xFF, 0x0001) - -namespace android { - -typedef enum { - VIDEOEDITOR_kMpeg4VideoDec, - VIDEOEDITOR_kH263VideoDec, - VIDEOEDITOR_kH264VideoDec -} VIDEOEDITOR_CodecType; - - -/*typedef struct{ - M4OSA_UInt32 stream_byte; - M4OSA_UInt32 stream_index; - M4OSA_MemAddr8 in; - -} VIDEOEDITOR_VIDEO_Bitstream_ctxt;*/ - -typedef M4VS_Bitstream_ctxt VIDEOEDITOR_VIDEO_Bitstream_ctxt; - -typedef struct { - - /** Stagefrigth params */ - OMXClient mClient; /**< OMX Client session instance. */ - sp<MediaSource> mVideoDecoder; /**< Stagefright decoder instance */ - sp<MediaSource> mReaderSource; /**< Reader access > */ - - /* READER */ - M4READER_GlobalInterface *m_pReaderGlobal; - M4READER_DataInterface *m_pReader; - M4_AccessUnit *m_pNextAccessUnitToDecode; - - /* STREAM PARAMS */ - M4_VideoStreamHandler* m_pVideoStreamhandler; - - /* User filter params. */ - M4VIFI_PlanConverterFunctionType *m_pFilter; - M4OSA_Void *m_pFilterUserData; - - M4_MediaTime m_lastDecodedCTS; - M4_MediaTime m_lastRenderCts; - M4OSA_Bool mReachedEOS; - VIDEOEDITOR_CodecType mDecoderType; - M4DECODER_VideoSize m_VideoSize; - M4DECODER_MPEG4_DecoderConfigInfo m_Dci; /**< Decoder Config info */ - VIDEOEDITOR_BUFFER_Pool *m_pDecBufferPool; /**< Decoded buffer pool */ - OMX_COLOR_FORMATTYPE decOuputColorFormat; - - M4OSA_UInt32 mNbInputFrames; - M4OSA_Double mFirstInputCts; - M4OSA_Double mLastInputCts; - M4OSA_UInt32 mNbRenderedFrames; - M4OSA_Double mFirstRenderedCts; - M4OSA_Double mLastRenderedCts; - M4OSA_UInt32 mNbOutputFrames; - M4OSA_Double mFirstOutputCts; - M4OSA_Double mLastOutputCts; - M4OSA_Int32 mGivenWidth, mGivenHeight; //Used in case of - //INFO_FORMAT_CHANGED - ARect mCropRect; // These are obtained from kKeyCropRect. - I420ColorConverter* mI420ColorConverter; - - // Time interval between two consequtive/neighboring video frames. - M4_MediaTime mFrameIntervalMs; - -} VideoEditorVideoDecoder_Context; - -} //namespace android diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h deleted file mode 100755 index fd5154f..0000000 --- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorVideoEncoder.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * 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 VideoEditorVideoEncoder.cpp -* @brief StageFright shell video encoder -************************************************************************* -*/ -#ifndef VIDEOEDITOR_VIDEOENCODER_H -#define VIDEOEDITOR_VIDEOENCODER_H - -#include "M4ENCODER_common.h" - -M4OSA_ERR VideoEditorVideoEncoder_getInterface_H263(M4ENCODER_Format* pFormat, - M4ENCODER_GlobalInterface** pEncoderInterface, M4ENCODER_OpenMode mode); - -M4OSA_ERR VideoEditorVideoEncoder_getInterface_MPEG4(M4ENCODER_Format* pFormat, - M4ENCODER_GlobalInterface** pEncoderInterface, M4ENCODER_OpenMode mode); - -M4OSA_ERR VideoEditorVideoEncoder_getInterface_H264(M4ENCODER_Format* pFormat, - M4ENCODER_GlobalInterface** pEncoderInterface, M4ENCODER_OpenMode mode); - -#endif //VIDEOEDITOR_VIDEOENCODER_H |