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

Commit fd9445e9 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Run audio services in audioserver instead of mediaserver"

parents e35ff4de dcb346b7

media/audioserver/Android.mk

0 → 100644
+35 −0
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

	main_audioserver.cpp



LOCAL_SHARED_LIBRARIES := \

	libaudioflinger \

	libaudiopolicyservice \

	libbinder \

	liblog \

	libmedia \

	libradioservice \

	libsoundtriggerservice \

	libutils \



LOCAL_C_INCLUDES := \

	frameworks/av/services/audioflinger \

	frameworks/av/services/audiopolicy \

	frameworks/av/services/audiopolicy/common/managerdefinitions/include \

	frameworks/av/services/audiopolicy/common/include \

	frameworks/av/services/audiopolicy/engine/interface \

	frameworks/av/services/audiopolicy/service \

	frameworks/av/services/radio \

	frameworks/av/services/soundtrigger \

	$(call include-path-for, audio-utils) \

	external/sonic \



LOCAL_MODULE := audioserver

LOCAL_32_BIT_ONLY := true



LOCAL_INIT_RC := audioserver.rc



include $(BUILD_EXECUTABLE)

media/audioserver/audioserver.rc

0 → 100644
+6 −0
Original line number Diff line number Diff line 
service audioserver /system/bin/audioserver

    class main

    user audioserver

    # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)

    group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct

    ioprio rt 4

media/audioserver/main_audioserver.cpp

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

 * Copyright (C) 2015 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.

 */



#define LOG_TAG "audioserver"

//#define LOG_NDEBUG 0



#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <utils/Log.h>



// from LOCAL_C_INCLUDES

#include "AudioFlinger.h"

#include "AudioPolicyService.h"

#include "RadioService.h"

#include "SoundTriggerHwService.h"



using namespace android;



int main(int argc __unused, char **argv __unused)

{

    signal(SIGPIPE, SIG_IGN);



    // TODO: add logging b/24511453#3



    sp<ProcessState> proc(ProcessState::self());

    sp<IServiceManager> sm(defaultServiceManager());

    ALOGI("ServiceManager: %p", sm.get());

    AudioFlinger::instantiate();

    AudioPolicyService::instantiate();

    RadioService::instantiate();

    SoundTriggerHwService::instantiate();

    ProcessState::self()->startThreadPool();

    IPCThreadState::self()->joinThreadPool();

}

media/mediaserver/Android.mk

+0 −17
Original line number Diff line number Diff line
@@ -14,22 +14,15 @@ LOCAL_SRC_FILES:= \ 
	main_mediaserver.cpp



LOCAL_SHARED_LIBRARIES := \

	libaudioflinger \

	libaudiopolicyservice \

	libcamera_metadata\

	libcameraservice \

	libicuuc \

	libmedialogservice \

	libresourcemanagerservice \

	libcutils \

	libnbaio \

	libmedia \

	libmediaplayerservice \

	libutils \

	liblog \

	libbinder \

	libsoundtriggerservice \

	libradioservice



LOCAL_STATIC_LIBRARIES := \

        libicuandroid_utils \
@@ -37,18 +30,8 @@ LOCAL_STATIC_LIBRARIES := \ 


LOCAL_C_INCLUDES := \

    frameworks/av/media/libmediaplayerservice \

    frameworks/av/services/medialog \

    frameworks/av/services/audioflinger \

    frameworks/av/services/audiopolicy \

    frameworks/av/services/audiopolicy/common/managerdefinitions/include \

    frameworks/av/services/audiopolicy/common/include \

    frameworks/av/services/audiopolicy/engine/interface \

    frameworks/av/services/camera/libcameraservice \

    frameworks/av/services/mediaresourcemanager \

    $(call include-path-for, audio-utils) \

    frameworks/av/services/soundtrigger \

    frameworks/av/services/radio \

    external/sonic



LOCAL_MODULE:= mediaserver

LOCAL_32_BIT_ONLY := true

media/mediaserver/main_mediaserver.cpp

+11 −107
Original line number Diff line number Diff line
@@ -18,126 +18,30 @@ 
#define LOG_TAG "mediaserver"

//#define LOG_NDEBUG 0



#include <fcntl.h>

#include <sys/prctl.h>

#include <sys/wait.h>

#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <cutils/properties.h>

#include <utils/Log.h>

#include "RegisterExtensions.h"



// from LOCAL_C_INCLUDES

#include "AudioFlinger.h"

#include "CameraService.h"

#include "IcuUtils.h"

#include "MediaLogService.h"

#include "MediaPlayerService.h"

#include "ResourceManagerService.h"

#include "service/AudioPolicyService.h"

#include "SoundTriggerHwService.h"

#include "RadioService.h"



using namespace android;



int main(int argc __unused, char** argv)

int main(int argc __unused, char **argv __unused)

{

    signal(SIGPIPE, SIG_IGN);

    char value[PROPERTY_VALUE_MAX];

    bool doLog = (property_get("ro.test_harness", value, "0") > 0) && (atoi(value) == 1);

    pid_t childPid;

    // FIXME The advantage of making the process containing media.log service the parent process of

    // the process that contains all the other real services, is that it allows us to collect more

    // detailed information such as signal numbers, stop and continue, resource usage, etc.

    // But it is also more complex.  Consider replacing this by independent processes, and using

    // binder on death notification instead.

    if (doLog && (childPid = fork()) != 0) {

        // media.log service

        //prctl(PR_SET_NAME, (unsigned long) "media.log", 0, 0, 0);

        // unfortunately ps ignores PR_SET_NAME for the main thread, so use this ugly hack

        strcpy(argv[0], "media.log");

        sp<ProcessState> proc(ProcessState::self());

        MediaLogService::instantiate();

        ProcessState::self()->startThreadPool();

        for (;;) {

            siginfo_t info;

            int ret = waitid(P_PID, childPid, &info, WEXITED | WSTOPPED | WCONTINUED);

            if (ret == EINTR) {

                continue;

            }

            if (ret < 0) {

                break;

            }

            char buffer[32];

            const char *code;

            switch (info.si_code) {

            case CLD_EXITED:

                code = "CLD_EXITED";

                break;

            case CLD_KILLED:

                code = "CLD_KILLED";

                break;

            case CLD_DUMPED:

                code = "CLD_DUMPED";

                break;

            case CLD_STOPPED:

                code = "CLD_STOPPED";

                break;

            case CLD_TRAPPED:

                code = "CLD_TRAPPED";

                break;

            case CLD_CONTINUED:

                code = "CLD_CONTINUED";

                break;

            default:

                snprintf(buffer, sizeof(buffer), "unknown (%d)", info.si_code);

                code = buffer;

                break;

            }

            struct rusage usage;

            getrusage(RUSAGE_CHILDREN, &usage);

            ALOG(LOG_ERROR, "media.log", "pid %d status %d code %s user %ld.%03lds sys %ld.%03lds",

                    info.si_pid, info.si_status, code,

                    usage.ru_utime.tv_sec, usage.ru_utime.tv_usec / 1000,

                    usage.ru_stime.tv_sec, usage.ru_stime.tv_usec / 1000);

            sp<IServiceManager> sm = defaultServiceManager();

            sp<IBinder> binder = sm->getService(String16("media.log"));

            if (binder != 0) {

                Vector<String16> args;

                binder->dump(-1, args);

            }

            switch (info.si_code) {

            case CLD_EXITED:

            case CLD_KILLED:

            case CLD_DUMPED: {

                ALOG(LOG_INFO, "media.log", "exiting");

                _exit(0);

                // not reached

                }

            default:

                break;

            }

        }

    } else {

        // all other services

        if (doLog) {

            prctl(PR_SET_PDEATHSIG, SIGKILL);   // if parent media.log dies before me, kill me also

            setpgid(0, 0);                      // but if I die first, don't kill my parent

        }

        InitializeIcuOrDie();



    sp<ProcessState> proc(ProcessState::self());

        sp<IServiceManager> sm = defaultServiceManager();

    sp<IServiceManager> sm(defaultServiceManager());

    ALOGI("ServiceManager: %p", sm.get());

        AudioFlinger::instantiate();

    MediaPlayerService::instantiate();

    ResourceManagerService::instantiate();

    CameraService::instantiate();

        AudioPolicyService::instantiate();

        SoundTriggerHwService::instantiate();

        RadioService::instantiate();

    registerExtensions();

    ProcessState::self()->startThreadPool();

    IPCThreadState::self()->joinThreadPool();

}
 
}