diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-30 05:23:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-30 05:23:04 +0000 |
| commit | 8d0f95fb94175449fba42addbb54c43e513c0fbe (patch) | |
| tree | 7b4a60d8dc29a66a58bbab127c8fa108a3e45d38 /media/eco/include | |
| parent | a67de76fc920aed26b2351ff4030bd0c6f110514 (diff) | |
| parent | d9116453211b4e1fd2be71f90e1147b7eaebebcb (diff) | |
| download | av-8d0f95fb94175449fba42addbb54c43e513c0fbe.tar.gz | |
Merge "[ECO] Fixes in ECOUtils and ECOSession." into qt-dev
Diffstat (limited to 'media/eco/include')
| -rw-r--r-- | media/eco/include/eco/ECOUtils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/eco/include/eco/ECOUtils.h b/media/eco/include/eco/ECOUtils.h index f9fa129..e5bbfcc 100644 --- a/media/eco/include/eco/ECOUtils.h +++ b/media/eco/include/eco/ECOUtils.h @@ -60,7 +60,7 @@ struct SimpleEncoderConfig { int32_t mKeyFrameIntervalFrames; // Frame rate in frames per second. -1 means unavailable. - int32_t mFramerateFps; + float mFrameRateFps; SimpleEncoderConfig() : mEncoderName(""), @@ -69,7 +69,7 @@ struct SimpleEncoderConfig { mLevel(-1), mTargetBitrate(-1), mKeyFrameIntervalFrames(-1), - mFramerateFps(-1) {} + mFrameRateFps(-1) {} SimpleEncoderConfig(const std::string& name, int32_t codecType, int32_t profile, int32_t level, int32_t bitrate, int32_t kfi, float framerateFps) @@ -79,7 +79,7 @@ struct SimpleEncoderConfig { mLevel(level), mTargetBitrate(bitrate), mKeyFrameIntervalFrames(kfi), - mFramerateFps(framerateFps) {} + mFrameRateFps(framerateFps) {} // Convert this SimpleEncoderConfig to ECOData with dataType. ECOData toEcoData(ECOData::ECODatatype dataType); |