From 674ebd0b4e1143e38392a4e3bb38b4679a4577bc Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Thu, 18 Nov 2010 20:59:13 -0800
Subject: Removed uncessary FILE structure pointer for I/O

o also move the fd owner from caller to callee in the Writers

Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
---
 include/media/stagefright/AMRWriter.h   | 1 -
 include/media/stagefright/FileSource.h  | 1 -
 include/media/stagefright/MPEG4Writer.h | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'include/media/stagefright')

diff --git a/include/media/stagefright/AMRWriter.h b/include/media/stagefright/AMRWriter.h
index d8410a9..62d57b4 100644
--- a/include/media/stagefright/AMRWriter.h
+++ b/include/media/stagefright/AMRWriter.h
@@ -44,7 +44,6 @@ protected:
     virtual ~AMRWriter();
 
 private:
-    FILE *mFile;
     int   mFd;
     status_t mInitCheck;
     sp<MediaSource> mSource;
diff --git a/include/media/stagefright/FileSource.h b/include/media/stagefright/FileSource.h
index a7f7181..72a0403 100644
--- a/include/media/stagefright/FileSource.h
+++ b/include/media/stagefright/FileSource.h
@@ -46,7 +46,6 @@ protected:
     virtual ~FileSource();
 
 private:
-    FILE *mFile;
     int mFd;
     int64_t mOffset;
     int64_t mLength;
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h
index e6d8a26..f7618e9 100644
--- a/include/media/stagefright/MPEG4Writer.h
+++ b/include/media/stagefright/MPEG4Writer.h
@@ -61,8 +61,8 @@ protected:
 private:
     class Track;
 
-    FILE *mFile;
     int  mFd;
+    status_t mInitCheck;
     bool mUse4ByteNalLength;
     bool mUse32BitOffset;
     bool mIsFileSizeLimitExplicitlyRequested;
@@ -149,7 +149,7 @@ private:
     off64_t addSample_l(MediaBuffer *buffer);
     off64_t addLengthPrefixedSample_l(MediaBuffer *buffer);
 
-    inline size_t write(const void *ptr, size_t size, size_t nmemb, FILE* stream);
+    inline size_t write(const void *ptr, size_t size, size_t nmemb);
     bool exceedsFileSizeLimit();
     bool use32BitFileOffset() const;
     bool exceedsFileDurationLimit();
-- 
cgit v1.1