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

Commit 562c9247 authored by Lajos Molnar's avatar Lajos Molnar Committed by Automerger Merge Worker
Browse files

Merge changes I0aa848bb,If81dd3c1,Ib03bde00,I1ae58c7f am: 7327aab8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia96277f7aef313b5877df7fda2014cee2d0de437
parents 15cd5437 7327aab8

media/codec2/sfplugin/CCodecBufferChannel.cpp

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




#include <android/hardware/cas/native/1.0/IDescrambler.h>

#include <android/hardware/cas/native/1.0/IDescrambler.h>

#include <android/hardware/drm/1.0/types.h>

#include <android/hardware/drm/1.0/types.h>

#include <android-base/properties.h>

#include <android-base/stringprintf.h>

#include <android-base/stringprintf.h>

#include <binder/MemoryBase.h>

#include <binder/MemoryBase.h>

#include <binder/MemoryDealer.h>

#include <binder/MemoryDealer.h>
@@ -891,7 +892,12 @@ status_t CCodecBufferChannel::renderOutputBuffer( 
        }

        }

        return result;

        return result;

    }

    }



    if(android::base::GetBoolProperty("debug.stagefright.fps", false)) {

        ALOGD("[%s] queue buffer successful", mName);

    } else {

        ALOGV("[%s] queue buffer successful", mName);

        ALOGV("[%s] queue buffer successful", mName);

    }





    int64_t mediaTimeUs = 0;

    int64_t mediaTimeUs = 0;

    (void)buffer->meta()->findInt64("timeUs", &mediaTimeUs);

    (void)buffer->meta()->findInt64("timeUs", &mediaTimeUs);

media/libstagefright/rtsp/AAVCAssembler.cpp

+7 −1
Original line number Original line Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <media/stagefright/foundation/avc_utils.h>

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

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

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





#include <android-base/properties.h>



#include <stdint.h>

#include <stdint.h>





namespace android {

namespace android {
@@ -513,7 +515,11 @@ ARTPAssembler::AssemblyStatus AAVCAssembler::addFragmentedNALUnit( 
void AAVCAssembler::submitAccessUnit() {

void AAVCAssembler::submitAccessUnit() {

    CHECK(!mNALUnits.empty());

    CHECK(!mNALUnits.empty());





    if(android::base::GetBoolProperty("debug.stagefright.fps", false)) {

        ALOGD("Access unit complete (%zu nal units)", mNALUnits.size());

    } else {

        ALOGV("Access unit complete (%zu nal units)", mNALUnits.size());

        ALOGV("Access unit complete (%zu nal units)", mNALUnits.size());

    }





    size_t totalSize = 0;

    size_t totalSize = 0;

    for (List<sp<ABuffer> >::iterator it = mNALUnits.begin();

    for (List<sp<ABuffer> >::iterator it = mNALUnits.begin();