From 1b6bef824259c78ffa0706c3ed164c7e720c57a7 Mon Sep 17 00:00:00 2001 From: peng Date: Sun, 7 Apr 2024 14:38:53 +0800 Subject: [PATCH 1/2] add amr muxer Signed-off-by: peng --- interface/inner_api/meta/media_types.h | 3 ++- interface/inner_api/meta/mime_type.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/inner_api/meta/media_types.h b/interface/inner_api/meta/media_types.h index 43fd84e3..85f401e6 100644 --- a/interface/inner_api/meta/media_types.h +++ b/interface/inner_api/meta/media_types.h @@ -71,6 +71,7 @@ enum class OutputFormat : uint32_t { DEFAULT = 0, MPEG_4 = 2, M4A = 6, + AMR = 8, }; struct Location { @@ -297,4 +298,4 @@ typedef struct _MetaDrmInfo MetaDrmInfo; } // namespace Plugins } // namespace Media } // namespace OHOS -#endif // MEDIA_FOUNDATION_MEDIA_TYPES_H \ No newline at end of file +#endif // MEDIA_FOUNDATION_MEDIA_TYPES_H diff --git a/interface/inner_api/meta/mime_type.h b/interface/inner_api/meta/mime_type.h index ca9bb81c..0118397c 100644 --- a/interface/inner_api/meta/mime_type.h +++ b/interface/inner_api/meta/mime_type.h @@ -49,8 +49,9 @@ public: static constexpr const char MEDIA_MP4[] = "media/mp4"; static constexpr const char MEDIA_M4A[] = "media/m4a"; + static constexpr const char MEDIA_M4A[] = "media/amr"; }; } // namespace Plugins } // namespace Media } // namespace OHOS -#endif // MEDIA_FOUNDATION_MIME_TYPE_H \ No newline at end of file +#endif // MEDIA_FOUNDATION_MIME_TYPE_H -- Gitee From df33a65b11d54145089c7b001337db4e819d503b Mon Sep 17 00:00:00 2001 From: peng Date: Sun, 7 Apr 2024 15:22:12 +0800 Subject: [PATCH 2/2] add amr Signed-off-by: peng --- interface/inner_api/meta/mime_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/inner_api/meta/mime_type.h b/interface/inner_api/meta/mime_type.h index 0118397c..7930934d 100644 --- a/interface/inner_api/meta/mime_type.h +++ b/interface/inner_api/meta/mime_type.h @@ -49,7 +49,7 @@ public: static constexpr const char MEDIA_MP4[] = "media/mp4"; static constexpr const char MEDIA_M4A[] = "media/m4a"; - static constexpr const char MEDIA_M4A[] = "media/amr"; + static constexpr const char MEDIA_AMR[] = "media/amr"; }; } // namespace Plugins } // namespace Media -- Gitee