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

Commit 4689dad9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove libmedia and libstagefright dependency from extractors"

parents 8a77c222 70d2ba3c

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>