Merge "Codec2: remove unneeded const from query/commit methods" (3e720a6d) · Commits · e / os / android_frameworks_av

media/libstagefright/codec2/SimpleC2Interface.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@
		namespace android {

		c2_status_t SimpleC2Interface::query_vb(
		const std::vector<C2Param* const> &stackParams,
		const std::vector<C2Param*> &stackParams,
		const std::vector<C2Param::Index> &heapParamIndices,
		c2_blocking_t mayBlock,
		std::vector<std::unique_ptr<C2Param>>* const heapParams) const {

media/libstagefright/codec2/include/C2Component.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ public:
		* (this error code is only allowed for interfaces connected to components)
		*/
		virtual c2_status_t query_vb(
		const std::vector<C2Param* const> &stackParams,
		const std::vector<C2Param*> &stackParams,
		const std::vector<C2Param::Index> &heapParamIndices,
		c2_blocking_t mayBlock,
		std::vector<std::unique_ptr<C2Param>>* const heapParams) const = 0;
		@@ -211,7 +211,7 @@ public:
		* (this error code is only allowed for interfaces connected to components)
		*/
		virtual c2_status_t config_vb(
		const std::vector<C2Param* const> &params,
		const std::vector<C2Param*> &params,
		c2_blocking_t mayBlock,
		std::vector<std::unique_ptr<C2SettingResult>>* const failures) = 0;

		@@ -850,7 +850,7 @@ public:
		* (unexpected)
		*/
		virtual c2_status_t query_sm(
		const std::vector<C2Param* const> &stackParams,
		const std::vector<C2Param*> &stackParams,
		const std::vector<C2Param::Index> &heapParamIndices,
		std::vector<std::unique_ptr<C2Param>>* const heapParams) const = 0;

		@@ -889,7 +889,7 @@ public:
		* (unexpected)
		*/
		virtual c2_status_t config_sm(
		const std::vector<C2Param* const> &params,
		const std::vector<C2Param*> &params,
		std::vector<std::unique_ptr<C2SettingResult>>* const failures) = 0;

		// REFLECTION MECHANISM (USED FOR EXTENSION)

media/libstagefright/codec2/include/SimpleC2Interface.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,12 +59,12 @@ public:
		inline C2String getName() const override { return mName; }
		inline c2_node_id_t getId() const override { return mId; }
		c2_status_t query_vb(
		const std::vector<C2Param* const> &stackParams,
		const std::vector<C2Param*> &stackParams,
		const std::vector<C2Param::Index> &heapParamIndices,
		c2_blocking_t mayBlock,
		std::vector<std::unique_ptr<C2Param>>* const heapParams) const override;
		inline c2_status_t config_vb(
		const std::vector<C2Param* const> &,
		const std::vector<C2Param*> &,
		c2_blocking_t,
		std::vector<std::unique_ptr<C2SettingResult>>* const) override {
		return C2_OMITTED;

media/libstagefright/codec2/tests/C2ComponentInterface_test.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ private:
		template <typename T> void queryUnsupportedParam();

		// Execute an interface's config_vb(). \|T\| is a single parameter type, not std::vector.
		// config() creates std::vector<C2Param *const> {p} and passes it to config_vb().
		// config() creates std::vector<C2Param *> {p} and passes it to config_vb().
		template <typename T>
		c2_status_t
		config(T *const p,
		@@ -195,7 +195,7 @@ template <> std::unique_ptr<C2PortMimeConfig::input> makeParam() {
		} while (false)

		template <typename T> c2_status_t C2CompIntfTest::queryOnStack(T *const p) {
		std::vector<C2Param *const> stackParams{p};
		std::vector<C2Param*> stackParams{p};
		return mIntf->query_vb(stackParams, {}, C2_DONT_BLOCK, nullptr);
		}

		@@ -260,7 +260,7 @@ template <typename T> void C2CompIntfTest::queryUnsupportedParam() {
		template <typename T>
		c2_status_t C2CompIntfTest::config(
		T const p, std::vector<std::unique_ptr<C2SettingResult>> const failures) {
		std::vector<C2Param *const> params{p};
		std::vector<C2Param*> params{p};
		return mIntf->config_vb(params, C2_DONT_BLOCK, failures);
		}

		@@ -276,7 +276,7 @@ template <typename T>
		void C2CompIntfTest::configReadOnlyParam(const T &newParam) {
		std::unique_ptr<T> p = makeParamFrom(newParam);

		std::vector<C2Param *const> params{p.get()};
		std::vector<C2Param*> params{p.get()};
		std::vector<std::unique_ptr<C2SettingResult>> failures;

		// config_vb should be failed because a parameter is read-only.
		@@ -289,7 +289,7 @@ template <typename T>
		void C2CompIntfTest::configWritableParamValidValue(const T &newParam, c2_status_t *configResult) {
		std::unique_ptr<T> p = makeParamFrom(newParam);

		std::vector<C2Param *const> params{p.get()};
		std::vector<C2Param*> params{p.get()};
		std::vector<std::unique_ptr<C2SettingResult>> failures;
		// In most cases, config_vb return C2_OK and the parameter's value should be changed
		// to \|newParam\|, which is confirmed in a caller of configWritableParamValueValue().
		@@ -312,7 +312,7 @@ template <typename T>
		void C2CompIntfTest::configWritableParamInvalidValue(const T &newParam) {
		std::unique_ptr<T> p = makeParamFrom(newParam);

		std::vector<C2Param *const> params{p.get()};
		std::vector<C2Param*> params{p.get()};
		std::vector<std::unique_ptr<C2SettingResult>> failures;
		// Although a parameter is writable, config_vb should be failed,
		// because a new value is invalid.

media/libstagefright/codec2/tests/C2Param_test.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -2450,7 +2450,7 @@ public:
		}

		virtual c2_status_t config_vb(
		const std::vector<C2Param* const> &params,
		const std::vector<C2Param*> &params,
		c2_blocking_t mayBlock,
		std::vector<std::unique_ptr<C2SettingResult>>* const failures) override {
		(void)params;
		@@ -2465,7 +2465,7 @@ public:
		}

		virtual c2_status_t query_vb(
		const std::vector<C2Param* const> &stackParams,
		const std::vector<C2Param*> &stackParams,
		const std::vector<C2Param::Index> &heapParamIndices,
		c2_blocking_t mayBlock,
		std::vector<std::unique_ptr<C2Param>>* const heapParams) const override {