Snap for 5582428 from dc0cd3583894926cd91925cad92f0b007fdb624e to qt-release
Change-Id: Ic3dec05ebefe62dcd73fcbd972be6a087a7cc4f4
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 @@
srcs: ["C2SoftVpxDec.cpp"],
- static_libs: ["libvpx"],
+ shared_libs: ["libvpx"],
cflags: [
"-DVP9",
@@ -23,7 +23,7 @@
srcs: ["C2SoftVpxDec.cpp"],
- static_libs: ["libvpx"],
+ shared_libs: ["libvpx"],
}
cc_library_shared {
@@ -38,7 +38,7 @@
"C2SoftVpxEnc.cpp",
],
- static_libs: ["libvpx"],
+ shared_libs: ["libvpx"],
cflags: ["-DVP9"],
}
@@ -55,6 +55,6 @@
"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 @@
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_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";
