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

Commit 70d2ba3c authored by Dongwon Kang's avatar Dongwon Kang
Browse files

Remove libmedia and libstagefright dependency from extractors 

- MediaSource, DataSource and MediaExtractor are moved to
  libmediaextractor so that they can be used by extractor
  implementations without depending on libmedia and libstagefright.
- XXXFactory classes has been added in order not to expose CreateXXX
  methods in libmediaextractor.
- avc_utils is moved to libstagefright_foundation since most of
  extractor implementations are relying on that.

Test: build
Bug: 65851881

Change-Id: Idba410c3dc0abbfb4d73c186d44b5069cdb5780f
parent 1b904bb0

media/java/android/media/MediaMetadataRetriever.java

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ public class MediaMetadataRetriever 
     * @see #getFrameAtTime(long, int)

     */

    /* Do not change these option values without updating their counterparts

     * in include/media/stagefright/MediaSource.h!

     * in include/media/MediaSource.h!

     */

    /**

     * This option is used with {@link #getFrameAtTime(long, int)} to retrieve

media/jni/android_media_MediaExtractor.cpp

+3 −2
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ 
#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/DataSource.h>

#include <media/stagefright/InterfaceUtils.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/NuMediaExtractor.h>
@@ -744,7 +745,7 @@ static void android_media_MediaExtractor_setDataSourceCallback( 
    }



    sp<DataSource> bridge =

        DataSource::CreateFromIDataSource(new JMediaDataSource(env, callbackObj));

        CreateDataSourceFromIDataSource(new JMediaDataSource(env, callbackObj));

    status_t err = extractor->setDataSource(bridge);



    if (err != OK) {

media/jni/android_media_MediaExtractor.h

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
#define _ANDROID_MEDIA_MEDIAEXTRACTOR_H_



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

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/DataSource.h>

#include <media/MediaSource.h>

#include <media/DataSource.h>

#include <utils/Errors.h>

#include <utils/KeyedVector.h>

#include <utils/RefBase.h>

media/jni/soundpool/SoundPool.cpp

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <media/AudioTrack.h>

#include <media/IMediaHTTPService.h>

#include <media/mediaplayer.h>

#include <media/stagefright/MediaExtractor.h>

#include "SoundPool.h"

#include "SoundPoolThread.h"

#include <media/AudioPolicyHelper.h>