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

Commit 081559cc authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 514ac2ba: am e311b15c: Merge "Fix c++11 narrowing" 

* commit '514ac2ba':
  Fix c++11 narrowing
parents 0ba9f9b0 514ac2ba

libvideoeditor/lvpp/VideoEditorPreviewController.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ void VideoEditorPreviewController::notify( 
        case MEDIA_SET_VIDEO_SIZE:

            ALOGV("MEDIA_SET_VIDEO_SIZE; New video size %d x %d", ext1, ext2);

            break;

        case 0xAAAAAAAA:

        case static_cast<int>(0xAAAAAAAA):

            ALOGV("VIDEO PLAYBACK ALMOST over, prepare next player");

            // Select next player and prepare it

            // If there is a clip after this one
@@ -1268,7 +1268,7 @@ void VideoEditorPreviewController::notify( 
                }

            }

            break;

        case 0xBBBBBBBB:

        case static_cast<int>(0xBBBBBBBB):

        {

            ALOGV("VIDEO PLAYBACK, Update Overlay");

            int overlayIndex = ext2;

libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp

+4 −4
Original line number Diff line number Diff line
@@ -776,16 +776,16 @@ M4OSA_ERR VideoEditor3gpReader_setOption(M4OSA_Context context, 
        case M4READER_kOptionID_SetOsaFileReaderFctsPtr:

        break;



        case M4READER_3GP_kOptionID_AudioOnly:

        case static_cast<M4OSA_OptionID>(M4READER_3GP_kOptionID_AudioOnly):

        break;



        case M4READER_3GP_kOptionID_VideoOnly:

        case static_cast<M4OSA_OptionID>(M4READER_3GP_kOptionID_VideoOnly):

        break;



        case M4READER_3GP_kOptionID_FastOpenMode:

        case static_cast<M4OSA_OptionID>(M4READER_3GP_kOptionID_FastOpenMode):

        break;



        case M4READER_kOptionID_MaxMetadataSize:

        case static_cast<M4OSA_OptionID>(M4READER_kOptionID_MaxMetadataSize):

        break;



        default:

libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ M4OSA_ERR VideoEditorAudioDecoder_setOption(M4AD_Context pContext, 
    pDecoderContext = (VideoEditorAudioDecoder_Context*)pContext;



    switch( optionID ) {

        case M4AD_kOptionID_UserParam:

        case static_cast<M4OSA_UInt32>(M4AD_kOptionID_UserParam):

            ALOGV("VideoEditorAudioDecodersetOption UserParam is not supported");

            err = M4ERR_NOT_IMPLEMENTED;

            break;

media/libnbaio/MonoPipe.cpp

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ ssize_t MonoPipe::write(const void *buffer, size_t count) 
            }

        }

        if (ns > 0) {

            const struct timespec req = {0, ns};

            const struct timespec req = {0, static_cast<long>(ns)};

            nanosleep(&req, NULL);

        }

        // record the time that this write() completed