diff options
| author | Hangyu Kuang <hkuang@google.com> | 2019-05-16 17:27:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-16 17:27:24 +0000 |
| commit | 387d81335e9e3158aa505a67364b248677730f16 (patch) | |
| tree | a04a26fb23e287bea75f2b0762681165d52b2467 | |
| parent | 5d6f505d6c037b4ead961f061af7c2b8b894b6d8 (diff) | |
| parent | 9277a2eef39e07442ab2d761c2e1dbc9703ea75a (diff) | |
| download | av-387d81335e9e3158aa505a67364b248677730f16.tar.gz | |
Merge "ECOService: Add support for handling actual bitrate stats." into qt-dev
| -rw-r--r-- | media/eco/ECOSession.cpp | 10 | ||||
| -rw-r--r-- | media/eco/include/eco/ECODataKey.h | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/media/eco/ECOSession.cpp b/media/eco/ECOSession.cpp index 752df4e..1bdfa61 100644 --- a/media/eco/ECOSession.cpp +++ b/media/eco/ECOSession.cpp @@ -299,9 +299,13 @@ void ECOSession::processFrameStats(const ECOData& stats) { const ECOData::ECODataValueType value = entry.second; ECOLOGD("Processing %s key", key.c_str()); - // Only process the keys that are supported by ECOService 1.0. - if (!key.compare(FRAME_NUM) || !key.compare(FRAME_PTS_US) || !key.compare(FRAME_TYPE) || - !key.compare(FRAME_SIZE_BYTES)) { + if (!key.compare(KEY_STATS_TYPE)) { + // Skip the key KEY_STATS_TYPE as that has been parsed already. + continue; + } else if (!key.compare(FRAME_NUM) || !key.compare(FRAME_PTS_US) || + !key.compare(FRAME_TYPE) || !key.compare(FRAME_SIZE_BYTES) || + !key.compare(ENCODER_ACTUAL_BITRATE_BPS)) { + // Only process the keys that are supported by ECOService 1.0. info.set(key, value); } else if (!key.compare(FRAME_AVG_QP)) { // Check the qp to see if need to notify the listener. diff --git a/media/eco/include/eco/ECODataKey.h b/media/eco/include/eco/ECODataKey.h index 7c59ae0..c70c328 100644 --- a/media/eco/include/eco/ECODataKey.h +++ b/media/eco/include/eco/ECODataKey.h @@ -81,8 +81,8 @@ constexpr char ENCODER_INPUT_WIDTH[] = "encoder-input-width"; constexpr char ENCODER_INPUT_HEIGHT[] = "encoder-input-height"; constexpr char ENCODER_OUTPUT_WIDTH[] = "encoder-output-width"; constexpr char ENCODER_OUTPUT_HEIGHT[] = "encoder-output-height"; -constexpr char ENCODER_TARGET_BITRATE_BPS[] = "encoder-target-bitrate-bps"; -constexpr char ENCODER_ACTUAL_BITRATE_BPS[] = "encoder-actual-bitrate-bps"; +constexpr char ENCODER_TARGET_BITRATE_BPS[] = "encoder-target-bitrate-bps"; // Session info +constexpr char ENCODER_ACTUAL_BITRATE_BPS[] = "encoder-actual-bitrate-bps"; // Frame info constexpr char ENCODER_KFI_FRAMES[] = "encoder-kfi-frames"; constexpr char ENCODER_FRAMERATE_FPS[] = "encoder-framerate-fps"; |