From 51f8eec23a2bcc2cc190373cdd1195972d9b8804 Mon Sep 17 00:00:00 2001 From: James Dong Date: Sat, 24 Mar 2012 09:39:57 -0700 Subject: Resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni o move VideoEditorMain.h to /frameworks/av/libvideoeditor o removed JNI related C_INCLUDE in some Android.mk files o related-to-bug: 6214141 Change-Id: Iadd01eef701deb728fbac1a3f524ea1db72f6b48 --- libvideoeditor/lvpp/Android.mk | 3 - .../vss/stagefrightshells/inc/VideoEditorMain.h | 77 ++++++++++++++++++++++ .../vss/stagefrightshells/src/Android.mk | 3 - 3 files changed, 77 insertions(+), 6 deletions(-) create mode 100755 libvideoeditor/vss/stagefrightshells/inc/VideoEditorMain.h (limited to 'libvideoeditor') diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index b4faa61..4c354ec 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -66,12 +66,10 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES += \ $(TOP)/system/media/audio_utils/include \ - $(TOP)/frameworks/base/core/jni \ $(TOP)/frameworks/base/media/libmediaplayerservice \ $(TOP)/frameworks/base/media/libstagefright \ $(TOP)/frameworks/base/media/libstagefright/include \ $(TOP)/frameworks/base/media/libstagefright/rtsp \ - $(JNI_H_INCLUDE) \ $(call include-path-for, corecg graphics) \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ @@ -79,7 +77,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/vss/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ $(TOP)/frameworks/av/libvideoeditor/lvpp \ - $(TOP)/frameworks/base/media/jni/mediaeditor \ $(TOP)/frameworks/base/services/audioflinger \ $(TOP)/frameworks/native/include/media/editor \ $(TOP)/frameworks/native/include/media/openmax \ diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMain.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMain.h new file mode 100755 index 0000000..4c3b517 --- /dev/null +++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorMain.h @@ -0,0 +1,77 @@ +/* + * 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/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index d3cff3f..acc6b0e 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -29,12 +29,10 @@ LOCAL_SRC_FILES:= \ VideoEditorAudioEncoder.cpp LOCAL_C_INCLUDES += \ - $(TOP)/frameworks/base/core/jni \ $(TOP)/frameworks/base/media/libmediaplayerservice \ $(TOP)/frameworks/base/media/libstagefright \ $(TOP)/frameworks/base/media/libstagefright/include \ $(TOP)/frameworks/base/media/libstagefright/rtsp \ - $(JNI_H_INCLUDE) \ $(call include-path-for, corecg graphics) \ $(TOP)/frameworks/av/libvideoeditor/lvpp \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ @@ -42,7 +40,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/mcs/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ - $(TOP)/frameworks/base/core/jni/mediaeditor \ $(TOP)/frameworks/native/include/media/editor \ $(TOP)/frameworks/native/include/media/openmax -- cgit v1.1