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

Commit 2b507240 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Bug 1804058 FLAC extractor"

parents f8d40f0d f9f223ed

include/media/stagefright/MediaDefs.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS; 
extern const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW;

extern const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW;

extern const char *MEDIA_MIMETYPE_AUDIO_RAW;

extern const char *MEDIA_MIMETYPE_AUDIO_FLAC;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

media/java/android/media/MediaFile.java

+3 −3
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ public class MediaFile { 
    public static final int FILE_TYPE_OGG     = 7;

    public static final int FILE_TYPE_AAC     = 8;

    public static final int FILE_TYPE_MKA     = 9;

    public static final int FILE_TYPE_FLAC    = 10;

    private static final int FIRST_AUDIO_FILE_TYPE = FILE_TYPE_MP3;

    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_MKA;

    private static final int LAST_AUDIO_FILE_TYPE = FILE_TYPE_FLAC;



    // MIDI file types

    public static final int FILE_TYPE_MID     = 11;
@@ -99,8 +100,7 @@ public class MediaFile { 
    public static final int FILE_TYPE_MS_WORD       = 104;

    public static final int FILE_TYPE_MS_EXCEL      = 105;

    public static final int FILE_TYPE_MS_POWERPOINT = 106;

    public static final int FILE_TYPE_FLAC          = 107;

    public static final int FILE_TYPE_ZIP           = 108;

    public static final int FILE_TYPE_ZIP           = 107;

    

    static class MediaFileType {

media/java/android/mtp/MtpDatabase.java

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ public class MtpDatabase { 
            MtpConstants.FORMAT_M3U_PLAYLIST,

            MtpConstants.FORMAT_PLS_PLAYLIST,

            MtpConstants.FORMAT_XML_DOCUMENT,

            MtpConstants.FORMAT_FLAC,

        };

    }

media/libstagefright/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ LOCAL_SRC_FILES:= \ 
        DRMExtractor.cpp                  \

        ESDS.cpp                          \

        FileSource.cpp                    \

        FLACExtractor.cpp                 \

        HTTPStream.cpp                    \

        JPEGSource.cpp                    \

        MP3Extractor.cpp                  \
@@ -54,6 +55,7 @@ LOCAL_SRC_FILES:= \ 
LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

        $(TOP)/frameworks/base/include/media/stagefright/openmax \

        $(TOP)/external/flac/include \

        $(TOP)/external/tremolo \

        $(TOP)/frameworks/base/media/libstagefright/rtsp
@@ -93,6 +95,7 @@ LOCAL_STATIC_LIBRARIES := \ 
        libstagefright_rtsp \

        libstagefright_id3 \

        libstagefright_g711dec \

        libFLAC \



LOCAL_SHARED_LIBRARIES += \

        libstagefright_amrnb_common \

media/libstagefright/DataSource.cpp

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "include/NuCachedSource2.h"

#include "include/NuHTTPDataSource.h"

#include "include/DRMExtractor.h"

#include "include/FLACExtractor.h"



#include "matroska/MatroskaExtractor.h"
@@ -104,6 +105,7 @@ void DataSource::RegisterDefaultSniffers() { 
    RegisterSniffer(SniffMatroska);

    RegisterSniffer(SniffOgg);

    RegisterSniffer(SniffWAV);

    RegisterSniffer(SniffFLAC);

    RegisterSniffer(SniffAMR);

    RegisterSniffer(SniffMPEG2TS);

    RegisterSniffer(SniffMP3);