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

Commit d97d8011 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am b78599b7: Merge change Ia67d5388 into eclair-mr2 

Merge commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740' into eclair-mr2-plus-aosp

* commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740':
  remote destructors are not synchronously executed by the binder...
parents 1fa72e74 e8647636

media/libstagefright/AwesomePlayer.cpp

+13 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 




#include "include/AwesomePlayer.h"

#include "include/AwesomePlayer.h"





#include <binder/IPCThreadState.h>

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/FileSource.h>

#include <media/stagefright/FileSource.h>
@@ -313,6 +314,12 @@ void AwesomePlayer::initRenderer_l() { 
        CHECK(meta->findInt32(kKeyWidth, &decodedWidth));

        CHECK(meta->findInt32(kKeyWidth, &decodedWidth));

        CHECK(meta->findInt32(kKeyHeight, &decodedHeight));

        CHECK(meta->findInt32(kKeyHeight, &decodedHeight));





        mVideoRenderer.clear();



        // Must ensure that mVideoRenderer's destructor is actually executed

        // before creating a new one.

        IPCThreadState::self()->flushCommands();



        mVideoRenderer =

        mVideoRenderer =

            mClient.interface()->createRenderer(

            mClient.interface()->createRenderer(

                    mISurface, component,

                    mISurface, component,
@@ -530,6 +537,12 @@ void AwesomePlayer::onEvent(int32_t code) { 
                return;

                return;

            }

            }





            if (mVideoBuffer->range_length() == 0) {

                mVideoBuffer->release();

                mVideoBuffer = NULL;

                continue;

            }



            break;

            break;

        }

        }

    }

    }