diff options
| author | Dharmaray Kundargi <dharmaray@google.com> | 2011-01-17 11:40:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-17 11:40:16 -0800 |
| commit | bf6ccb04b93f7a2738f29f2d96a69f32f7602f51 (patch) | |
| tree | 810eb2b3fc905207d1cb9d16a9c66848d205a8bc /include | |
| parent | f7465eb652717d89193b0208a85edc8bd1ef0b4d (diff) | |
| parent | 307003a844c90458bcfd7398c44bbae734936238 (diff) | |
| download | frameworks_base-bf6ccb04b93f7a2738f29f2d96a69f32f7602f51.zip frameworks_base-bf6ccb04b93f7a2738f29f2d96a69f32f7602f51.tar.gz frameworks_base-bf6ccb04b93f7a2738f29f2d96a69f32f7602f51.tar.bz2 | |
am 307003a8: Merge "integrate videoeditor preview player." into honeycomb
* commit '307003a844c90458bcfd7398c44bbae734936238':
integrate videoeditor preview player.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AudioPlayer.h | 1 | ||||
| -rw-r--r-- | include/surfaceflinger/Surface.h | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h index 37af032..d12ee9c 100644 --- a/include/media/stagefright/AudioPlayer.h +++ b/include/media/stagefright/AudioPlayer.h @@ -65,6 +65,7 @@ public: bool reachedEOS(status_t *finalStatus); private: + friend class VideoEditorAudioPlayer; sp<MediaSource> mSource; AudioTrack *mAudioTrack; diff --git a/include/surfaceflinger/Surface.h b/include/surfaceflinger/Surface.h index 5532052..d783caf 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/surfaceflinger/Surface.h @@ -100,6 +100,9 @@ private: friend class MediaPlayer; // for testing friend class Test; + // videoEditor preview classes + friend class VideoEditorPreviewController; + const sp<ISurface>& getISurface() const { return mSurface; } @@ -181,6 +184,9 @@ private: friend class SoftwareRenderer; // this is just to be able to write some unit tests friend class Test; + // videoEditor preview classes + friend class VideoEditorPreviewController; + friend class PreviewRenderer; private: friend class SurfaceComposerClient; |