diff options
author | James Dong <jdong@google.com> | 2010-07-20 16:55:12 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-20 16:55:12 -0700 |
commit | 932e0a11d74d5e236ccef9ee314442385c3d4e9d (patch) | |
tree | 5e9ed9f7bb7138c3ac78c52bc3c07336e5427412 /include | |
parent | d403f73c6db493a067d529e932d699ce461ae1d8 (diff) | |
parent | 65e334b9448689e12400bae6a739f0513f72d428 (diff) | |
download | frameworks_av-932e0a11d74d5e236ccef9ee314442385c3d4e9d.zip frameworks_av-932e0a11d74d5e236ccef9ee314442385c3d4e9d.tar.gz frameworks_av-932e0a11d74d5e236ccef9ee314442385c3d4e9d.tar.bz2 |
am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbread
Merge commit '9049fe60c20640bd606741c8f45f3f781a1684f5'
* commit '9049fe60c20640bd606741c8f45f3f781a1684f5':
Progress status notification
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 232583a..d0c2dca 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -97,6 +97,7 @@ private: inline size_t write(const void *ptr, size_t size, size_t nmemb, FILE* stream); bool exceedsFileSizeLimit(); bool exceedsFileDurationLimit(); + void trackProgressStatus(const Track* track, int64_t timeUs, status_t err = OK); MPEG4Writer(const MPEG4Writer &); MPEG4Writer &operator=(const MPEG4Writer &); |