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

Commit 97149699 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge DAX changes"

parents 03c2663a 397691fc

cmds/stagefright/Android.mk

+18 −0
Original line number Diff line number Diff line 
# This file was modified by Dolby Laboratories, Inc. The portions of the

# code that are surrounded by "DOLBY..." are copyrighted and

# licensed separately, as follows:

#

# (C)  2016 Dolby Laboratories, Inc.

# All rights reserved.

#

# This program is protected under international and U.S. Copyright laws as

# an unpublished work. This program is confidential and proprietary to the

# copyright owners. Reproduction or disclosure, in whole or in part, or the

# production of derivative works therefrom without the express permission of

# the copyright owners is prohibited.

#

LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)
@@ -18,6 +31,11 @@ LOCAL_C_INCLUDES:= \ 
	external/jpeg \



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

# DOLBY_START

ifeq ($(strip $(DOLBY_ENABLE)),true)

    LOCAL_CFLAGS += $(dolby_cflags)

endif

# DOLBY_END

LOCAL_CLANG := true



LOCAL_MODULE_TAGS := optional

cmds/stagefright/stagefright.cpp

+23 −0
Original line number Diff line number Diff line
@@ -12,6 +12,24 @@ 
 * 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.

 *

 * This file was modified by Dolby Laboratories, Inc. The portions of the

 * code that are surrounded by "DOLBY..." are copyrighted and

 * licensed separately, as follows:

 *

 *  (C) 2011-2016 Dolby Laboratories, Inc.

 *

 * 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.

 */



#include <inttypes.h>
@@ -632,6 +650,11 @@ static void dumpCodecProfiles(bool queryDecoders) { 
        MEDIA_MIMETYPE_AUDIO_G711_ALAW, MEDIA_MIMETYPE_AUDIO_VORBIS,

        MEDIA_MIMETYPE_VIDEO_VP8, MEDIA_MIMETYPE_VIDEO_VP9,

        MEDIA_MIMETYPE_VIDEO_DOLBY_VISION

#ifdef DOLBY_ENABLE

        ,

        MEDIA_MIMETYPE_AUDIO_AC3,

        MEDIA_MIMETYPE_AUDIO_EAC3

#endif // DOLBY_END

    };



    const char *codecType = queryDecoders? "decoder" : "encoder";

include/media/stagefright/ACodec.h

+24 −0
Original line number Diff line number Diff line
@@ -12,6 +12,25 @@ 
 * 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.

 *

 * This file was modified by Dolby Laboratories, Inc. The portions of the

 * code that are surrounded by "DOLBY..." are copyrighted and

 * licensed separately, as follows:

 *

 *  (C) 2015-2016 Dolby Laboratories, Inc.

 *

 * 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 A_CODEC_H_
@@ -556,6 +575,11 @@ protected: 


    // Send EOS on input stream.

    void onSignalEndOfInputStream();

#ifdef DOLBY_ENABLE

    status_t setDolbyParameterOnEndpChange();

    void     setDolbyParameter(const sp<AMessage> &msg);

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

#endif // DOLBY_END



    virtual void setBFrames(OMX_VIDEO_PARAM_MPEG4TYPE *mpeg4type) {}

    virtual void setBFrames(OMX_VIDEO_PARAM_AVCTYPE *h264type,

include/media/stagefright/AudioPlayer.h

+22 −0
Original line number Diff line number Diff line
@@ -12,6 +12,25 @@ 
 * 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.

 *

 * This file was modified by Dolby Laboratories, Inc. The portions of the

 * code that are surrounded by "DOLBY..." are copyrighted and

 * licensed separately, as follows:

 *

 *  (C) 2015-2016 Dolby Laboratories, Inc.

 *

 * 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 AUDIO_PLAYER_H_
@@ -118,6 +137,9 @@ private: 


    AudioPlayer(const AudioPlayer &);

    AudioPlayer &operator=(const AudioPlayer &);

#ifdef DOLBY_ENABLE

    void setDolbyProcessedAudio(sp<MetaData> &format);

#endif // DOLBY_END

};



}  // namespace android

include/media/stagefright/MediaDefs.h

+22 −0
Original line number Diff line number Diff line
@@ -12,6 +12,25 @@ 
 * 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.

 *

 * This file was modified by Dolby Laboratories, Inc. The portions of the

 * code that are surrounded by "DOLBY..." are copyrighted and

 * licensed separately, as follows:

 *

 *  (C) 2011-2016 Dolby Laboratories, Inc.

 *

 * 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_
@@ -50,6 +69,9 @@ 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;

#ifdef DOLBY_ENABLE

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC;

#endif // DOLBY_END



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;