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

Commit b9ee4a3a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libmediaplayerservice: Trace point addition" am: 02939e33 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1906681

Change-Id: I419d52dfb635775cf6157203bd8527769d20929d
parents 5e38dfef 02939e33

media/libmediaplayerservice/StagefrightRecorder.cpp

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "StagefrightRecorder"

#define ATRACE_TAG ATRACE_TAG_VIDEO

#include <utils/Trace.h>

#include <inttypes.h>

// TODO/workaround: including base logging now as it conflicts with ADebug.h

// and it must be included first.
@@ -1856,6 +1858,7 @@ void StagefrightRecorder::clipVideoFrameHeight() { 
// Set up the appropriate MediaSource depending on the chosen option

status_t StagefrightRecorder::setupMediaSource(

                      sp<MediaSource> *mediaSource) {

    ATRACE_CALL();

    if (mVideoSource == VIDEO_SOURCE_DEFAULT

            || mVideoSource == VIDEO_SOURCE_CAMERA) {

        sp<CameraSource> cameraSource;
@@ -1936,6 +1939,7 @@ status_t StagefrightRecorder::setupCameraSource( 
status_t StagefrightRecorder::setupVideoEncoder(

        const sp<MediaSource> &cameraSource,

        sp<MediaCodecSource> *source) {

    ATRACE_CALL();

    source->clear();



    sp<AMessage> format = new AMessage();
@@ -2114,6 +2118,7 @@ status_t StagefrightRecorder::setupVideoEncoder( 
}



status_t StagefrightRecorder::setupAudioEncoder(const sp<MediaWriter>& writer) {

    ATRACE_CALL();

    status_t status = BAD_VALUE;

    if (OK != (status = checkAudioEncoderCapabilities())) {

        return status;