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

Commit 6902463a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ib249b276,Ica1d0286,If4914340 

* changes:
  LOCAL_CLANG := true is now the default
  stagefright: move several static methods out of ACodec
  stagefright: move MediaDefs from libstagefright to libmedia
parents 0e0e0819 8dbc1205

camera/ndk/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libcutils \

    libcamera_metadata



LOCAL_CLANG := true



include $(BUILD_SHARED_LIBRARY)



endif

cmds/stagefright/Android.mk

+0 −9
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ LOCAL_C_INCLUDES:= \ 
	external/jpeg \



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -43,7 +42,6 @@ LOCAL_C_INCLUDES:= \ 
	$(TOP)/frameworks/native/include/media/hardware



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -68,7 +66,6 @@ LOCAL_C_INCLUDES:= \ 
	$(TOP)/frameworks/native/include/media/hardware



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -93,7 +90,6 @@ LOCAL_C_INCLUDES:= \ 
	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -117,7 +113,6 @@ LOCAL_C_INCLUDES:= \ 
	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -141,7 +136,6 @@ LOCAL_C_INCLUDES:= \ 
	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -166,7 +160,6 @@ LOCAL_C_INCLUDES:= \ 
	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -208,7 +201,6 @@ LOCAL_STATIC_LIBRARIES:= \ 
	libstagefright_mediafilter



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional
@@ -232,7 +224,6 @@ LOCAL_C_INCLUDES:= \ 
	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional

drm/libmediadrm/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils



LOCAL_CFLAGS += -Werror -Wno-error=deprecated-declarations -Wall

LOCAL_CLANG := true



LOCAL_MODULE:= libmediadrm

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/ACodec.h

+0 −12
Original line number Diff line number Diff line
@@ -94,10 +94,6 @@ struct ACodec : public AHierarchicalStateMachine, public CodecBase { 
        DISALLOW_EVIL_CONSTRUCTORS(PortDescription);

    };



    static bool isFlexibleColorFormat(

            const sp<IOMX> &omx, IOMX::node_id node,

            uint32_t colorFormat, bool usingNativeBuffers, OMX_U32 *flexibleEquivalent);



    // Returns 0 if configuration is not supported.  NOTE: this is treated by

    // some OMX components as auto level, and by others as invalid level.

    static int /* OMX_VIDEO_AVCLEVELTYPE */ getAVCLevelFor(
@@ -342,9 +338,6 @@ private: 
            ssize_t *index = NULL);



    status_t setComponentRole(bool isEncoder, const char *mime);

    static const char *getComponentRole(bool isEncoder, const char *mime);

    static status_t setComponentRole(

            const sp<IOMX> &omx, IOMX::node_id node, const char *role);



    status_t configureCodec(const char *mime, const sp<AMessage> &msg);
@@ -552,11 +545,6 @@ private: 
            OMX_ERRORTYPE error = OMX_ErrorUndefined,

            status_t internalError = UNKNOWN_ERROR);



    static bool describeDefaultColorFormat(DescribeColorFormat2Params &describeParams);

    static bool describeColorFormat(

        const sp<IOMX> &omx, IOMX::node_id node,

        DescribeColorFormat2Params &describeParams);



    status_t requestIDRFrame();

    status_t setParameters(const sp<AMessage> &params);