diff options
author | Insun Kang <insun@google.com> | 2012-03-13 17:17:41 +0900 |
---|---|---|
committer | Insun Kang <insun@google.com> | 2012-03-13 17:17:41 +0900 |
commit | 083c271152f2d930f259816d52327ed47e022780 (patch) | |
tree | 9dd4469b45e349fac04859ddf3bb7c92249e0210 /media/libstagefright/timedtext | |
parent | aa4397f07c43bd83bc3100b749401dc3d15e7622 (diff) | |
download | frameworks_av-083c271152f2d930f259816d52327ed47e022780.zip frameworks_av-083c271152f2d930f259816d52327ed47e022780.tar.gz frameworks_av-083c271152f2d930f259816d52327ed47e022780.tar.bz2 |
Fixing coding style : Indentation
Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
Diffstat (limited to 'media/libstagefright/timedtext')
-rw-r--r-- | media/libstagefright/timedtext/TimedText3GPPSource.h | 40 | ||||
-rw-r--r-- | media/libstagefright/timedtext/TimedTextSRTSource.h | 62 |
2 files changed, 51 insertions, 51 deletions
diff --git a/media/libstagefright/timedtext/TimedText3GPPSource.h b/media/libstagefright/timedtext/TimedText3GPPSource.h index cb7e47c..dfc6418 100644 --- a/media/libstagefright/timedtext/TimedText3GPPSource.h +++ b/media/libstagefright/timedtext/TimedText3GPPSource.h @@ -28,26 +28,26 @@ class MediaBuffer; class Parcel; class TimedText3GPPSource : public TimedTextSource { - public: - TimedText3GPPSource(const sp<MediaSource>& mediaSource); - virtual status_t start() { return mSource->start(); } - virtual status_t stop() { return mSource->stop(); } - virtual status_t read( - int64_t *timeUs, - Parcel *parcel, - const MediaSource::ReadOptions *options = NULL); - virtual status_t extractGlobalDescriptions(Parcel *parcel); - - protected: - virtual ~TimedText3GPPSource(); - - private: - sp<MediaSource> mSource; - - status_t extractAndAppendLocalDescriptions( - int64_t timeUs, const MediaBuffer *textBuffer, Parcel *parcel); - - DISALLOW_EVIL_CONSTRUCTORS(TimedText3GPPSource); +public: + TimedText3GPPSource(const sp<MediaSource>& mediaSource); + virtual status_t start() { return mSource->start(); } + virtual status_t stop() { return mSource->stop(); } + virtual status_t read( + int64_t *timeUs, + Parcel *parcel, + const MediaSource::ReadOptions *options = NULL); + virtual status_t extractGlobalDescriptions(Parcel *parcel); + +protected: + virtual ~TimedText3GPPSource(); + +private: + sp<MediaSource> mSource; + + status_t extractAndAppendLocalDescriptions( + int64_t timeUs, const MediaBuffer *textBuffer, Parcel *parcel); + + DISALLOW_EVIL_CONSTRUCTORS(TimedText3GPPSource); }; } // namespace android diff --git a/media/libstagefright/timedtext/TimedTextSRTSource.h b/media/libstagefright/timedtext/TimedTextSRTSource.h index a0734d9..acc01f9 100644 --- a/media/libstagefright/timedtext/TimedTextSRTSource.h +++ b/media/libstagefright/timedtext/TimedTextSRTSource.h @@ -31,43 +31,43 @@ class MediaBuffer; class Parcel; class TimedTextSRTSource : public TimedTextSource { - public: - TimedTextSRTSource(const sp<DataSource>& dataSource); - virtual status_t start(); - virtual status_t stop(); - virtual status_t read( - int64_t *timeUs, - Parcel *parcel, - const MediaSource::ReadOptions *options = NULL); +public: + TimedTextSRTSource(const sp<DataSource>& dataSource); + virtual status_t start(); + virtual status_t stop(); + virtual status_t read( + int64_t *timeUs, + Parcel *parcel, + const MediaSource::ReadOptions *options = NULL); - protected: - virtual ~TimedTextSRTSource(); +protected: + virtual ~TimedTextSRTSource(); - private: - sp<DataSource> mSource; +private: + sp<DataSource> mSource; - struct TextInfo { - int64_t endTimeUs; - // The offset of the text in the original file. - off64_t offset; - int textLen; - }; + struct TextInfo { + int64_t endTimeUs; + // The offset of the text in the original file. + off64_t offset; + int textLen; + }; - int mIndex; - KeyedVector<int64_t, TextInfo> mTextVector; + int mIndex; + KeyedVector<int64_t, TextInfo> mTextVector; - void reset(); - status_t scanFile(); - status_t getNextSubtitleInfo( - off64_t *offset, int64_t *startTimeUs, TextInfo *info); - status_t readNextLine(off64_t *offset, AString *data); - status_t getText( - const MediaSource::ReadOptions *options, - AString *text, int64_t *startTimeUs, int64_t *endTimeUs); - status_t extractAndAppendLocalDescriptions( - int64_t timeUs, const AString &text, Parcel *parcel); + void reset(); + status_t scanFile(); + status_t getNextSubtitleInfo( + off64_t *offset, int64_t *startTimeUs, TextInfo *info); + status_t readNextLine(off64_t *offset, AString *data); + status_t getText( + const MediaSource::ReadOptions *options, + AString *text, int64_t *startTimeUs, int64_t *endTimeUs); + status_t extractAndAppendLocalDescriptions( + int64_t timeUs, const AString &text, Parcel *parcel); - DISALLOW_EVIL_CONSTRUCTORS(TimedTextSRTSource); + DISALLOW_EVIL_CONSTRUCTORS(TimedTextSRTSource); }; } // namespace android |