diff options
| author | James Dong <jdong@google.com> | 2010-11-19 16:49:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-19 16:49:10 -0800 |
| commit | 5b12af0ea4b98ad60bc066bceb8504d16fcca41d (patch) | |
| tree | f13b10098a977dff3d1282cdbf2ac1bc750d511e /include | |
| parent | 0e89c2282c31173ad03b7593c9587bab5799d89e (diff) | |
| parent | 674ebd0b4e1143e38392a4e3bb38b4679a4577bc (diff) | |
| download | frameworks_av-5b12af0ea4b98ad60bc066bceb8504d16fcca41d.zip frameworks_av-5b12af0ea4b98ad60bc066bceb8504d16fcca41d.tar.gz frameworks_av-5b12af0ea4b98ad60bc066bceb8504d16fcca41d.tar.bz2 | |
Merge "Removed uncessary FILE structure pointer for I/O"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AMRWriter.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/FileSource.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 4 |
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(); |