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

Commit ef513c65 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7205268 from 51b94f9e to sc-release 

Change-Id: Ifd1730abd9456965afc92953fbcb1e924f0e74fe
parents c920357b 51b94f9e

cmds/stagefright/Android.mk

+9 −3
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ LOCAL_SHARED_LIBRARIES := \ 
        libstagefright_foundation libjpeg libui libgui libcutils liblog \

        libhidlbase libdatasource libaudioclient \

        android.hardware.media.omx@1.0 \

        media_permission-aidl-cpp



LOCAL_STATIC_LIBRARIES := media_permission-aidl-cpp



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \
@@ -48,7 +51,8 @@ LOCAL_HEADER_LIBRARIES := \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia liblog libutils libbinder \

        libstagefright_foundation libdatasource libaudioclient

        libstagefright_foundation libdatasource libaudioclient \

        media_permission-aidl-cpp



LOCAL_C_INCLUDES:= \

        frameworks/av/camera/include \
@@ -85,7 +89,8 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \

        frameworks/native/include/media/openmax \

        frameworks/native/include/media/hardware

        frameworks/native/include/media/hardware \

        media_permission-aidl-cpp



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall
@@ -113,7 +118,8 @@ LOCAL_HEADER_LIBRARIES := \ 


LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia liblog libutils libbinder \

        libstagefright_foundation libaudioclient

        libstagefright_foundation libaudioclient \

        media_permission-aidl-cpp



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \

cmds/stagefright/audioloop.cpp

+5 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <utils/String16.h>



#include <android/media/permission/Identity.h>

#include <binder/ProcessState.h>

#include <media/mediarecorder.h>

#include <media/stagefright/foundation/ADebug.h>
@@ -38,6 +39,8 @@ 


using namespace android;



using media::permission::Identity;



static void usage(const char* name)

{

    fprintf(stderr, "Usage: %s [-d du.ration] [-m] [-w] [-N name] [<output-file>]\n", name);
@@ -110,9 +113,10 @@ int main(int argc, char* argv[]) 
        audio_attributes_t attr = AUDIO_ATTRIBUTES_INITIALIZER;

        attr.source = AUDIO_SOURCE_MIC;



        // TODO b/182392769: use identity util

        source = new AudioSource(

                &attr,

                String16(),

                Identity(),

                sampleRate,

                channels);

    } else {

media/codec2/sfplugin/CCodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1135,10 +1135,10 @@ void CCodec::configure(const sp<AMessage> &msg) { 
        int32_t clientPrepend;

        if ((config->mDomain & Config::IS_VIDEO)

                && (config->mDomain & Config::IS_ENCODER)

                && msg->findInt32(KEY_PREPEND_HEADERS_TO_SYNC_FRAMES, &clientPrepend)

                && msg->findInt32(KEY_PREPEND_HEADER_TO_SYNC_FRAMES, &clientPrepend)

                && clientPrepend

                && (!prepend || prepend.value != PREPEND_HEADER_TO_ALL_SYNC)) {

            ALOGE("Failed to set KEY_PREPEND_HEADERS_TO_SYNC_FRAMES");

            ALOGE("Failed to set KEY_PREPEND_HEADER_TO_SYNC_FRAMES");

            return BAD_VALUE;

        }

media/codec2/sfplugin/CCodecBufferChannel.cpp

+11 −0
Original line number Diff line number Diff line
@@ -1728,6 +1728,17 @@ bool CCodecBufferChannel::handleWork( 
                }

                break;

            }

            case C2PortTunnelSystemTime::CORE_INDEX: {

                C2PortTunnelSystemTime::output frameRenderTime;

                if (frameRenderTime.updateFrom(*param)) {

                    ALOGV("[%s] onWorkDone: frame rendered (sys:%lld ns, media:%lld us)",

                          mName, (long long)frameRenderTime.value,

                          (long long)worklet->output.ordinal.timestamp.peekll());

                    mCCodecCallback->onOutputFramesRendered(

                            worklet->output.ordinal.timestamp.peek(), frameRenderTime.value);

                }

                break;

            }

            default:

                ALOGV("[%s] onWorkDone: unrecognized config update (%08X)",

                      mName, param->index());

media/codec2/sfplugin/CCodecConfig.cpp

+2 −2
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ void CCodecConfig::initializeStandardParams() { 
    add(ConfigMapper(std::string(KEY_FEATURE_) + FEATURE_SecurePlayback,

                     C2_PARAMKEY_SECURE_MODE, "value"));



    add(ConfigMapper(KEY_PREPEND_HEADERS_TO_SYNC_FRAMES,

    add(ConfigMapper(KEY_PREPEND_HEADER_TO_SYNC_FRAMES,

                     C2_PARAMKEY_PREPEND_HEADER_MODE, "value")

        .limitTo(D::ENCODER & D::VIDEO)

        .withMappers([](C2Value v) -> C2Value {
@@ -531,7 +531,7 @@ void CCodecConfig::initializeStandardParams() { 
            return C2Value();

        }));

    // remove when codecs switch to PARAMKEY

    deprecated(ConfigMapper(KEY_PREPEND_HEADERS_TO_SYNC_FRAMES,

    deprecated(ConfigMapper(KEY_PREPEND_HEADER_TO_SYNC_FRAMES,

                            "coding.add-csd-to-sync-frames", "value")

               .limitTo(D::ENCODER & D::VIDEO));

    // convert to timestamp base