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

Commit 92d57f92 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Move 'sniff' functionality from DataSource to MediaExtractor 

and don't register the sniffers in every process that plays media,
but only in the extractor process.

Bug: 33166870

Change-Id: Id269d1eab8be1549542adad3037729a63b5ebaef
parent bd54eef2

cmds/stagefright/codec.cpp

+0 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <media/stagefright/foundation/ALooper.h>

#include <media/stagefright/foundation/AMessage.h>

#include <media/stagefright/foundation/AString.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaCodec.h>

#include <media/stagefright/MediaCodecList.h>

#include <media/stagefright/MediaDefs.h>
@@ -401,8 +400,6 @@ int main(int argc, char **argv) { 


    ProcessState::self()->startThreadPool();



    DataSource::RegisterDefaultSniffers();



    sp<ALooper> looper = new ALooper;

    looper->start();

cmds/stagefright/mediafilter.cpp

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AMessage.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaCodec.h>

#include <media/stagefright/NuMediaExtractor.h>

#include <media/stagefright/RenderScriptWrapper.h>
@@ -738,8 +737,6 @@ int main(int argc, char **argv) { 


    ProcessState::self()->startThreadPool();



    DataSource::RegisterDefaultSniffers();



    android::sp<ALooper> looper = new ALooper;

    looper->start();

cmds/stagefright/muxer.cpp

+0 −4
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <media/stagefright/foundation/ALooper.h>

#include <media/stagefright/foundation/AMessage.h>

#include <media/stagefright/foundation/AString.h>

#include <media/stagefright/DataSource.h>

#include <media/stagefright/MediaCodec.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaMuxer.h>
@@ -319,9 +318,6 @@ int main(int argc, char **argv) { 
    }

    ProcessState::self()->startThreadPool();



    // Make sure setDataSource() works.

    DataSource::RegisterDefaultSniffers();



    sp<ALooper> looper = new ALooper;

    looper->start();

cmds/stagefright/record.cpp

+0 −2
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ static int translateColorToOmxEnumValue(int color) { 
int main(int argc, char **argv) {

    android::ProcessState::self()->startThreadPool();



    DataSource::RegisterDefaultSniffers();



#if 1

    if (argc != 3) {

        fprintf(stderr, "usage: %s <filename> <input_color_format>\n", argv[0]);

cmds/stagefright/sf2.cpp

+0 −2
Original line number Diff line number Diff line
@@ -620,8 +620,6 @@ int main(int argc, char **argv) { 
        return 1;

    }



    DataSource::RegisterDefaultSniffers();



    sp<ALooper> looper = new ALooper;

    looper->setName("sf2");