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

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

Snap for 11722130 from bb645122 to 24Q3-release 

Change-Id: I449c43048b49dc1152360605d96f270f0b416874
parents 4f04c9d2 bb645122

media/libaudiohal/impl/StreamHalAidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -506,13 +506,13 @@ status_t StreamHalAidl::sendCommand( 
                "%s %s: must be invoked from the worker thread (%d)",

                __func__, command.toString().c_str(), workerTid);

    }

    StreamDescriptor::Reply localReply{};

    {

        std::lock_guard l(mCommandReplyLock);

        if (!mContext.getCommandMQ()->writeBlocking(&command, 1)) {

            ALOGE("%s: failed to write command %s to MQ", __func__, command.toString().c_str());

            return NOT_ENOUGH_DATA;

        }

        StreamDescriptor::Reply localReply{};

        if (reply == nullptr) {

            reply = &localReply;

        }

services/camera/virtualcamera/VirtualCameraDevice.cc

+13 −6
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <string>

#include <vector>



#include "VirtualCameraService.h"

#include "VirtualCameraSession.h"

#include "aidl/android/companion/virtualcamera/SupportedStreamConfiguration.h"

#include "aidl/android/companion/virtualcamera/VirtualCameraConfiguration.h"
@@ -575,12 +576,18 @@ ndk::ScopedAStatus VirtualCameraDevice::getTorchStrengthLevel( 
  return cameraStatus(Status::OPERATION_NOT_SUPPORTED);

}



binder_status_t VirtualCameraDevice::dump(int fd, const char** args,

                                          uint32_t numArgs) {

  // TODO(b/301023410) Implement.

  (void)fd;

  (void)args;

  (void)numArgs;

binder_status_t VirtualCameraDevice::dump(int fd, const char**, uint32_t) {

  ALOGD("Dumping virtual camera %d", mCameraId);

  const char* indent = "  ";

  const char* doubleIndent = "    ";

  dprintf(fd, "%svirtual_camera %d belongs to virtual device %d\n", indent,

          mCameraId,

          getDeviceId(mCameraCharacteristics)

              .value_or(VirtualCameraService::kDefaultDeviceId));

  dprintf(fd, "%sSupportedStreamConfiguration:\n", indent);

  for (auto& config : mSupportedInputConfigurations) {

    dprintf(fd, "%s%s", doubleIndent, config.toString().c_str());

  }

  return STATUS_OK;

}

services/camera/virtualcamera/VirtualCameraService.cc

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ namespace { 
constexpr int kVgaWidth = 640;

constexpr int kVgaHeight = 480;

constexpr int kMaxFps = 60;

constexpr int kDefaultDeviceId = 0;

constexpr char kEnableTestCameraCmd[] = "enable_test_camera";

constexpr char kDisableTestCameraCmd[] = "disable_test_camera";

constexpr char kHelp[] = "help";

services/camera/virtualcamera/VirtualCameraService.h

+3 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ class VirtualCameraService 
    mVerifyEglExtensions = false;

  }



  // Default virtual device id (the host device id)

  static constexpr int kDefaultDeviceId = 0;



 private:

  // Create and enable test camera instance if there's none.

  binder_status_t enableTestCameraCmd(

services/camera/virtualcamera/tests/VirtualCameraDeviceTest.cc

+27 −0
Original line number Diff line number Diff line
@@ -363,6 +363,33 @@ TEST_F(VirtualCameraDeviceTest, thumbnailSizeWithCompatibleAspectRatio) { 
              ElementsAre(Resolution(0, 0), Resolution(240, 180)));

}



TEST_F(VirtualCameraDeviceTest, dump) {

  std::string expected = R"(  virtual_camera 42 belongs to virtual device 0

  SupportedStreamConfiguration:

    SupportedStreamConfiguration{width: 640, height: 480, pixelFormat: YUV_420_888, maxFps: 30})";

  int expectedSize = expected.size() * sizeof(char);

  char buffer[expectedSize];



  // Create an in memory fd

  int fd = memfd_create("tmpFile", 0);

  mCamera->dump(fd, {}, 0);



  // Check that we wrote the expected size

  int dumpSize = lseek(fd, 0, SEEK_END);



  // Rewind and read from the fd

  lseek(fd, 0, SEEK_SET);

  read(fd, buffer, expectedSize);

  close(fd);



  // Check the content of the dump

  std::string name = std::string(buffer, expectedSize);

  ASSERT_EQ(expected, name);

  // Check the size after the content to display the string mismatch when a

  // failure occurs

  ASSERT_EQ(expectedSize, dumpSize);

}



}  // namespace

}  // namespace virtualcamera

}  // namespace companion