summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDharmaray Kundargi <dharmaray@google.com>2011-01-16 16:43:20 -0800
committerDharmaray Kundargi <dharmaray@google.com>2011-01-16 16:43:20 -0800
commit3b3cddccc105a7eaade4bb98f0eead3d3d3a2cc9 (patch)
tree36b8fb5fa189c1b20f057e095d554454571a3fe5 /include
parent981df1d9931c1bd48dbb735437823b92db51e1a1 (diff)
downloadframeworks_base-3b3cddccc105a7eaade4bb98f0eead3d3d3a2cc9.zip
frameworks_base-3b3cddccc105a7eaade4bb98f0eead3d3d3a2cc9.tar.gz
frameworks_base-3b3cddccc105a7eaade4bb98f0eead3d3d3a2cc9.tar.bz2
integrate videoeditor preview player.
Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/AudioPlayer.h1
-rw-r--r--include/surfaceflinger/Surface.h6
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;