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

Commit a15957ac authored by Fyodor Kyslov's avatar Fyodor Kyslov Committed by Gerrit Code Review
Browse files

Merge changes Idbf09270,I67d98e6a into main 

* changes:
  APV: Make workarounds for EncoderProfileLevelTest to pass
  APV: Add APV SW Decoder to C2 fuzzing
parents 2ae4393f 2e163c98

media/codec2/components/apv/C2SoftApvEnc.cpp

+12 −2
Original line number Diff line number Diff line
@@ -1177,6 +1177,16 @@ void C2SoftApvEnc::createCsdData(const std::unique_ptr<C2Work>& work, 
    number_of_frame_info = 1;  // The real-time encoding on the device is assumed to be 1.



    std::vector<uint8_t> csdData;



    //TODO(b/392976813): These 4 lines need to be removed once test data are fixed.

    csdData.push_back((uint8_t)0x0);

    csdData.push_back((uint8_t)0x0);

    csdData.push_back((uint8_t)0x0);

    csdData.push_back((uint8_t)0x0);



    //TODO(b/392976819) This need to be removed once OpenAPV is fixed.

    bit_depth_minus8 = 2;



    csdData.push_back((uint8_t)0x1);

    csdData.push_back(number_of_configuration_entry);
@@ -1197,8 +1207,8 @@ void C2SoftApvEnc::createCsdData(const std::unique_ptr<C2Work>& work, 
            csdData.push_back((uint8_t)((frame_height_minus1 >> 16) & 0xff));

            csdData.push_back((uint8_t)((frame_height_minus1 >> 8) & 0xff));

            csdData.push_back((uint8_t)(frame_height_minus1 & 0xff));

            csdData.push_back((uint8_t)(((chroma_format_idc << 4) & 0xf0) |

                                      (bit_depth_minus8 & 0xf)));

            csdData.push_back((uint8_t)(((bit_depth_minus8 << 4) & 0xf0) |

                                      (chroma_format_idc & 0xf)));

            csdData.push_back((uint8_t)(capture_time_distance));

            if (color_description_present_flag) {

                csdData.push_back(color_primaries);

media/codec2/fuzzer/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -191,6 +191,20 @@ cc_fuzz { 
    ],

}



cc_fuzz {

    name: "C2FuzzerAPVDec",

    defaults: ["C2Fuzzer-defaults"],



    cflags: [

        "-DC2COMPONENTNAME=\"c2.android.apv.decoder\"",

    ],



    static_libs: [

        "libopenapv",

        "libcodec2_soft_apvdec",

    ],

}



cc_fuzz {

    name: "C2FuzzerAacDec",

    defaults: ["C2Fuzzer-defaults-shipped"],