| 1 | diff -r ./VTM-3.0-origin/VVCSoftware_VTM-VTM-3.0/source/Lib/CommonLib/TypeDef.h ./VVCSoftware_VTM-VTM-3.0/source/Lib/CommonLib/TypeDef.h |
|---|
| 2 | 52a53,55 |
|---|
| 3 | > //=======set frame rate in double format=======// |
|---|
| 4 | > #define SET_FRAME_RATE_IN_DOUBLE_FORMAT 1 |
|---|
| 5 | > |
|---|
| 6 | diff -r ./VTM-3.0-origin/VVCSoftware_VTM-VTM-3.0/source/Lib/EncoderLib/EncLib.cpp ./VVCSoftware_VTM-VTM-3.0/source/Lib/EncoderLib/EncLib.cpp |
|---|
| 7 | 140a141,143 |
|---|
| 8 | > #if SET_FRAME_RATE_IN_DOUBLE_FORMAT |
|---|
| 9 | > m_cRateCtrl.init(m_framesToBeEncoded, m_RCTargetBitrate, (double)m_iFrameRate / m_temporalSubsampleRatio, m_iGOPSize, m_iSourceWidth, m_iSourceHeight, |
|---|
| 10 | > #else |
|---|
| 11 | 142c145,146 |
|---|
| 12 | < m_maxCUWidth, m_maxCUHeight, getBitDepth(CHANNEL_TYPE_LUMA), m_RCKeepHierarchicalBit, m_RCUseLCUSeparateModel, m_GOPList); |
|---|
| 13 | --- |
|---|
| 14 | > #endif |
|---|
| 15 | > m_maxCUWidth, m_maxCUHeight, getBitDepth(CHANNEL_TYPE_LUMA), m_RCKeepHierarchicalBit, m_RCUseLCUSeparateModel, m_GOPList); |
|---|
| 16 | diff -r ./VTM-3.0-origin/VVCSoftware_VTM-VTM-3.0/source/Lib/EncoderLib/RateCtrl.cpp ./VVCSoftware_VTM-VTM-3.0/source/Lib/EncoderLib/RateCtrl.cpp |
|---|
| 17 | 78a79,81 |
|---|
| 18 | > #if SET_FRAME_RATE_IN_DOUBLE_FORMAT |
|---|
| 19 | > void EncRCSeq::create(int totalFrames, int targetBitrate, double frameRate, int GOPSize, int picWidth, int picHeight, int LCUWidth, int LCUHeight, int numberOfLevel, bool useLCUSeparateModel, int adaptiveBit) |
|---|
| 20 | > #else |
|---|
| 21 | 79a83 |
|---|
| 22 | > #endif |
|---|
| 23 | 1415a1420,1422 |
|---|
| 24 | > #if SET_FRAME_RATE_IN_DOUBLE_FORMAT |
|---|
| 25 | > void RateCtrl::init(int totalFrames, int targetBitrate, double frameRate, int GOPSize, int picWidth, int picHeight, int LCUWidth, int LCUHeight, int bitDepth, int keepHierBits, bool useLCUSeparateModel, GOPEntry GOPList[MAX_GOP]) |
|---|
| 26 | > #else |
|---|
| 27 | 1416a1424 |
|---|
| 28 | > #endif |
|---|
| 29 | diff -r ./VTM-3.0-origin/VVCSoftware_VTM-VTM-3.0/source/Lib/EncoderLib/RateCtrl.h ./VVCSoftware_VTM-VTM-3.0/source/Lib/EncoderLib/RateCtrl.h |
|---|
| 30 | 104a105,107 |
|---|
| 31 | > #if SET_FRAME_RATE_IN_DOUBLE_FORMAT |
|---|
| 32 | > void create(int totalFrames, int targetBitrate, double frameRate, int GOPSize, int picWidth, int picHeight, int LCUWidth, int LCUHeight, int numberOfLevel, bool useLCUSeparateModel, int adaptiveBit); |
|---|
| 33 | > #else |
|---|
| 34 | 105a109 |
|---|
| 35 | > #endif |
|---|
| 36 | 116a121,123 |
|---|
| 37 | > #if SET_FRAME_RATE_IN_DOUBLE_FORMAT |
|---|
| 38 | > double getFrameRate() { return m_frameRate; } |
|---|
| 39 | > #else |
|---|
| 40 | 117a125 |
|---|
| 41 | > #endif |
|---|
| 42 | 158a167,169 |
|---|
| 43 | > #if SET_FRAME_RATE_IN_DOUBLE_FORMAT |
|---|
| 44 | > double m_frameRate; |
|---|
| 45 | > #else |
|---|
| 46 | 159a171 |
|---|
| 47 | > #endif |
|---|
| 48 | 330a343,345 |
|---|
| 49 | > #if SET_FRAME_RATE_IN_DOUBLE_FORMAT |
|---|
| 50 | > void init(int totalFrames, int targetBitrate, double frameRate, int GOPSize, int picWidth, int picHeight, int LCUWidth, int LCUHeight, int bitDepth, int keepHierBits, bool useLCUSeparateModel, GOPEntry GOPList[MAX_GOP]); |
|---|
| 51 | > #else |
|---|
| 52 | 331a347 |
|---|
| 53 | > #endif |
|---|
