Fix implicit-fallthrough warnings locally.
It will be a global error by default.
Test: make checkbuild
Bug: 112564944
Change-Id: I5a44b109bb0a91031047f4c5415c6b8b99a01134
diff --git a/media/codecs/aac/C2SoftAacEnc.cpp b/media/codecs/aac/C2SoftAacEnc.cpp
index 054a08d..b41499f 100644
--- a/media/codecs/aac/C2SoftAacEnc.cpp
+++ b/media/codecs/aac/C2SoftAacEnc.cpp
@@ -478,7 +478,8 @@
uint32_t drainMode,
const std::shared_ptr<C2BlockPool> &pool) {
switch (drainMode) {
- case DRAIN_COMPONENT_NO_EOS: // fall-through
+ case DRAIN_COMPONENT_NO_EOS:
+ [[fallthrough]];
case NO_DRAIN:
// no-op
return C2_OK;
diff --git a/media/codecs/avc/C2SoftAvcEnc.cpp b/media/codecs/avc/C2SoftAvcEnc.cpp
index 1674d47..7717fc8 100644
--- a/media/codecs/avc/C2SoftAvcEnc.cpp
+++ b/media/codecs/avc/C2SoftAvcEnc.cpp
@@ -270,7 +270,7 @@
IV_PROFILE_T getProfile_l() const {
switch (mProfileLevel->profile) {
- case PROFILE_AVC_CONSTRAINED_BASELINE: // fall-through
+ case PROFILE_AVC_CONSTRAINED_BASELINE: [[fallthrough]];
case PROFILE_AVC_BASELINE: return IV_PROFILE_BASE;
case PROFILE_AVC_MAIN: return IV_PROFILE_MAIN;
default:
@@ -1155,7 +1155,7 @@
switch (layout.type) {
case C2PlanarLayout::TYPE_RGB:
- // fall-through
+ [[fallthrough]];
case C2PlanarLayout::TYPE_RGBA: {
ALOGV("yPlaneSize = %zu", yPlaneSize);
MemoryBlock conversionBuffer = mConversionBuffers.fetch(yPlaneSize * 3 / 2);
diff --git a/media/codecs/mpeg4_h263/C2SoftMpeg4Enc.cpp b/media/codecs/mpeg4_h263/C2SoftMpeg4Enc.cpp
index e4e8a31..b781389 100644
--- a/media/codecs/mpeg4_h263/C2SoftMpeg4Enc.cpp
+++ b/media/codecs/mpeg4_h263/C2SoftMpeg4Enc.cpp
@@ -493,7 +493,7 @@
size_t yPlaneSize = width * height;
switch (layout.type) {
case C2PlanarLayout::TYPE_RGB:
- // fall-through
+ [[fallthrough]];
case C2PlanarLayout::TYPE_RGBA: {
MemoryBlock conversionBuffer = mConversionBuffers.fetch(yPlaneSize * 3 / 2);
mConversionBuffersInUse.emplace(conversionBuffer.data(), conversionBuffer);
diff --git a/media/codecs/vpx/C2SoftVpxEnc.cpp b/media/codecs/vpx/C2SoftVpxEnc.cpp
index 15fc66e..9b8f143 100644
--- a/media/codecs/vpx/C2SoftVpxEnc.cpp
+++ b/media/codecs/vpx/C2SoftVpxEnc.cpp
@@ -345,7 +345,7 @@
break;
case kTemporalUpdateGoldenWithoutDependency:
flags |= VP8_EFLAG_NO_REF_GF;
- // Deliberately no break here.
+ [[fallthrough]];
case kTemporalUpdateGolden:
flags |= VP8_EFLAG_NO_REF_ARF;
flags |= VP8_EFLAG_NO_UPD_ARF;
@@ -354,14 +354,14 @@
case kTemporalUpdateAltrefWithoutDependency:
flags |= VP8_EFLAG_NO_REF_ARF;
flags |= VP8_EFLAG_NO_REF_GF;
- // Deliberately no break here.
+ [[fallthrough]];
case kTemporalUpdateAltref:
flags |= VP8_EFLAG_NO_UPD_GF;
flags |= VP8_EFLAG_NO_UPD_LAST;
break;
case kTemporalUpdateNoneNoRefAltref:
flags |= VP8_EFLAG_NO_REF_ARF;
- // Deliberately no break here.
+ [[fallthrough]];
case kTemporalUpdateNone:
flags |= VP8_EFLAG_NO_UPD_GF;
flags |= VP8_EFLAG_NO_UPD_ARF;
diff --git a/media/sfplugin/Codec2Buffer.cpp b/media/sfplugin/Codec2Buffer.cpp
index 64a48f5..5cb719e 100644
--- a/media/sfplugin/Codec2Buffer.cpp
+++ b/media/sfplugin/Codec2Buffer.cpp
@@ -296,7 +296,7 @@
break;
}
}
- // fall through if we could not wrap
+ [[fallthrough]];
case COLOR_FormatYUV420Planar:
case COLOR_FormatYUV420PackedPlanar:
