summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-11-19 16:49:10 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-19 16:49:10 -0800
commit04d070f2937ae4dd72d9d87407b9abf7f664660e (patch)
tree2a955761a7f7bfbb2e267dfce2ef48b237c98112 /include
parent8c62c1d6b9738cf55411f155a061814bd886ac76 (diff)
parent2747e0e07ff7ec2ba808298e8d96536d72d211cb (diff)
downloadframeworks_base-04d070f2937ae4dd72d9d87407b9abf7f664660e.zip
frameworks_base-04d070f2937ae4dd72d9d87407b9abf7f664660e.tar.gz
frameworks_base-04d070f2937ae4dd72d9d87407b9abf7f664660e.tar.bz2
Merge "Removed uncessary FILE structure pointer for I/O"
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/AMRWriter.h1
-rw-r--r--include/media/stagefright/FileSource.h1
-rw-r--r--include/media/stagefright/MPEG4Writer.h4
3 files changed, 2 insertions, 4 deletions
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();