Modify wrong video codec for HEVC codec(MPEG4 -> H265)

Change-Id: Id86ba22eecc6b0a3620fe5aed57f3cbbafb34896

diff --git a/formats/ffmpeg/mm_file_format_ffmpeg.c b/formats/ffmpeg/mm_file_format_ffmpeg.c
index a6f7165c17cfc08f541de3d77899e50d80f2f4dd..0e01c7ceea6e806c798de1c242b66305799f5b16 100644 (file)
--- a/formats/ffmpeg/mm_file_format_ffmpeg.c
+++ b/formats/ffmpeg/mm_file_format_ffmpeg.c
@@ -109,7 +109,7 @@ static int __convert_vidio_codec_type(int AVVideoCodecID)
        case AV_CODEC_ID_AV1:   /* AOMedia Video 1 */
                return MM_VIDEO_CODEC_AV1;
        case AV_CODEC_ID_HEVC:
-               return MM_VIDEO_CODEC_MPEG4;
+               return MM_VIDEO_CODEC_H265;
 #ifdef USE_CODEC_VPX
        case AV_CODEC_ID_VP8:
                return MM_VIDEO_CODEC_VP8;

diff --git a/packaging/libmm-fileinfo.spec b/packaging/libmm-fileinfo.spec
index 79dbee8800c06ed63fb2daa0b8b2ad6dd20198fc..90cda4367f364c06cf9f6bc43cc9548c67782994 100644 (file)
--- a/packaging/libmm-fileinfo.spec
+++ b/packaging/libmm-fileinfo.spec
@@ -1,6 +1,6 @@
 Name:      libmm-fileinfo
 Summary:    Media Fileinfo
-Version:    1.1.3
+Version:    1.1.4
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/tests/mm_file_test.c b/tests/mm_file_test.c
index f5bef447f9421d6214bb4554245ecb0413957c68..58ecdf1a9192b983e871a0b838f16c81f21d60f8 100755 (executable)
--- a/tests/mm_file_test.c
+++ b/tests/mm_file_test.c
@@ -168,9 +168,9 @@ const char *VideoCodecTypeString[] = {
        "H263v2", "H263v3", "Motion JPEG", "MPEG2", "MPEG4 part-2 Simple profile",      /* 11~15 */
        "MPEG4 part-2 Advanced Simple profile", "MPEG4 part-2 Main profile", "MPEG4 part-2 Core profile", "MPEG4 part-2 Adv Coding Eff profile", "MPEG4 part-2 Adv RealTime Simple profile",    /* 16~20 */
        "MPEG4 part-10 (h.264)", "Real", "VC-1", "AVS", "Cinepak",      /* 21~25 */
-       "Indeo", "Theora", "Flv", "AV1", /* 26~29 */
+       "Indeo", "Theora", "Flv", "AV1", "H265", /* 26~30 */
 #ifdef USE_CODEC_VPX
-       "VP8", "VP9"    /*30~31*/
+       "VP8", "VP9"    /*31~32*/
 #endif
 };