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

Commit ce4df5e5 authored by Wonsik Kim's avatar Wonsik Kim
Browse files

stagefright: move MedaDefs from libstagefright to libmedia 

Bug: 24761407
Change-Id: If4914340a645c6f3c14eea0c873c162926d72ca2
parent 38f56e4b

include/media/MediaDefs.h

0 → 100644
+82 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef MEDIA_DEFS_H_



#define MEDIA_DEFS_H_



namespace android {



extern const char *MEDIA_MIMETYPE_IMAGE_JPEG;



extern const char *MEDIA_MIMETYPE_VIDEO_VP8;

extern const char *MEDIA_MIMETYPE_VIDEO_VP9;

extern const char *MEDIA_MIMETYPE_VIDEO_AVC;

extern const char *MEDIA_MIMETYPE_VIDEO_HEVC;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4;

extern const char *MEDIA_MIMETYPE_VIDEO_H263;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG2;

extern const char *MEDIA_MIMETYPE_VIDEO_RAW;

extern const char *MEDIA_MIMETYPE_VIDEO_DOLBY_VISION;



extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB;

extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG;           // layer III

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II;

extern const char *MEDIA_MIMETYPE_AUDIO_MIDI;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC;

extern const char *MEDIA_MIMETYPE_AUDIO_QCELP;

extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS;

extern const char *MEDIA_MIMETYPE_AUDIO_OPUS;

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_AUDIO_AAC_ADTS;

extern const char *MEDIA_MIMETYPE_AUDIO_MSGSM;

extern const char *MEDIA_MIMETYPE_AUDIO_AC3;

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

extern const char *MEDIA_MIMETYPE_CONTAINER_OGG;

extern const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS;

extern const char *MEDIA_MIMETYPE_CONTAINER_AVI;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2PS;



extern const char *MEDIA_MIMETYPE_CONTAINER_WVM;



extern const char *MEDIA_MIMETYPE_TEXT_3GPP;

extern const char *MEDIA_MIMETYPE_TEXT_SUBRIP;

extern const char *MEDIA_MIMETYPE_TEXT_VTT;

extern const char *MEDIA_MIMETYPE_TEXT_CEA_608;

extern const char *MEDIA_MIMETYPE_TEXT_CEA_708;

extern const char *MEDIA_MIMETYPE_DATA_TIMED_ID3;



// These are values exported to JAVA API that need to be in sync with

// frameworks/base/media/java/android/media/AudioFormat.java. Unfortunately,

// they are not defined in frameworks/av, so defining them here.

enum AudioEncoding {

    kAudioEncodingPcm16bit = 2,

    kAudioEncodingPcm8bit = 3,

    kAudioEncodingPcmFloat = 4,

};



}  // namespace android



#endif  // MEDIA_DEFS_H_

include/media/stagefright/MediaDefs.h

+12 −63
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,69 +14,18 @@ 
 * limitations under the License.

 */



#ifndef MEDIA_DEFS_H_



#define MEDIA_DEFS_H_

#ifndef STAGEFRIGHT_MEDIA_DEFS_H_

#define STAGEFRIGHT_MEDIA_DEFS_H_



namespace android {



extern const char *MEDIA_MIMETYPE_IMAGE_JPEG;



extern const char *MEDIA_MIMETYPE_VIDEO_VP8;

extern const char *MEDIA_MIMETYPE_VIDEO_VP9;

extern const char *MEDIA_MIMETYPE_VIDEO_AVC;

extern const char *MEDIA_MIMETYPE_VIDEO_HEVC;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4;

extern const char *MEDIA_MIMETYPE_VIDEO_H263;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG2;

extern const char *MEDIA_MIMETYPE_VIDEO_RAW;

extern const char *MEDIA_MIMETYPE_VIDEO_DOLBY_VISION;



extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB;

extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG;           // layer III

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II;

extern const char *MEDIA_MIMETYPE_AUDIO_MIDI;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC;

extern const char *MEDIA_MIMETYPE_AUDIO_QCELP;

extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS;

extern const char *MEDIA_MIMETYPE_AUDIO_OPUS;

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_AUDIO_AAC_ADTS;

extern const char *MEDIA_MIMETYPE_AUDIO_MSGSM;

extern const char *MEDIA_MIMETYPE_AUDIO_AC3;

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

extern const char *MEDIA_MIMETYPE_CONTAINER_OGG;

extern const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS;

extern const char *MEDIA_MIMETYPE_CONTAINER_AVI;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2PS;



extern const char *MEDIA_MIMETYPE_CONTAINER_WVM;



extern const char *MEDIA_MIMETYPE_TEXT_3GPP;

extern const char *MEDIA_MIMETYPE_TEXT_SUBRIP;

extern const char *MEDIA_MIMETYPE_TEXT_VTT;

extern const char *MEDIA_MIMETYPE_TEXT_CEA_608;

extern const char *MEDIA_MIMETYPE_TEXT_CEA_708;

extern const char *MEDIA_MIMETYPE_DATA_TIMED_ID3;



// These are values exported to JAVA API that need to be in sync with

// frameworks/base/media/java/android/media/AudioFormat.java. Unfortunately,

// they are not defined in frameworks/av, so defining them here.

enum AudioEncoding {

    kAudioEncodingPcm16bit = 2,

    kAudioEncodingPcm8bit = 3,

    kAudioEncodingPcmFloat = 4,

};

/*

 * Please, DO NOT USE!

 *

 * This file is here only for legacy reasons. Instead, include directly

 * the header below.

 *

 */



}  // namespace android

#include <media/MediaDefs.h>



#endif  // MEDIA_DEFS_H_
 
#endif  // STAGEFRIGHT_MEDIA_DEFS_H_

media/libmedia/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ LOCAL_SRC_FILES:= \ 
    IResourceManagerService.cpp \

    IStreamSource.cpp \

    MediaCodecInfo.cpp \

    MediaDefs.cpp \

    MediaUtils.cpp \

    Metadata.cpp \

    mediarecorder.cpp \

media/libstagefright/MediaDefs.cpp→media/libmedia/MediaDefs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#include <media/stagefright/MediaDefs.h>

#include <media/MediaDefs.h>



namespace android {

media/libstagefright/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ LOCAL_SRC_FILES:= \ 
        MediaCodecList.cpp                \

        MediaCodecListOverrides.cpp       \

        MediaCodecSource.cpp              \

        MediaDefs.cpp                     \

        MediaExtractor.cpp                \

        MediaSync.cpp                     \

        MidiExtractor.cpp                 \