Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 307003a8 authored by Dharmaray Kundargi's avatar Dharmaray Kundargi Committed by Android (Google) Code Review
Browse files

Merge "integrate videoeditor preview player." into honeycomb

parents 4e4f3d1d 3b3cddcc

include/media/stagefright/AudioPlayer.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public: 
    bool reachedEOS(status_t *finalStatus);



private:

    friend class VideoEditorAudioPlayer;

    sp<MediaSource> mSource;

    AudioTrack *mAudioTrack;

include/surfaceflinger/Surface.h

+6 −0
Original line number Diff line number Diff line
@@ -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;

media/libstagefright/include/AwesomePlayer.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ struct AwesomePlayer { 


private:

    friend struct AwesomeEvent;

    friend struct PreviewPlayer;



    enum {

        PLAYING             = 1,