From 4a32aa0d89d17d58e7934034fb7397086c1b9481 Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Wed, 11 Nov 2020 13:20:22 +0900 Subject: [PATCH] apply 'MM_VIDEO_CODEC_AV1' enum for AV1 codec Change-Id: I0f896299ff8f9e4179cb6ff0a9dcea837dbab61b --- formats/ffmpeg/mm_file_format_ffmpeg.c | 5 +++-- packaging/libmm-fileinfo.spec | 2 +- tests/mm_file_test.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/formats/ffmpeg/mm_file_format_ffmpeg.c b/formats/ffmpeg/mm_file_format_ffmpeg.c index 61d6d3d..4ac1d14 100644 --- a/formats/ffmpeg/mm_file_format_ffmpeg.c +++ b/formats/ffmpeg/mm_file_format_ffmpeg.c @@ -70,7 +70,6 @@ static int __convert_vidio_codec_type(int AVVideoCodecID) case AV_CODEC_ID_MSMPEG4V1: case AV_CODEC_ID_MSMPEG4V2: case AV_CODEC_ID_MSMPEG4V3: - case AV_CODEC_ID_AV1: return MM_VIDEO_CODEC_MPEG4; case AV_CODEC_ID_WMV1: case AV_CODEC_ID_WMV2: @@ -103,11 +102,13 @@ static int __convert_vidio_codec_type(int AVVideoCodecID) case AV_CODEC_ID_RV30: /* RealVideo 3 */ case AV_CODEC_ID_RV40: /* RealVideo 4 */ return MM_VIDEO_CODEC_REAL; + case AV_CODEC_ID_AV1: /* AOMedia Video 1 */ + return MM_VIDEO_CODEC_AV1; #ifdef __MMFILE_LIBAV_VERSION__ case AV_CODEC_ID_HEVC: return MM_VIDEO_CODEC_MPEG4; #endif -#ifdef USE_PRODUCT_FEATURE +#ifdef USE_CODEC_VPX case AV_CODEC_ID_VP8: return MM_VIDEO_CODEC_VP8; case AV_CODEC_ID_VP9: diff --git a/packaging/libmm-fileinfo.spec b/packaging/libmm-fileinfo.spec index d32f69e..9e51793 100644 --- a/packaging/libmm-fileinfo.spec +++ b/packaging/libmm-fileinfo.spec @@ -1,6 +1,6 @@ Name: libmm-fileinfo Summary: Media Fileinfo -Version: 0.6.94 +Version: 0.6.95 Release: 1 Group: System/Libraries License: Apache-2.0 diff --git a/tests/mm_file_test.c b/tests/mm_file_test.c index 5113a87..2db4567 100755 --- 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" /* 26~28 */ + "Indeo", "Theora", "Flv", "AV1", /* 26~29 */ #ifdef USE_CODEC_VPX - ,"VP8", "VP9" /*29~30*/ + "VP8", "VP9" /*30~31*/ #endif }; -- 2.7.4