Merge changes from topic "gav1_to_qpr1" into qt-qpr1-dev (76df1b46) · Commits · e / os / android_frameworks_av

media/codec2/components/aom/Android.bp

+7 −1

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "libcodec2_soft_av1dec",
		name: "libcodec2_soft_av1dec_aom",
		defaults: [
		"libcodec2_soft-defaults",
		"libcodec2_soft_sanitize_all-defaults",
		],

		// coordinated with frameworks/av/media/codec2/components/gav1/Android.bp
		// so only 1 of them has the official c2.android.av1.decoder name
		cflags: [
		"-DCODECNAME=\"c2.android.av1-aom.decoder\"",
		],

		srcs: ["C2SoftAomDec.cpp"],
		static_libs: ["libaom"],

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,8 @@

		namespace android {

		constexpr char COMPONENT_NAME[] = "c2.android.av1.decoder";
		// codecname set and passed in as a compile flag from Android.bp
		constexpr char COMPONENT_NAME[] = CODECNAME;

		class C2SoftAomDec::IntfImpl : public SimpleInterface<void>::BaseParams {
		public:
		@@ -340,6 +341,7 @@ status_t C2SoftAomDec::initDecoder() {
		aom_codec_flags_t flags;
		memset(&flags, 0, sizeof(aom_codec_flags_t));

		ALOGV("Using libaom AV1 software decoder.");
		aom_codec_err_t err;
		if ((err = aom_codec_dec_init(mCodecCtx, aom_codec_av1_dx(), &cfg, 0))) {
		ALOGE("av1 decoder failed to initialize. (%d)", err);

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		cc_library_shared {
		name: "libcodec2_soft_av1dec_gav1",
		defaults: [
		"libcodec2_soft-defaults",
		"libcodec2_soft_sanitize_all-defaults",
		],

		// coordinated with frameworks/av/media/codec2/components/aom/Android.bp
		// so only 1 of them has the official c2.android.av1.decoder name
		cflags: [
		"-DCODECNAME=\"c2.android.av1.decoder\"",
		],

		srcs: ["C2SoftGav1Dec.cpp"],
		static_libs: ["libgav1"],

		include_dirs: [
		"external/libgav1/libgav1/",
		],
		}