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

Commit 856990b4 authored by Glenn Kasten's avatar Glenn Kasten
Browse files

Bug 1804058 FLAC extractor 

Note: dependent on external/flac for libFLAC

Implemented and tested:
 * FLAC container
 * mono and stereo
 * standard sample rates
 * standard bit depths
 * sniffer
 * media scanner
 * Vorbis comment metadata including album art
 * random access seeking with "torture test"
 * web browser integration for audio/flac (not audio/x-flac), but
   note that most web servers don't correctly report the MIME type

Not implemented:
 * 24-bit to 16-bit dither or noise shaping in AudioFlinger
 * 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger
 * replay gain is better done in AudioFlinger
 * multi-channel, would need AudioFlinger support
 * Ogg container, does not seem to be very popular yet

Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
parent 31c52e7c

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/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);

media/libstagefright/FLACExtractor.cpp

0 → 100644
+813 −0

File added.

Preview size limit exceeded, changes collapsed.

media/libstagefright/MediaDefs.cpp

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ const char *MEDIA_MIMETYPE_AUDIO_VORBIS = "audio/vorbis"; 
const char *MEDIA_MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";

const char *MEDIA_MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw";

const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac";



const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav";