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

Commit 9eca1c5f authored by Christopher Ferris's avatar Christopher Ferris Committed by Gerrit Code Review
Browse files

Merge "Remove unused variables." into main

parents e5b5d6a8 ddd4fd7e

drm/mediadrm/plugins/clearkey/aidl/DrmPlugin.cpp

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ const int kKeySetIdLength = 16; 
const int kSecureStopIdStart = 100;

const std::string kOfflineLicense("\"type\":\"persistent-license\"");

const std::string kStreaming("Streaming");

const std::string kTemporaryLicense("\"type\":\"temporary\"");

const std::string kTrue("True");



const std::string kQueryKeyLicenseType("LicenseType");

drm/mediadrm/plugins/clearkey/common/JsonWebKey.cpp

+0 −3
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ const std::string kKeysTag("keys"); 
const std::string kKeyTypeTag("kty");

const std::string kKeyTag("k");

const std::string kKeyIdTag("kid");

const std::string kMediaSessionType("type");

const std::string kPersistentLicenseSession("persistent-license");

const std::string kSymmetricKeyValue("oct");

const std::string kTemporaryLicenseSession("temporary");

}  // namespace



namespace clearkeydrm {

media/codec2/sfplugin/CCodecBufferChannel.cpp

+0 −1
Original line number Diff line number Diff line
@@ -2807,7 +2807,6 @@ void CCodecBufferChannel::setInfoBuffer(const std::shared_ptr<C2InfoBuffer> &buf 
        work->input.infoBuffers.emplace_back(*buffer);

        work->worklets.emplace_back(new C2Worklet);

        items.push_back(std::move(work));

        c2_status_t err = mComponent->queue(&items);

    }

}

services/camera/virtualcamera/tests/VirtualCameraDeviceTest.cc

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ using metadata_stream_t = 
constexpr int kCameraId = 42;

constexpr int kQvgaWidth = 320;

constexpr int kQvgaHeight = 240;

constexpr int k360pWidth = 640;

constexpr int k360pHeight = 360;

constexpr int kVgaWidth = 640;

constexpr int kVgaHeight = 480;

constexpr int kHdWidth = 1280;