From a0ead0a2d2ce1d114ad3a17d755dddce831abb40 Mon Sep 17 00:00:00 2001 From: Jamie Gennis Date: Thu, 23 Aug 2012 20:24:09 -0700 Subject: SurfaceMediaSource: a few fixes / cleanups - Remove the setting of mStopped to true in onBuffersReleased - Cleaned up a few function call logs - Removed the 'reset' method. Change-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f --- include/media/stagefright/SurfaceMediaSource.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'include/media') diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h index 4a8e221..724c68d 100644 --- a/include/media/stagefright/SurfaceMediaSource.h +++ b/include/media/stagefright/SurfaceMediaSource.h @@ -73,10 +73,9 @@ public: // For the MediaSource interface for use by StageFrightRecorder: virtual status_t start(MetaData *params = NULL); - - virtual status_t stop() { return reset(); } - virtual status_t read( - MediaBuffer **buffer, const ReadOptions *options = NULL); + virtual status_t stop(); + virtual status_t read(MediaBuffer **buffer, + const ReadOptions *options = NULL); virtual sp getFormat(); // Get / Set the frame rate used for encoding. Default fps = 30 @@ -204,8 +203,6 @@ private: // is a frame available for dequeuing Condition mFrameAvailableCondition; - status_t reset(); - // Avoid copying and equating and default constructor DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceMediaSource); }; -- cgit v1.1