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

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

Snap for 12530792 from 294d9ec7 to 25Q1-release

Change-Id: I1ba6116d45ff842f1370fe06ec40ad30de3bc3fe
parents 43699f63 294d9ec7
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ cc_library_headers {
cc_library_shared {
    name: "libsfplugin_ccodec",

    defaults: [
        "android.hardware.graphics.common-ndk_shared",
    ],

    export_include_dirs: ["include"],

    srcs: [
@@ -56,7 +60,6 @@ cc_library_shared {
        "android.hardware.drm@1.0",
        "android.hardware.media.c2@1.0",
        "android.hardware.media.omx@1.0",
        "android.hardware.graphics.common-V5-ndk",
        "graphicbuffersource-aidl-ndk",
        "libbase",
        "libbinder",
+2 −3
Original line number Diff line number Diff line
@@ -1159,11 +1159,10 @@ status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, const struct timespec *r
            // start of lock scope
            AutoMutex lock(mLock);

            uint32_t newSequence = mSequence;
            // did previous obtainBuffer() fail due to media server death or voluntary invalidation?
            if (status == DEAD_OBJECT) {
                // re-create track, unless someone else has already done so
                if (newSequence == oldSequence) {
                if (mSequence == oldSequence) {
                    if (!audio_is_linear_pcm(mFormat)) {
                        // If compressed capture, don't attempt to restore the track.
                        // Return a DEAD_OBJECT error and let the caller recreate.
@@ -1179,7 +1178,7 @@ status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, const struct timespec *r
                    }
                }
            }
            oldSequence = newSequence;
            oldSequence = mSequence;

            // Keep the extra references
            proxy = mProxy;
+6 −3
Original line number Diff line number Diff line
@@ -154,10 +154,13 @@ struct alignas(8) /* bug 29096183, bug 29108507 */ ExtendedTimestamp {
    std::string toString() const {
        std::stringstream ss;

        ss << "BOOTTIME offset " << mTimebaseOffset[TIMEBASE_BOOTTIME] << "\n";
        ss << "BOOTTIME offset " << mTimebaseOffset[TIMEBASE_BOOTTIME] << ": ExtendedTimestamp: ";
        for (int i = 0; i < LOCATION_MAX; ++i) {
            ss << "ExtendedTimestamp[" << i << "]  position: "
                    << mPosition[i] << "  time: "  << mTimeNs[i] << "\n";
            ss << "([" << i << "]  position: "
                    << mPosition[i] << "  time: "  << mTimeNs[i] << ")";
            if (i != LOCATION_MAX - 1) {
                ss << ", ";
            }
        }
        return ss.str();
    }
+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
//

package {
    default_team: "trendy_team_android_kernel",
    // See: http://go/android-license-faq
    // A large-scale-change added 'default_applicable_licenses' to import
    // all of the 'license_kinds' from "frameworks_av_media_libmedia_license"
+9 −0
Original line number Diff line number Diff line
@@ -2514,6 +2514,15 @@ void MediaPlayerService::AudioOutput::close()
    {
        Mutex::Autolock lock(mLock);
        track = mTrack;
    }

    // do not hold lock while joining.
    if (track) {
        track->stopAndJoinCallbacks();
    }

    {
        Mutex::Autolock lock(mLock);
        close_l(); // clears mTrack
    }
    // destruction of the track occurs outside of mutex.
Loading