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

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

Dump local source, not remote 

dumpsys media.extractor was printing the remote source instead of starting at
the local source.

Bug: 22775369
Change-Id: I5026218515bf7ceb8485005ed7d89638a9c1963b
parent 0277976e

include/media/IMediaExtractor.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define IMEDIA_EXTRACTOR_BASE_H_



#include <media/IMediaSource.h>

#include <media/IDataSource.h>

#include <media/stagefright/DataSource.h>



namespace android {
@@ -72,7 +72,7 @@ public: 


void registerMediaExtractor(

        const sp<IMediaExtractor> &extractor,

        const sp<IDataSource> &source,

        const sp<DataSource> &source,

        const char *mime);



void registerMediaSource(

media/libmedia/IMediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ void registerMediaSource( 


void registerMediaExtractor(

        const sp<IMediaExtractor> &extractor,

        const sp<IDataSource> &source,

        const sp<DataSource> &source,

        const char *mime) {

    ExtractorInstance ex;

    ex.mime = mime == NULL ? "NULL" : mime;

services/mediaextractor/MediaExtractorService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ sp<IMediaExtractor> MediaExtractorService::makeExtractor( 
            ret == NULL ? "" : ret->name());



    if (ret != NULL) {

        registerMediaExtractor(ret, remoteSource, mime);

        registerMediaExtractor(ret, localSource, mime);

    }



    return ret;