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

Commit 16742e56 authored by Ethan Chen's avatar Ethan Chen
Browse files

Revert "Freeing frame map" 

* This is causing a page fault on some devices.

This reverts commit ebbacb00.

Change-Id: Id3fe36b8d0d025092723287ca4024446e45fc4d4
parent 44b2d624

cmds/bootanimation/BootAnimation.cpp

+5 −9
Original line number Diff line number Diff line
@@ -153,12 +153,12 @@ status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets, 
    return NO_ERROR;

}



status_t BootAnimation::initTexture(const Animation::Frame& frame)

status_t BootAnimation::initTexture(void* buffer, size_t len)

{

    //StopWatch watch("blah");



    SkBitmap bitmap;

    SkMemoryStream  stream(frame.map->getDataPtr(), frame.map->getDataLength());

    SkMemoryStream  stream(buffer, len);

    SkImageDecoder* codec = SkImageDecoder::Factory(&stream);

    if (codec) {

        codec->setDitherImage(false);
@@ -172,11 +172,6 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame) 
        delete codec;

    }



    // FileMap memory is never released until application exit.

    // Release it now as the texture is already loaded and the memory used for

    // the packed resource can be released.

    frame.map->release();



    // ensure we can call getPixels(). No need to call unlock, since the

    // bitmap will go out of scope when we return from this method.

    bitmap.lockPixels();
@@ -451,7 +446,6 @@ bool BootAnimation::movie() 


    String8 desString((char const*)descMap->getDataPtr(),

            descMap->getDataLength());

    descMap->release();

    char const* s = desString.string();



    Animation animation;
@@ -576,7 +570,9 @@ bool BootAnimation::movie() 
                        glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

                        glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);

                    }

                    initTexture(frame);

                    initTexture(

                            frame.map->getDataPtr(),

                            frame.map->getDataLength());

                }



                if (!clearReg.isEmpty()) {

cmds/bootanimation/BootAnimation.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ private: 
    };



    status_t initTexture(Texture* texture, AssetManager& asset, const char* name);

    status_t initTexture(const Animation::Frame& frame);

    status_t initTexture(void* buffer, size_t len);

    bool android();

    bool movie();