已合并
add tag #2724
yj创建于 28 天前
add tag #2724
已合并
共 4 个文件变更+9-3
| @@ -464,7 +464,8 @@ public: | |||
| 464 | tagCharSeq == Tag::AV_PLAYER_CONTAINER_MIME or | 464 | tagCharSeq == Tag::AV_PLAYER_CONTAINER_MIME or |
| 465 | tagCharSeq == Tag::AV_PLAYER_VIDEO_MIME or | 465 | tagCharSeq == Tag::AV_PLAYER_VIDEO_MIME or |
| 466 | tagCharSeq == Tag::AV_PLAYER_VIDEO_RESOLUTION or | 466 | tagCharSeq == Tag::AV_PLAYER_VIDEO_RESOLUTION or |
| 467 | - tagCharSeq == Tag::AV_PLAYER_AUDIO_MIME, std::string, AnyValueType::STRING); | 467 | + tagCharSeq == Tag::AV_PLAYER_AUDIO_MIME or |
| 468 | + tagCharSeq == Tag::VIDEO_SET_DMABUF_NAME_SUFFIX, std::string, AnyValueType::STRING); | ||
| 468 | DEFINE_INSERT_GET_FUNC( | 469 | DEFINE_INSERT_GET_FUNC( |
| 469 | tagCharSeq == Tag::AV_TRANSCODER_ERR_MSG or | 470 | tagCharSeq == Tag::AV_TRANSCODER_ERR_MSG or |
| 470 | tagCharSeq == Tag::AV_TRANSCODER_SRC_FORMAT or | 471 | tagCharSeq == Tag::AV_TRANSCODER_SRC_FORMAT or |
| @@ -772,4 +773,4 @@ bool IsIntEnum(const TagType& tag); | |||
| 772 | bool IsLongEnum(const TagType& tag); | 773 | bool IsLongEnum(const TagType& tag); |
| 773 | } // namespace Media | 774 | } // namespace Media |
| 774 | } // namespace OHOS | 775 | } // namespace OHOS |
| 775 | -#endif // MEDIA_FOUNDATION_META_H | 776 | +#endif // MEDIA_FOUNDATION_META_H |
| @@ -466,6 +466,9 @@ public: | |||
| 466 | ///< HEVC encoders and is only used in configure. For other | 466 | ///< HEVC encoders and is only used in configure. For other |
| 467 | ///< encoders, the key is ignored. By default, this feature | 467 | ///< encoders, the key is ignored. By default, this feature |
| 468 | ///< is disabled (0). | 468 | ///< is disabled (0). |
| 469 | + static constexpr const char VIDEO_SET_DMABUF_NAME_SUFFIX[] = | ||
| 470 | + "video_set_dmabuf_name_suffix"; ///< std::string, Key to set dma-buf name suffix for video codec. | ||
| 471 | + ///< This is an optional key that applies only to video codec configure. | ||
| 469 | /* -------------------- video specific tag -------------------- */ | 472 | /* -------------------- video specific tag -------------------- */ |
| 470 | static constexpr const char VIDEO_H264_PROFILE[] = "video.h264.profile"; ///< @see VideoH264Profile | 473 | static constexpr const char VIDEO_H264_PROFILE[] = "video.h264.profile"; ///< @see VideoH264Profile |
| 471 | static constexpr const char VIDEO_H264_LEVEL[] = "video.h264.level"; ///< h264 level | 474 | static constexpr const char VIDEO_H264_LEVEL[] = "video.h264.level"; ///< h264 level |
| @@ -524,6 +524,7 @@ static std::map<TagType, const Any &> g_metadataDefaultValueMap = { | |||
| 524 | {Tag::MEDIA_GLTF_CONTENT_TYPE, defaultString}, | 524 | {Tag::MEDIA_GLTF_CONTENT_TYPE, defaultString}, |
| 525 | {Tag::MEDIA_GLTF_CONTENT_ENCODING, defaultString}, | 525 | {Tag::MEDIA_GLTF_CONTENT_ENCODING, defaultString}, |
| 526 | {Tag::MEDIA_GLTF_ITEM_TYPE, defaultString}, | 526 | {Tag::MEDIA_GLTF_ITEM_TYPE, defaultString}, |
| 527 | + {Tag::VIDEO_SET_DMABUF_NAME_SUFFIX, defaultString}, | ||
| 527 | 528 | ||
| 528 | // Float | 529 | // Float |
| 529 | {Tag::MEDIA_LATITUDE, defaultFloat}, | 530 | {Tag::MEDIA_LATITUDE, defaultFloat}, |
| @@ -776,4 +777,4 @@ bool Meta::FromParcel(MessageParcel &parcel) | |||
| 776 | return true; | 777 | return true; |
| 777 | } | 778 | } |
| 778 | } | 779 | } |
| 779 | -} // namespace OHOS | 780 | +} // namespace OHOS |
| @@ -754,6 +754,7 @@ map<TagType, std::string> testStringData = { | |||
| 754 | {Tag::MEDIA_GLTF_CONTENT_TYPE, "String MEDIA_GLTF_CONTENT_TYPE"}, | 754 | {Tag::MEDIA_GLTF_CONTENT_TYPE, "String MEDIA_GLTF_CONTENT_TYPE"}, |
| 755 | {Tag::MEDIA_GLTF_CONTENT_ENCODING, "String MEDIA_GLTF_CONTENT_ENCODING"}, | 755 | {Tag::MEDIA_GLTF_CONTENT_ENCODING, "String MEDIA_GLTF_CONTENT_ENCODING"}, |
| 756 | {Tag::MEDIA_GLTF_ITEM_TYPE, "String MEDIA_GLTF_ITEM_TYPE"}, | 756 | {Tag::MEDIA_GLTF_ITEM_TYPE, "String MEDIA_GLTF_ITEM_TYPE"}, |
| 757 | + {Tag::VIDEO_SET_DMABUF_NAME_SUFFIX, "String VIDEO_SET_DMABUF_NAME_SUFFIX"}, | ||
| 757 | {Tag::MEDIA_AIGC, "String MEDIA_AIGC"} | 758 | {Tag::MEDIA_AIGC, "String MEDIA_AIGC"} |
| 758 | }; | 759 | }; |
| 759 | 760 | ||