diff options
| author | James Dong <jdong@google.com> | 2010-07-15 11:54:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:54:10 -0700 |
| commit | cbcc684555a8774b21ba04c09b2f5cee8c88453a (patch) | |
| tree | e6ba409fcc9e9076650877112ae2806470267823 /media/libmediaplayerservice/StagefrightRecorder.h | |
| parent | 8065e2056073808716db32136d7acfd50eeab924 (diff) | |
| parent | b2975065465192dd46bc3eadabc00b9d855eb4e6 (diff) | |
| download | frameworks_av-cbcc684555a8774b21ba04c09b2f5cee8c88453a.zip frameworks_av-cbcc684555a8774b21ba04c09b2f5cee8c88453a.tar.gz frameworks_av-cbcc684555a8774b21ba04c09b2f5cee8c88453a.tar.bz2 | |
am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c'
* commit 'b068b47c6d0214256116a0c661740bddf7acc18c':
Support user-supplied timescales for authoring
Diffstat (limited to 'media/libmediaplayerservice/StagefrightRecorder.h')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h index 58f0031..f51d7f8 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -81,10 +81,13 @@ private: int32_t mAudioChannels; int32_t mSampleRate; int32_t mInterleaveDurationUs; - int32_t mIFramesInterval; + int32_t mIFramesIntervalSec; int32_t mCameraId; int32_t mVideoEncoderProfile; int32_t mVideoEncoderLevel; + int32_t mMovieTimeScale; + int32_t mVideoTimeScale; + int32_t mAudioTimeScale; int64_t mMaxFileSizeBytes; int64_t mMaxFileDurationUs; int32_t mTrackEveryNumberOfFrames; @@ -111,17 +114,20 @@ private: status_t setParamAudioEncodingBitRate(int32_t bitRate); status_t setParamAudioNumberOfChannels(int32_t channles); status_t setParamAudioSamplingRate(int32_t sampleRate); + status_t setParamAudioTimeScale(int32_t timeScale); status_t setParamVideoEncodingBitRate(int32_t bitRate); - status_t setParamVideoIFramesInterval(int32_t interval); + status_t setParamVideoIFramesInterval(int32_t seconds); status_t setParamVideoEncoderProfile(int32_t profile); status_t setParamVideoEncoderLevel(int32_t level); status_t setParamVideoCameraId(int32_t cameraId); + status_t setParamVideoTimeScale(int32_t timeScale); status_t setParamTrackTimeStatus(int64_t timeDurationUs); status_t setParamTrackFrameStatus(int32_t nFrames); status_t setParamInterleaveDuration(int32_t durationUs); status_t setParam64BitFileOffset(bool use64BitFileOffset); status_t setParamMaxFileDurationUs(int64_t timeUs); status_t setParamMaxFileSizeBytes(int64_t bytes); + status_t setParamMovieTimeScale(int32_t timeScale); void clipVideoBitRate(); void clipVideoFrameRate(); void clipVideoFrameWidth(); |