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

Commit c391c5c1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7924855 from f60db7ed to sc-v2-release 

Change-Id: I0a410ba8c0691f55309e08be84230dc079ed382a
parents 0db49f4a f60db7ed

media/libmediatranscoding/OWNERS

+4 −5
Original line number Diff line number Diff line 
chz@google.com

gokrishnan@google.com

hkuang@google.com

lnilsson@google.com

pawin@google.com
 
# Bug component: 761430



# go/android-fwk-media-solutions for info on areas of ownership.

include platform/frameworks/av:/media/janitors/media_solutions_OWNERS

media/libstagefright/MediaCodec.cpp

+5 −3
Original line number Diff line number Diff line
@@ -1511,6 +1511,9 @@ status_t MediaCodec::configure( 
        uint32_t flags) {

    sp<AMessage> msg = new AMessage(kWhatConfigure, this);



    // TODO: validity check log-session-id: it should be a 32-hex-digit.

    format->findString("log-session-id", &mLogSessionId);



    if (mMetricsHandle != 0) {

        int32_t profile = 0;

        if (format->findInt32("profile", &profile)) {
@@ -1522,11 +1525,11 @@ status_t MediaCodec::configure( 
        }

        mediametrics_setInt32(mMetricsHandle, kCodecEncoder,

                              (flags & CONFIGURE_FLAG_ENCODE) ? 1 : 0);



        mediametrics_setCString(mMetricsHandle, kCodecLogSessionId, mLogSessionId.c_str());

    }



    if (mIsVideo) {

        // TODO: validity check log-session-id: it should be a 32-hex-digit.

        format->findString("log-session-id", &mLogSessionId);

        format->findInt32("width", &mVideoWidth);

        format->findInt32("height", &mVideoHeight);

        if (!format->findInt32("rotation-degrees", &mRotationDegrees)) {
@@ -1534,7 +1537,6 @@ status_t MediaCodec::configure( 
        }



        if (mMetricsHandle != 0) {

            mediametrics_setCString(mMetricsHandle, kCodecLogSessionId, mLogSessionId.c_str());

            mediametrics_setInt32(mMetricsHandle, kCodecWidth, mVideoWidth);

            mediametrics_setInt32(mMetricsHandle, kCodecHeight, mVideoHeight);

            mediametrics_setInt32(mMetricsHandle, kCodecRotation, mRotationDegrees);

services/mediatranscoding/OWNERS

+3 −3
Original line number Diff line number Diff line 
akersten@google.com

hkuang@google.com

lnilsson@google.com

# Bug component: 761430



# go/android-fwk-media-solutions for info on areas of ownership.

include platform/frameworks/av:/media/janitors/media_solutions_OWNERS
 
 No newline at end of file