Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70f03120 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Suppress implicit-fallthrough warnings in stagefright."

parents 3d514b76 7994454b

cmds/stagefright/codec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -366,13 +366,13 @@ int main(int argc, char **argv) { 
            case 'T':

            {

                useTimestamp = true;

                FALLTHROUGH_INTENDED;

            }

            // fall through

            case 'R':

            {

                renderSurface = true;

                FALLTHROUGH_INTENDED;

            }

            // fall through

            case 'S':

            {

                useSurface = true;

cmds/stagefright/mediafilter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -706,13 +706,13 @@ int main(int argc, char **argv) { 
            case 'T':

            {

                useTimestamp = true;

                FALLTHROUGH_INTENDED;

            }

            // fall through

            case 'R':

            {

                renderSurface = true;

                FALLTHROUGH_INTENDED;

            }

            // fall through

            case 'S':

            {

                useSurface = true;

media/libstagefright/ACodec.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1619,7 +1619,7 @@ status_t ACodec::freeBuffer(OMX_U32 portIndex, size_t i) { 
            if (portIndex == kPortIndexOutput && mNativeWindow != NULL) {

                (void)cancelBufferToNativeWindow(info);

            }

            // fall through

            FALLTHROUGH_INTENDED;



        case BufferInfo::OWNED_BY_NATIVE_WINDOW:

            err = mOMXNode->freeBuffer(portIndex, info->mBufferID);
@@ -5019,6 +5019,7 @@ status_t ACodec::getPortFormat(OMX_U32 portIndex, sp<AMessage> &notify) { 
                        }

                    }

                    // Fall through to set up mime.

                    FALLTHROUGH_INTENDED;

                }



                default:
@@ -7849,7 +7850,7 @@ bool ACodec::OutputPortSettingsChangedState::onMessageReceived( 
                msg->setInt32("generation", mCodec->mStateGeneration);

                msg->post(3000000);

            }

            // fall-through

            FALLTHROUGH_INTENDED;

        }

        case kWhatResume:

        case kWhatSetParameters:

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1821,8 +1821,8 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { 
                            // the shutdown complete notification. If we

                            // don't, we'll timeout and force release.

                            sendErrorResponse = false;

                            FALLTHROUGH_INTENDED;

                        }

                        // fall-thru

                        case STOPPING:

                        {

                            if (mFlags & kFlagSawMediaServerDie) {

media/libstagefright/codecs/flac/enc/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ cc_library_shared { 
        "liblog",

    ],



    header_libs: ["libbase_headers"],

    static_libs: ["libFLAC"],



    name: "libstagefright_soft_flacenc",