Merge "integrate videoeditor preview player." into honeycomb
This commit is contained in:
commit
f47c93b79c
|
@ -100,6 +100,9 @@ private:
|
||||||
friend class MediaPlayer;
|
friend class MediaPlayer;
|
||||||
// for testing
|
// for testing
|
||||||
friend class Test;
|
friend class Test;
|
||||||
|
// videoEditor preview classes
|
||||||
|
friend class VideoEditorPreviewController;
|
||||||
|
|
||||||
const sp<ISurface>& getISurface() const { return mSurface; }
|
const sp<ISurface>& getISurface() const { return mSurface; }
|
||||||
|
|
||||||
|
|
||||||
|
@ -181,6 +184,9 @@ private:
|
||||||
friend class SoftwareRenderer;
|
friend class SoftwareRenderer;
|
||||||
// this is just to be able to write some unit tests
|
// this is just to be able to write some unit tests
|
||||||
friend class Test;
|
friend class Test;
|
||||||
|
// videoEditor preview classes
|
||||||
|
friend class VideoEditorPreviewController;
|
||||||
|
friend class PreviewRenderer;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class SurfaceComposerClient;
|
friend class SurfaceComposerClient;
|
||||||
|
|
Loading…
Reference in New Issue