diff --git a/interface/inner_api/meta/meta.h b/interface/inner_api/meta/meta.h index cffd85abf92d9be52c0f787c507de7567096b8a0..45e8594c4b3a7296258e03f8eb16596c560f8cc3 100644 --- a/interface/inner_api/meta/meta.h +++ b/interface/inner_api/meta/meta.h @@ -195,7 +195,6 @@ public: tagCharSeq == Tag::AV_PLAYER_IS_DRM_PROTECTED or tagCharSeq == Tag::AV_PLAYER_DOWNLOAD_TIME_OUT or tagCharSeq == Tag::VIDEO_ENCODER_PER_FRAME_DISCARD or - tagCharSeq == Tag::VIDEO_ENCODER_ENABLE_QP_MAP or tagCharSeq == Tag::VIDEO_ENCODER_ENABLE_WATERMARK, bool, AnyValueType::BOOL); DEFINE_INSERT_GET_FUNC(tagCharSeq == Tag::VIDEO_BUFFER_CAN_DROP, bool, AnyValueType::BOOL); DEFINE_INSERT_GET_FUNC(tagCharSeq == Tag::AUDIO_RENDER_SET_FLAG, bool, AnyValueType::BOOL); @@ -432,8 +431,6 @@ public: tagCharSeq == Tag::VIDEO_DECODER_OUTPUT_COLOR_SPACE, int32_t, AnyValueType::INT32_T); DEFINE_INSERT_GET_FUNC( tagCharSeq == Tag::VIDEO_DECODER_OUTPUT_ENABLE_VRR, int32_t, AnyValueType::INT32_T); - DEFINE_INSERT_GET_FUNC( - tagCharSeq == Tag::VIDEO_ENCODER_PER_FRAME_QP_MAP, std::vector, AnyValueType::VECTOR_UINT8); Meta &operator=(const Meta &other) { diff --git a/interface/inner_api/meta/meta_key.h b/interface/inner_api/meta/meta_key.h index 52800af579f92588659da25e515b9d876cecae54..0258e0b79e72e45433ade3b51ccf6f10ab3f36b3 100644 --- a/interface/inner_api/meta/meta_key.h +++ b/interface/inner_api/meta/meta_key.h @@ -345,13 +345,6 @@ public: "video_decoder_desired_present_timestamp"; ///< int64_t, key for describing the desired present timestamp of ///< video decoder frame set by the caller. This is an optional key ///< that applies only to video decoder surface mode. - static constexpr const char VIDEO_ENCODER_ENABLE_QP_MAP[] = - "video_encoder_enable_qp_map"; ///< bool, key for enable config frame qp map, - ///< true is enabled, false otherwise. The default value is false. - ///< This is an optional key that applies only to video encoder. It - ///< is used in configure. - static constexpr const char VIDEO_ENCODER_PER_FRAME_QP_MAP[] = - "video_encoder_frame_block_qp"; ///< vector, Key for video encoder frame qp map. /* -------------------- video specific tag -------------------- */ static constexpr const char VIDEO_H264_PROFILE[] = "video.h264.profile"; ///< @see VideoH264Profile diff --git a/src/meta/meta.cpp b/src/meta/meta.cpp index 5e5d05b9bb3bce33f3dc645e7beb9229d68a9fc2..1fef2682660de51fe61eeae151215ff9911b067c 100644 --- a/src/meta/meta.cpp +++ b/src/meta/meta.cpp @@ -150,8 +150,7 @@ static std::vector g_metadataBoolVector = { Tag::AV_PLAYER_DOWNLOAD_TIME_OUT, Tag::VIDEO_ENCODER_PER_FRAME_DISCARD, Tag::VIDEO_ENCODER_ENABLE_WATERMARK, - Tag::VIDEO_ENCODER_ENABLE_PARAMS_FEEDBACK, - Tag::VIDEO_ENCODER_ENABLE_QP_MAP, + Tag::VIDEO_ENCODER_ENABLE_PARAMS_FEEDBACK }; bool SetMetaData(Meta& meta, const TagType& tag, int32_t value) @@ -353,7 +352,6 @@ static std::map g_metadataDefaultValueMap = { {Tag::VIDEO_ENCODER_FRAME_QP, defaultInt32}, {Tag::VIDEO_ENCODER_QP_AVERAGE, defaultInt32}, {Tag::VIDEO_ENCODER_FRAME_TEMPORAL_ID, defaultInt32}, - {Tag::VIDEO_ENCODER_PER_FRAME_QP_MAP, defaultVectorUInt8}, {Tag::AV_PLAYER_ERR_CODE, defaultInt32}, {Tag::AV_PLAYER_PLAY_DURATION, defaultInt32}, {Tag::AV_PLAYER_SOURCE_TYPE, defaultInt32}, @@ -480,7 +478,6 @@ static std::map g_metadataDefaultValueMap = { {Tag::AV_PLAYER_DOWNLOAD_TIME_OUT, defaultBool}, {Tag::VIDEO_ENCODER_PER_FRAME_DISCARD, defaultBool}, {Tag::VIDEO_ENCODER_ENABLE_WATERMARK, defaultBool}, - {Tag::VIDEO_ENCODER_ENABLE_QP_MAP, defaultBool}, // Int64 {Tag::MEDIA_FILE_SIZE, defaultUInt64}, {Tag::MEDIA_POSITION, defaultUInt64}, diff --git a/tests/unittest/meta/meta_func_unit_test.cpp b/tests/unittest/meta/meta_func_unit_test.cpp index 8e011593548c0c1d27b0a954f7b9278af6f2a839..b48a6a34fb753d135e98d3b7918a473b6296f1f0 100644 --- a/tests/unittest/meta/meta_func_unit_test.cpp +++ b/tests/unittest/meta/meta_func_unit_test.cpp @@ -512,9 +512,7 @@ map testBoolData = { {Tag::AUDIO_RENDER_SET_FLAG, true}, {Tag::VIDEO_BUFFER_CAN_DROP, true}, {Tag::VIDEO_ENCODER_PER_FRAME_DISCARD, true}, - {Tag::VIDEO_ENCODER_ENABLE_WATERMARK, true}, - {Tag::VIDEO_ENCODER_ENABLE_QP_MAP, true}, -}; + {Tag::VIDEO_ENCODER_ENABLE_WATERMARK, true}}; /** @@ -744,7 +742,6 @@ map> testVetcorInt8Data = { {Tag::AUDIO_VORBIS_IDENTIFICATION_HEADER, vectorUint8MediaCover}, {Tag::AUDIO_VORBIS_SETUP_HEADER, vectorUint8MediaCover}, {Tag::AUDIO_VIVID_METADATA, vectorUint8MediaCover}, - {Tag::VIDEO_ENCODER_PER_FRAME_QP_MAP, vectorUint8MediaCover}, }; /**