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

Commit b6b927fc authored by Rachad's avatar Rachad Committed by Android (Google) Code Review
Browse files

Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match... 

Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match Audio stack api." into lmp-dev
parents 3049c672 97827bd7

include/media/stagefright/ACodec.h

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ private: 
    status_t setComponentRole(bool isEncoder, const char *mime);

    status_t configureCodec(const char *mime, const sp<AMessage> &msg);



    status_t configureTunneledVideoPlayback(int64_t audioHwSync,

    status_t configureTunneledVideoPlayback(int32_t audioHwSync,

            const sp<ANativeWindow> &nativeWindow);



    status_t setVideoPortFormatType(

media/libstagefright/ACodec.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1245,13 +1245,13 @@ status_t ACodec::configureCodec( 
            tunneled != 0) {

            ALOGI("Configuring TUNNELED video playback.");



            int64_t audioHwSync = 0;

            if (!msg->findInt64("audio-hw-sync", &audioHwSync)) {

            int32_t audioHwSync = 0;

            if (!msg->findInt32("audio-hw-sync", &audioHwSync)) {

                ALOGW("No Audio HW Sync provided for video tunnel");

            }

            err = configureTunneledVideoPlayback(audioHwSync, nativeWindow);

            if (err != OK) {

                ALOGE("configureTunneledVideoPlayback(%" PRId64 ",%p) failed!",

                ALOGE("configureTunneledVideoPlayback(%d,%p) failed!",

                        audioHwSync, nativeWindow.get());

                return err;

            }
@@ -1898,7 +1898,7 @@ status_t ACodec::setupRawAudioFormat( 
}



status_t ACodec::configureTunneledVideoPlayback(

        int64_t audioHwSync, const sp<ANativeWindow> &nativeWindow) {

        int32_t audioHwSync, const sp<ANativeWindow> &nativeWindow) {

    native_handle_t* sidebandHandle;



    status_t err = mOMX->configureVideoTunnelMode(