diff options
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 1 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/NativeWindowRenderer.cpp | 8 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/PreviewPlayer.cpp | 4 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorPlayer.cpp | 1 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorPlayer.h | 1 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/VideoEditorPreviewController.cpp | 4 | ||||
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/Android.mk | 1 |
7 files changed, 13 insertions, 7 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 06c2e6a..8318d28 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -71,7 +71,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/media/libstagefright \ $(TOP)/frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/av/media/libstagefright/rtsp \ - $(call include-path-for, corecg graphics) \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/mcs/inc \ diff --git a/libvideoeditor/lvpp/NativeWindowRenderer.cpp b/libvideoeditor/lvpp/NativeWindowRenderer.cpp index 8b362ef..be0f747 100755 --- a/libvideoeditor/lvpp/NativeWindowRenderer.cpp +++ b/libvideoeditor/lvpp/NativeWindowRenderer.cpp @@ -568,9 +568,11 @@ void NativeWindowRenderer::destroyRenderInput(RenderInput* input) { RenderInput::RenderInput(NativeWindowRenderer* renderer, GLuint textureId) : mRenderer(renderer) , mTextureId(textureId) { - sp<BufferQueue> bq = new BufferQueue(); - mST = new GLConsumer(bq, mTextureId); - mSTC = new Surface(bq); + sp<IGraphicBufferProducer> producer; + sp<IGraphicBufferConsumer> consumer; + BufferQueue::createBufferQueue(&producer, &consumer); + mST = new GLConsumer(consumer, mTextureId); + mSTC = new Surface(producer); native_window_connect(mSTC.get(), NATIVE_WINDOW_API_MEDIA); } diff --git a/libvideoeditor/lvpp/PreviewPlayer.cpp b/libvideoeditor/lvpp/PreviewPlayer.cpp index 2bd9f84..b36fe0a 100755 --- a/libvideoeditor/lvpp/PreviewPlayer.cpp +++ b/libvideoeditor/lvpp/PreviewPlayer.cpp @@ -21,6 +21,7 @@ #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> +#include <media/IMediaHTTPService.h> #include <media/IMediaPlayerService.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/MediaBuffer.h> @@ -1160,7 +1161,8 @@ status_t PreviewPlayer::finishSetDataSource_l() { sp<DataSource> dataSource; sp<MediaExtractor> extractor; - dataSource = DataSource::CreateFromURI(mUri.string(), NULL); + dataSource = DataSource::CreateFromURI( + NULL /* httpService */, mUri.string(), NULL); if (dataSource == NULL) { return UNKNOWN_ERROR; diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp index 8d656c4..f9c3879 100755 --- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp +++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp @@ -57,6 +57,7 @@ status_t VideoEditorPlayer::setAudioPlayer(VideoEditorAudioPlayer *audioPlayer) status_t VideoEditorPlayer::setDataSource( + const sp<IMediaHTTPService> &httpService, const char *url, const KeyedVector<String8, String8> *headers) { ALOGI("setDataSource('%s')", url); if (headers != NULL) { diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.h b/libvideoeditor/lvpp/VideoEditorPlayer.h index b8c1254..781e4bc 100755 --- a/libvideoeditor/lvpp/VideoEditorPlayer.h +++ b/libvideoeditor/lvpp/VideoEditorPlayer.h @@ -98,6 +98,7 @@ public: virtual status_t initCheck(); virtual status_t setDataSource( + const sp<IMediaHTTPService> &httpService, const char *url, const KeyedVector<String8, String8> *headers); virtual status_t setDataSource(int fd, int64_t offset, int64_t length); diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp index c3cd3d0..953f35a 100755 --- a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp +++ b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp @@ -19,6 +19,7 @@ #include <utils/Log.h> #include <gui/Surface.h> +#include <media/IMediaHTTPService.h> #include "VideoEditorAudioPlayer.h" #include "PreviewRenderer.h" @@ -967,7 +968,8 @@ M4OSA_ERR VideoEditorPreviewController::preparePlayer( ALOGV("preparePlayer: instance %d file %d", playerInstance, index); const char* fileName = (const char*) pController->mClipList[index]->pFile; - pController->mVePlayer[playerInstance]->setDataSource(fileName, NULL); + pController->mVePlayer[playerInstance]->setDataSource( + NULL /* httpService */, fileName, NULL); ALOGV("preparePlayer: setDataSource instance %s", (const char *)pController->mClipList[index]->pFile); diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index e30b85d..9188942 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -33,7 +33,6 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/media/libstagefright \ $(TOP)/frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/av/media/libstagefright/rtsp \ - $(call include-path-for, corecg graphics) \ $(TOP)/frameworks/av/libvideoeditor/lvpp \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/inc \ |