summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-08-23 20:24:09 -0700
committerJamie Gennis <jgennis@google.com>2012-08-26 16:25:12 -0700
commita0ead0a2d2ce1d114ad3a17d755dddce831abb40 (patch)
tree0908865a805a13176c98f2a9a5ffb2c28380d75d /include
parentff3f75c3e827c1c1f3e3a11b1de46b19444af197 (diff)
downloadframeworks_av-a0ead0a2d2ce1d114ad3a17d755dddce831abb40.zip
frameworks_av-a0ead0a2d2ce1d114ad3a17d755dddce831abb40.tar.gz
frameworks_av-a0ead0a2d2ce1d114ad3a17d755dddce831abb40.tar.bz2
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
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/SurfaceMediaSource.h9
1 files changed, 3 insertions, 6 deletions
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<MetaData> 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);
};