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

Commit e0db4356 authored by Dichen Zhang's avatar Dichen Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fixes for MediaRecorder log-session-id" into sc-dev am: 89c0d4cb 

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

Change-Id: I4c42a14ba9fd61a115bd529cb539d64d6f17845d
parents b8dcf573 89c0d4cb

services/mediametrics/statsd_recorder.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -57,8 +57,8 @@ bool statsd_recorder(const std::shared_ptr<const mediametrics::Item>& item, 




    // string kRecorderLogSessionId = "android.media.mediarecorder.log-session-id";

    // string kRecorderLogSessionId = "android.media.mediarecorder.log-session-id";

    std::string log_session_id;

    std::string log_session_id;

    if (item->getString("android.media.mediarecorder.log_session_id", &log_session_id)) {

    if (item->getString("android.media.mediarecorder.log-session-id", &log_session_id)) {

        metrics_proto.set_log_session_id(std::move(log_session_id));

        metrics_proto.set_log_session_id(log_session_id);

    }

    }

    // string kRecorderAudioMime = "android.media.mediarecorder.audio.mime";

    // string kRecorderAudioMime = "android.media.mediarecorder.audio.mime";

    std::string audio_mime;

    std::string audio_mime;
@@ -214,8 +214,7 @@ bool statsd_recorder(const std::shared_ptr<const mediametrics::Item>& item, 
            << " video_bitrate:" << video_bitrate

            << " video_bitrate:" << video_bitrate





            << " iframe_interval:" << iframe_interval

            << " iframe_interval:" << iframe_interval

            // TODO Recorder - add log_session_id

            << " log_session_id:" << log_session_id

            // << " log_session_id:" << log_session_id

            << " }";

            << " }";

    statsdLog->log(android::util::MEDIAMETRICS_RECORDER_REPORTED, log.str());

    statsdLog->log(android::util::MEDIAMETRICS_RECORDER_REPORTED, log.str());

    return true;

    return true;