summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDharmaray Kundargi <dharmaray@google.com>2011-01-17 10:52:23 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-17 10:52:23 -0800
commit307003a844c90458bcfd7398c44bbae734936238 (patch)
tree4092f65479f119a0ed84ec8a3d4aeb54ee10c35b
parent4e4f3d1df475b03a1a49954d2b3b4530e39778ab (diff)
parent3b3cddccc105a7eaade4bb98f0eead3d3d3a2cc9 (diff)
downloadframeworks_base-307003a844c90458bcfd7398c44bbae734936238.zip
frameworks_base-307003a844c90458bcfd7398c44bbae734936238.tar.gz
frameworks_base-307003a844c90458bcfd7398c44bbae734936238.tar.bz2
Merge "integrate videoeditor preview player." into honeycomb
-rw-r--r--include/media/stagefright/AudioPlayer.h1
-rw-r--r--include/surfaceflinger/Surface.h6
-rw-r--r--media/libstagefright/include/AwesomePlayer.h1
3 files changed, 8 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;
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h
index 130ad82..fe00856 100644
--- a/media/libstagefright/include/AwesomePlayer.h
+++ b/media/libstagefright/include/AwesomePlayer.h
@@ -100,6 +100,7 @@ struct AwesomePlayer {
private:
friend struct AwesomeEvent;
+ friend struct PreviewPlayer;
enum {
PLAYING = 1,