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

Commit 280859af authored by Dean Wheatley's avatar Dean Wheatley Committed by Haynes Mathew George
Browse files

libstagefright,audioflinger: Add Dolby DAP and UDC 

Register Dolby UDC in libstagefright.
Add Dolby DAP audio effect support in audioflinger

CRs-Fixed: 761339
Change-Id: Iace202800349a3612b9c4a980c2712d60fadfceb
parent bcef64de

cmds/stagefright/stagefright.cpp

+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) 2011-2014 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>
@@ -619,6 +638,11 @@ static void dumpCodecProfiles(const sp<IOMX>& omx, bool queryDecoders) { 
        MEDIA_MIMETYPE_AUDIO_MPEG, MEDIA_MIMETYPE_AUDIO_G711_MLAW,

        MEDIA_MIMETYPE_AUDIO_G711_ALAW, MEDIA_MIMETYPE_AUDIO_VORBIS,

        MEDIA_MIMETYPE_VIDEO_VP8, MEDIA_MIMETYPE_VIDEO_VP9

#ifdef DOLBY_UDC

        ,

        MEDIA_MIMETYPE_AUDIO_AC3,

        MEDIA_MIMETYPE_AUDIO_EAC3

#endif // DOLBY_END

    };



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

include/media/stagefright/AudioPlayer.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) 2014 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_
@@ -114,6 +133,11 @@ private: 


    bool mPlaying;

    int64_t mStartPosUs;

#ifdef DOLBY_UDC

    bool mDolbyProcessedAudio;

    void updateDolbyProcessedAudioState();

    void setDolbyProcessedAudioState(bool processed);

#endif // DOLBY_END

    const uint32_t mCreateFlags;

    bool mPauseRequired;

include/media/stagefright/MediaDefs.h

+23 −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-2014 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_
@@ -64,6 +83,10 @@ extern const char *MEDIA_MIMETYPE_TEXT_SUBRIP; 
extern const char *MEDIA_MIMETYPE_TEXT_VTT;

extern const char *MEDIA_MIMETYPE_TEXT_CEA_608;



#ifdef DOLBY_UDC

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC;

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;

#endif // DOLBY_END

}  // namespace android



#endif  // MEDIA_DEFS_H_

include/media/stagefright/MediaErrors.h

+23 −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) 2014 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_ERRORS_H_
@@ -53,6 +72,10 @@ enum { 
    INFO_FORMAT_CHANGED    = MEDIA_ERROR_BASE - 12,

    INFO_DISCONTINUITY     = MEDIA_ERROR_BASE - 13,

    INFO_OUTPUT_BUFFERS_CHANGED = MEDIA_ERROR_BASE - 14,

#ifdef DOLBY_UDC

    INFO_DOLBY_PROCESSED_AUDIO_START = MEDIA_ERROR_BASE - 15,

    INFO_DOLBY_PROCESSED_AUDIO_STOP = MEDIA_ERROR_BASE - 16,

#endif // DOLBY_END



    // The following constant values should be in sync with

    // drm/drm_framework_common.h

include/media/stagefright/OMXCodec.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) 2014 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 OMX_CODEC_H_
@@ -239,6 +258,11 @@ private: 
    Condition mAsyncCompletion;



    bool mPaused;

#ifdef DOLBY_UDC

    // Indicate if processed audio is being provided by Dolby decoder

    bool mDolbyProcessedAudio;

    bool mDolbyProcessedAudioStateChanged;

#endif // DOLBY_END



    sp<ANativeWindow> mNativeWindow;