diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-18 23:02:31 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-18 23:02:31 +0000 |
commit | 83a1e49e670cc98afd6a7270b0184aa728566c8b (patch) | |
tree | a838acfa5361781ab9017a4e9cca316384eb878e | |
parent | fb50678903c31f9723e87c4f0f36c3752b546949 (diff) | |
parent | dc0cd3583894926cd91925cad92f0b007fdb624e (diff) | |
download | av-android-security-10.0.0_r71.tar.gz |
Snap for 5582428 from dc0cd3583894926cd91925cad92f0b007fdb624e to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release
Change-Id: Ic3dec05ebefe62dcd73fcbd972be6a087a7cc4f4
-rw-r--r-- | media/codecs/vpx/Android.bp | 8 | ||||
-rw-r--r-- | media/eco/ECOSession.cpp | 10 | ||||
-rw-r--r-- | media/eco/include/eco/ECODataKey.h | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/media/codecs/vpx/Android.bp b/media/codecs/vpx/Android.bp index c09f365..cc83371 100644 --- a/media/codecs/vpx/Android.bp +++ b/media/codecs/vpx/Android.bp @@ -7,7 +7,7 @@ cc_library_shared { srcs: ["C2SoftVpxDec.cpp"], - static_libs: ["libvpx"], + shared_libs: ["libvpx"], cflags: [ "-DVP9", @@ -23,7 +23,7 @@ cc_library_shared { srcs: ["C2SoftVpxDec.cpp"], - static_libs: ["libvpx"], + shared_libs: ["libvpx"], } cc_library_shared { @@ -38,7 +38,7 @@ cc_library_shared { "C2SoftVpxEnc.cpp", ], - static_libs: ["libvpx"], + shared_libs: ["libvpx"], cflags: ["-DVP9"], } @@ -55,6 +55,6 @@ cc_library_shared { "C2SoftVpxEnc.cpp", ], - static_libs: ["libvpx"], + shared_libs: ["libvpx"], } 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"; |