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

Commit c3b122e7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7145173 from 1dff892a to sc-release 

Change-Id: I4ef883a92a587322a08e337e2c5a7e1e26806eba
parents 3599717a 1dff892a

media/codec2/fuzzer/C2Fuzzer.cpp

+2 −3
Original line number Diff line number Diff line
@@ -148,9 +148,8 @@ bool Codec2Fuzzer::initDecoder() { 
  std::vector<std::tuple<C2String, C2ComponentFactory::CreateCodec2FactoryFunc,

        C2ComponentFactory::DestroyCodec2FactoryFunc>> codec2FactoryFunc;



  codec2FactoryFunc.emplace_back(std::make_tuple(C2COMPONENTNAME,

                                                &CreateCodec2Factory,

                                                &DestroyCodec2Factory));

  codec2FactoryFunc.emplace_back(

      std::make_tuple(C2COMPONENTNAME, &CreateCodec2Factory, &DestroyCodec2Factory));



  std::shared_ptr<C2ComponentStore> componentStore = GetTestComponentStore(codec2FactoryFunc);

  if (!componentStore) {

media/codec2/fuzzer/C2Fuzzer.h

+15 −4
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ class Codec2Fuzzer { 
 private:

  class BufferSource {

   public:

    BufferSource(const uint8_t* data, size_t size)

        : mData(data), mSize(size), mReadIndex(size - kMarkerSize) {}

    BufferSource(const uint8_t* data, size_t size) : mData(data), mSize(size) {

      mReadIndex = (size <= kMarkerSize) ? 0 : (size - kMarkerSize);

    }

    ~BufferSource() {

      mData = nullptr;

      mSize = 0;
@@ -72,10 +73,20 @@ class Codec2Fuzzer { 
    FrameData getFrame();



   private:

    bool isMarker() { return (memcmp(&mData[mReadIndex], kMarker, kMarkerSize) == 0); }

    bool isMarker() {

      if ((kMarkerSize < mSize) && (mReadIndex < mSize - kMarkerSize)) {

        return (memcmp(&mData[mReadIndex], kMarker, kMarkerSize) == 0);

      } else {

        return false;

      }

    }



    bool isCSDMarker(size_t position) {

      if ((kMarkerSuffixSize < mSize) && (position < mSize - kMarkerSuffixSize)) {

        return (memcmp(&mData[position], kCsdMarkerSuffix, kMarkerSuffixSize) == 0);

      } else {

        return false;

      }

    }



    bool searchForMarker();

media/libeffects/lvm/benchmarks/Android.bp

+1 −0
Original line number Diff line number Diff line 
cc_benchmark {

    name: "lvm_benchmark",

    vendor: true,

    host_supported: true,

    srcs: ["lvm_benchmark.cpp"],

    static_libs: [

        "libbundlewrapper",

media/libeffects/lvm/lib/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ cc_library_static { 
    },



    vendor: true,

    host_supported: true,

    srcs: [

        "StereoWidening/src/LVCS_BypassMix.cpp",

        "StereoWidening/src/LVCS_Control.cpp",

media/libeffects/lvm/wrapper/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ cc_library { 
    },



    vendor: true,

    host_supported: true,

    srcs: ["Bundle/EffectBundle.cpp"],



    cppflags: [
@@ -25,7 +26,6 @@ cc_library { 
    shared_libs: [

        "libaudioutils",

        "libcutils",

        "libdl",

        "liblog",

    ],