status_t PreviewPlayer::initRenderer_l() {
- if (mSurface != NULL || mISurface != NULL) {
+ if (mSurface != NULL) {
sp<MetaData> meta = mVideoSource->getFormat();
int32_t format;
}
-void PreviewPlayer::setISurface(const sp<ISurface> &isurface) {
- Mutex::Autolock autoLock(mLock);
- mISurface = isurface;
-}
-
-
status_t PreviewPlayer::seekTo(int64_t timeUs) {
if ((mExtractorFlags & MediaExtractor::CAN_SEEK) || (mIsVideoSourceJpg)) {
mFlags = state->mFlags & (AUTO_LOOPING | LOOPING | AT_EOS);
- if (state->mLastVideoFrame && (mSurface != NULL || mISurface != NULL)) {
+ if (state->mLastVideoFrame && (mSurface != NULL)) {
mVideoRenderer =
PreviewLocalRenderer::initPreviewLocalRenderer(
true, // previewOnly
status_t play();
- void setISurface(const sp<ISurface> &isurface);
-
status_t seekTo(int64_t timeUs);
status_t getVideoDimensions(int32_t *width, int32_t *height) const;
AUTO_LOOPING = 1024,
};
- sp<ISurface> mISurface;
-
void cancelPlayerEvents(bool keepBufferingGoing = false);
status_t setDataSource_l(const sp<MediaExtractor> &extractor);
status_t setDataSource_l(
return (!OK);\r
}\r
\r
-// needed?\r
-status_t VideoEditorPlayer::setVideoISurface(const sp<ISurface> &surface) {\r
- LOGV("setVideoISurface");\r
-\r
- mPlayer->setISurface(surface);\r
- return OK;\r
-}\r
-\r
status_t VideoEditorPlayer::setVideoSurface(const sp<Surface> &surface) {\r
LOGV("setVideoSurface");\r
\r
const char *url, const KeyedVector<String8, String8> *headers);\r
\r
virtual status_t setDataSource(int fd, int64_t offset, int64_t length);\r
- // needed?\r
- virtual status_t setVideoISurface(const sp<ISurface> &surface);\r
virtual status_t setVideoSurface(const sp<Surface> &surface);\r
virtual status_t setVideoSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture);\r
virtual status_t prepare();\r
Mutex::Autolock autoLock(mLock);\r
\r
mSurface = surface;\r
- mISurface = surface->getISurface();\r
- LOGV("setSurface: mISurface = %p", mISurface.get());\r
return M4NO_ERROR;\r
}\r
\r
\r
Mutex::Autolock autoLock(mLock);\r
\r
- // Get the Isurface to be passed to renderer\r
- mISurface = surface->getISurface();\r
-\r
// Delete previous renderer instance\r
if(mTarget != NULL) {\r
delete mTarget;\r
M4VIFI_UInt8 *pixelArray = NULL;\r
Mutex::Autolock autoLock(mLock);\r
\r
- // Get the Isurface to be passed to renderer\r
- mISurface = surface->getISurface();\r
if (pCurrEditInfo != NULL) {\r
pCurrEditInfo->overlaySettingsIndex = -1;\r
}\r
LOGV("preparePlayer: setDataSource instance %s",\r
(const char *)pController->mClipList[index]->pFile);\r
\r
- pController->mVePlayer[playerInstance]->setVideoISurface(\r
- pController->mISurface);\r
- LOGV("preparePlayer: setVideoISurface");\r
-\r
pController->mVePlayer[playerInstance]->setVideoSurface(\r
pController->mSurface);\r
LOGV("preparePlayer: setVideoSurface");\r
private:\r
sp<VideoEditorPlayer> mVePlayer[NBPLAYER_INSTANCES];\r
int mCurrentPlayer; //Instance of the player currently being used\r
- sp<ISurface> mISurface;\r
sp<Surface> mSurface;\r
mutable Mutex mLock;\r
M4OSA_Context mThreadContext;\r