diff options
author | Daniel Lam <dalam@google.com> | 2012-02-23 14:35:13 -0800 |
---|---|---|
committer | Daniel Lam <dalam@google.com> | 2012-03-13 14:39:28 -0700 |
commit | abf0610a8cea021548f2909e1d47d656206f641c (patch) | |
tree | 95c55de02a634a670a92b76eb721023d488c83dc /media/libstagefright/tests | |
parent | 36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab (diff) | |
download | frameworks_av-abf0610a8cea021548f2909e1d47d656206f641c.zip frameworks_av-abf0610a8cea021548f2909e1d47d656206f641c.tar.gz frameworks_av-abf0610a8cea021548f2909e1d47d656206f641c.tar.bz2 |
SurfaceTexture: Fully refactored from BufferQueue
Cleaning up camera and media interactions as part of SurfaceTexture refactoring
Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
Diffstat (limited to 'media/libstagefright/tests')
-rw-r--r-- | media/libstagefright/tests/SurfaceMediaSource_test.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/libstagefright/tests/SurfaceMediaSource_test.cpp b/media/libstagefright/tests/SurfaceMediaSource_test.cpp index 3dcd9fc..fe77cf7 100644 --- a/media/libstagefright/tests/SurfaceMediaSource_test.cpp +++ b/media/libstagefright/tests/SurfaceMediaSource_test.cpp @@ -107,7 +107,7 @@ protected: window.get(), NULL); } else { ALOGV("No actual display. Choosing EGLSurface based on SurfaceMediaSource"); - sp<SurfaceMediaSource> sms = new SurfaceMediaSource( + sp<ISurfaceTexture> sms = new SurfaceMediaSource( getSurfaceWidth(), getSurfaceHeight()); sp<SurfaceTextureClient> stc = new SurfaceTextureClient(sms); sp<ANativeWindow> window = stc; @@ -360,7 +360,8 @@ protected: android::ProcessState::self()->startThreadPool(); mSMS = new SurfaceMediaSource(mYuvTexWidth, mYuvTexHeight); mSMS->setSynchronousMode(true); - mSTC = new SurfaceTextureClient(mSMS); + // Manual cast is required to avoid constructor ambiguity + mSTC = new SurfaceTextureClient(static_cast<sp<ISurfaceTexture> >( mSMS)); mANW = mSTC; } @@ -395,7 +396,7 @@ protected: ALOGV("SMS-GLTest::SetUp()"); android::ProcessState::self()->startThreadPool(); mSMS = new SurfaceMediaSource(mYuvTexWidth, mYuvTexHeight); - mSTC = new SurfaceTextureClient(mSMS); + mSTC = new SurfaceTextureClient(static_cast<sp<ISurfaceTexture> >( mSMS)); mANW = mSTC; // Doing the setup related to the GL Side @@ -773,7 +774,7 @@ TEST_F(SurfaceMediaSourceGLTest, ChooseAndroidRecordableEGLConfigDummyWriter) { ALOGV("Verify creating a surface w/ right config + dummy writer*********"); mSMS = new SurfaceMediaSource(mYuvTexWidth, mYuvTexHeight); - mSTC = new SurfaceTextureClient(mSMS); + mSTC = new SurfaceTextureClient(static_cast<sp<ISurfaceTexture> >( mSMS)); mANW = mSTC; DummyRecorder writer(mSMS); |