commit 5855ee55158a87b133cb67c086f0530875baa2e8
author Chong Zhang <chz@google.com> Mon Jun 22 11:41:25 2020 -0700
committer Chong Zhang <chz@google.com> Mon Jun 22 14:13:34 2020 -0700
tree 65d9d489cae63ee9fe8744788937bd97ea8b7fbe
parent f6388bd50e743eeeb56bd3f45a9e69bd14b62c1f

transcoder: add hevc->avc unit test and verify formats.

bug: 154734285
bug: 152091443
tests: unit testing.
Change-Id: If755df8e05e5e211b69869c7e0d8299138ff230c

media/libmediatranscoding/TranscoderWrapper.cpp

diff --git a/media/libmediatranscoding/TranscoderWrapper.cpp b/media/libmediatranscoding/TranscoderWrapper.cpp
index 86cb86a..428d86e 100644
--- a/media/libmediatranscoding/TranscoderWrapper.cpp
+++ b/media/libmediatranscoding/TranscoderWrapper.cpp
@@ -200,12 +200,12 @@
 
     AMediaFormat* format = AMediaFormat_new();
     bool changed = false;
-    if (requestedFormat->codecType == TranscodingVideoCodecType::kHevc
-            && strcmp(originalMime, AMEDIA_MIMETYPE_VIDEO_HEVC)) {
+    if (requestedFormat->codecType == TranscodingVideoCodecType::kHevc &&
+        strcmp(originalMime, AMEDIA_MIMETYPE_VIDEO_HEVC)) {
         AMediaFormat_setString(format, AMEDIAFORMAT_KEY_MIME, AMEDIA_MIMETYPE_VIDEO_HEVC);
         changed = true;
-    } else if (requestedFormat->codecType == TranscodingVideoCodecType::kAvc
-        && strcmp(originalMime, AMEDIA_MIMETYPE_VIDEO_AVC)) {
+    } else if (requestedFormat->codecType == TranscodingVideoCodecType::kAvc &&
+               strcmp(originalMime, AMEDIA_MIMETYPE_VIDEO_AVC)) {
         AMediaFormat_setString(format, AMEDIAFORMAT_KEY_MIME, AMEDIA_MIMETYPE_VIDEO_AVC);
         changed = true;
     }