| commit | ccb3506ed1845121b94f4e27244e61a46eb19815 | [log] [tgz] |
|---|---|---|
| author | Dharmaray Kundargi <dharmaray@google.com> | Sun Jan 16 16:43:20 2011 -0800 |
| committer | Dharmaray Kundargi <dharmaray@google.com> | Sun Jan 16 16:43:20 2011 -0800 |
| tree | 28dbe58d3112cb15c9b87d94897d2aa73b1042e3 | |
| parent | 6ee94582e3ce7bdd9625345e7564e3176a51a2f3 [diff] |
integrate videoeditor preview player. Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
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 @@ bool reachedEOS(status_t *finalStatus); private: + friend class VideoEditorAudioPlayer; sp<MediaSource> mSource; AudioTrack *mAudioTrack;
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 @@ private: friend struct AwesomeEvent; + friend struct PreviewPlayer; enum { PLAYING = 1,