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

Commit 87256a28 authored by Dave Sparks's avatar Dave Sparks Committed by Android Git Automerger
Browse files

am b06ecc40: am 7c09a0ff: Merge change Ib904c2a4 into eclair-mr2 

Merge commit 'b06ecc40'

* commit 'b06ecc40':
  Remove old hack A/V sync hack that is no longer needed.
parents 626c77e0 b06ecc40

media/libmediaplayerservice/MediaPlayerService.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -202,7 +202,6 @@ extmap FILE_EXTS [] = { 
};

};





// TODO: Find real cause of Audio/Video delay in PV framework and remove this workaround

// TODO: Find real cause of Audio/Video delay in PV framework and remove this workaround

/* static */ const uint32_t MediaPlayerService::AudioOutput::kAudioVideoDelayMs = 0;

/* static */ int MediaPlayerService::AudioOutput::mMinBufferCount = 4;

/* static */ int MediaPlayerService::AudioOutput::mMinBufferCount = 4;

/* static */ bool MediaPlayerService::AudioOutput::mIsOnEmulator = false;

/* static */ bool MediaPlayerService::AudioOutput::mIsOnEmulator = false;
@@ -1485,7 +1484,7 @@ status_t MediaPlayerService::AudioOutput::open( 
    LOGV("setVolume");

    LOGV("setVolume");

    t->setVolume(mLeftVolume, mRightVolume);

    t->setVolume(mLeftVolume, mRightVolume);

    mMsecsPerFrame = 1.e3 / (float) sampleRate;

    mMsecsPerFrame = 1.e3 / (float) sampleRate;

    mLatency = t->latency() + kAudioVideoDelayMs;

    mLatency = t->latency();

    mTrack = t;

    mTrack = t;

    return NO_ERROR;

    return NO_ERROR;

}

}

media/libmediaplayerservice/MediaPlayerService.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -108,8 +108,6 @@ class MediaPlayerService : public BnMediaPlayerService 
        float                   mMsecsPerFrame;

        float                   mMsecsPerFrame;

        uint32_t                mLatency;

        uint32_t                mLatency;





        // TODO: Find real cause of Audio/Video delay in PV framework and remove this workaround

        static const uint32_t   kAudioVideoDelayMs;

        static bool             mIsOnEmulator;

        static bool             mIsOnEmulator;

        static int              mMinBufferCount;  // 12 for emulator; otherwise 4

        static int              mMinBufferCount;  // 12 for emulator; otherwise 4