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

Commit 829f4402 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I34b9ab63,Ic91d309e into mainline-prod 

* changes:
  C2SoftCodecTests: Add unit tests for c2 soft codecs
  C2Soft decoders: Increase max height to support portrait videos
parents 37bed4cf fc0f846b

media/codec2/components/aac/Android.bp

+2 −2
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {

    name: "libcodec2_soft_aacdec",

    defaults: [

        "libcodec2_soft-defaults",
@@ -15,7 +15,7 @@ cc_library_shared { 
    ],

}



cc_library_shared {

cc_library {

    name: "libcodec2_soft_aacenc",

    defaults: [

        "libcodec2_soft-defaults",

media/codec2/components/amr_nb_wb/Android.bp

+4 −4
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {

    name: "libcodec2_soft_amrnbdec",

    defaults: [

        "libcodec2_soft-defaults",
@@ -21,7 +21,7 @@ cc_library_shared { 
    ],

}



cc_library_shared {

cc_library {

    name: "libcodec2_soft_amrwbdec",

    defaults: [

        "libcodec2_soft-defaults",
@@ -40,7 +40,7 @@ cc_library_shared { 
    ],

}



cc_library_shared {

cc_library {

    name: "libcodec2_soft_amrnbenc",

    defaults: [

        "libcodec2_soft-defaults",
@@ -58,7 +58,7 @@ cc_library_shared { 
    ],

}



cc_library_shared {

cc_library {

    name: "libcodec2_soft_amrwbenc",

    defaults: [

        "libcodec2_soft-defaults",

media/codec2/components/aom/Android.bp

+1 −1
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {

    name: "libcodec2_soft_av1dec_aom",

    defaults: [

        "libcodec2_soft-defaults",

media/codec2/components/avc/Android.bp

+2 −2
Original line number Diff line number Diff line 
cc_library_shared {

cc_library {

    name: "libcodec2_soft_avcdec",

    defaults: [

        "libcodec2_soft-defaults",
@@ -15,7 +15,7 @@ cc_library_shared { 
    ],

}



cc_library_shared {

cc_library {

    name: "libcodec2_soft_avcenc",

    defaults: [

        "libcodec2_soft-defaults",

media/codec2/components/base/Android.bp

+2 −2
Original line number Diff line number Diff line 
// DO NOT DEPEND ON THIS DIRECTLY

// use libcodec2_soft-defaults instead

cc_library_shared {

cc_library {

    name: "libcodec2_soft_common",

    defaults: ["libcodec2-impl-defaults"],

    vendor_available: true,
@@ -96,7 +96,7 @@ cc_defaults { 
}



// TEMP: used by cheets2 project - remove when no longer used

cc_library_shared {

cc_library {

    name: "libcodec2_simple_component",

    vendor_available: true,