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

Unverified Commit d5a05584 authored by Steve Kondik's avatar Steve Kondik Committed by Michael Bestas
Browse files

stagefright: Finish "Port AOSP fixes" 

 * Fill in stubs for CAF commit bd019775

Change-Id: Ia97d965d121aa3c3c2fc0ab8b164244416852ca5
parent acdcd376

media/libavextensions/stagefright/AVUtils.cpp

+40 −4
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 


#define LOG_TAG "AVUtils"

#include <utils/Log.h>

#include <utils/StrongPointer.h>

#include <cutils/properties.h>



#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/foundation/AMessage.h>
@@ -39,6 +41,9 @@ 
#include <media/stagefright/ACodec.h>

#include <media/stagefright/MediaCodec.h>



#include <binder/IPCThreadState.h>

#include <camera/CameraParameters.h>



#include "common/ExtensionsLoader.hpp"

#include "stagefright/AVExtensions.h"
@@ -129,12 +134,43 @@ bool AVUtils::isEnhancedExtension(const char *) { 
    return false;

}



bool AVUtils::isAudioMuxFormatSupported(const char *) {



bool AVUtils::isAudioMuxFormatSupported(const char * mime) {

    if (mime == NULL) {

        ALOGE("NULL audio mime type");

        return false;

    }



    if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_AMR_NB, mime)

            || !strcasecmp(MEDIA_MIMETYPE_AUDIO_AMR_WB, mime)

            || !strcasecmp(MEDIA_MIMETYPE_AUDIO_AAC, mime)) {

        return true;

    }

    return false;

}



void AVUtils::cacheCaptureBuffers(sp<hardware::ICamera>, video_encoder) {

    return;

void AVUtils::cacheCaptureBuffers(sp<hardware::ICamera> camera, video_encoder encoder) {

    if (camera != NULL) {

        char mDeviceName[PROPERTY_VALUE_MAX];

        property_get("ro.board.platform", mDeviceName, "0");

        if (!strncmp(mDeviceName, "msm8909", 7)) {

            int64_t token = IPCThreadState::self()->clearCallingIdentity();

            String8 s = camera->getParameters();

            CameraParameters params(s);

            const char *enable;

            if (encoder == VIDEO_ENCODER_H263 ||

                encoder == VIDEO_ENCODER_MPEG_4_SP) {

                enable = "1";

            } else {

                enable = "0";

            }

            params.set("cache-video-buffers", enable);

            if (camera->setParameters(params.flatten()) != OK) {

                ALOGE("Failed to enabled cached camera buffers");

            }

            IPCThreadState::self()->restoreCallingIdentity(token);

        }

    }

}



const char *AVUtils::getCustomCodecsLocation() {

media/libstagefright/ACodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4693,7 +4693,7 @@ status_t ACodec::setupErrorCorrectionParameters() { 


    errorCorrectionType.bEnableHEC = OMX_FALSE;

    errorCorrectionType.bEnableResync = OMX_TRUE;

    errorCorrectionType.nResynchMarkerSpacing = 256;

    errorCorrectionType.nResynchMarkerSpacing = 0;

    errorCorrectionType.bEnableDataPartitioning = OMX_FALSE;

    errorCorrectionType.bEnableRVLC = OMX_FALSE;