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

Commit a28976b0 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Make mediascanner use filedescriptors instead of paths 

Media scanner needs to open the files now, because media server doesn't
have the required permission.

b/6330061

Change-Id: I2364d93dcc0530c15676664fc4a8c306351dde08
parent 1803c3ae

media/libstagefright/StagefrightMediaScanner.cpp

+14 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,10 @@ 
#define LOG_TAG "StagefrightMediaScanner"

#define LOG_TAG "StagefrightMediaScanner"

#include <utils/Log.h>

#include <utils/Log.h>





#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>



#include <media/stagefright/StagefrightMediaScanner.h>

#include <media/stagefright/StagefrightMediaScanner.h>





#include <media/mediametadataretriever.h>

#include <media/mediametadataretriever.h>
@@ -139,7 +143,16 @@ MediaScanResult StagefrightMediaScanner::processFileInternal( 




    sp<MediaMetadataRetriever> mRetriever(new MediaMetadataRetriever);

    sp<MediaMetadataRetriever> mRetriever(new MediaMetadataRetriever);





    status_t status = mRetriever->setDataSource(path);

    int fd = open(path, O_RDONLY | O_LARGEFILE);

    status_t status;

    if (fd < 0) {

        // couldn't open it locally, maybe the media server can?

        status = mRetriever->setDataSource(path);

    } else {

        status = mRetriever->setDataSource(fd, 0, 0x7ffffffffffffffL);

        close(fd);

    }



    if (status) {

    if (status) {

        return MEDIA_SCAN_RESULT_ERROR;

        return MEDIA_SCAN_RESULT_ERROR;

    }

    }