feat(codec): support vp8 vp9 opus

alibaba · Feb 12, 2020 · 70041a1 · 70041a1
1 parent 6180d52
commit 70041a1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/external/player_ffmpeg_config.sh b/external/player_ffmpeg_config.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ffmpeg_config_add_decoders aac aac_latm h264 hevc mpeg4 mp3 mp3adu mp3float mp3on4float mp3adufloat mp3on4 pcm_s16le ac3_at
+ffmpeg_config_add_decoders aac aac_latm h264 hevc mpeg4 mp3 mp3adu mp3float mp3on4float mp3adufloat mp3on4 pcm_s16le ac3_at vp8 vp9 opus
 ffmpeg_config_add_demuxers flv aac live_flv webvtt mov mp3 mpegts matroska h264
 ffmpeg_config_add_muxers mp4 adts mpegts
 ffmpeg_config_add_parsers aac h264 hevc aac_latm ac3

diff --git a/framework/utils/AFMediaType.h b/framework/utils/AFMediaType.h
@@ -40,33 +40,35 @@ enum AFCodecID {
 //    AF_CODEC_ID_SVQ3,
 //    AF_CODEC_ID_MPEG1VIDEO,
 //    AF_CODEC_ID_VP6,
-//    AF_CODEC_ID_VP8,
+    AF_CODEC_ID_VP8,
+    AF_CODEC_ID_VP9,
 //    AF_CODEC_ID_MJPEG,
 //    AF_CODEC_ID_H263,
-            AF_CODEC_ID_HEVC,
+    AF_CODEC_ID_HEVC,
     AF_CODEC_ID_AV1,
 
     AF_CODEC_ID_AAC,
     AF_CODEC_ID_AC3,
 //    AF_CODEC_ID_EAC3,
 //    AF_CODEC_ID_DTS,
 //    AF_CODEC_ID_DTSE,
-            AF_CODEC_ID_MP3,
+    AF_CODEC_ID_MP3,
 //    AF_CODEC_ID_APE,
 //    AF_CODEC_ID_COOK,
 //    AF_CODEC_ID_SIPR,
 //    AF_CODEC_ID_QDM2,
-            AF_CODEC_ID_MP2,
+    AF_CODEC_ID_MP2,
     AF_CODEC_ID_MP1,
+    AF_CODEC_ID_OPUS,
 //    AF_CODEC_ID_AMR_NB,
 //    AF_CODEC_ID_WMAV2,
 //    AF_CODEC_ID_WMAPRO,
-            AF_CODEC_ID_PCM_S16LE,
+    AF_CODEC_ID_PCM_S16LE,
     AF_CODEC_ID_PCM_S16BE,
 //    AF_CODEC_ID_PCM_BLURAY,
 //    AF_CODEC_ID_ADPCM,
 //    AF_CODEC_ID_PCM_S24LE,
-            AF_CODEC_ID_PCM_U8,
+    AF_CODEC_ID_PCM_U8,
 //    AF_CODEC_ID_PCM_MULAW,
 //    AF_CODEC_ID_ATRAC3,
 //    AF_CODEC_ID_VORBIS,

diff --git a/framework/utils/ffmpeg_utils.c b/framework/utils/ffmpeg_utils.c
@@ -223,6 +223,9 @@ enum AFCodecID AVCodec2CicadaCodec(enum AVCodecID codec)
 //        case AV_CODEC_ID_FLAC:
 //            return AF_CODEC_ID_FLAC;
 
+        case AV_CODEC_ID_OPUS:
+            return AF_CODEC_ID_OPUS;
+
         /*Video*/
         case AV_CODEC_ID_H264:
             return AF_CODEC_ID_H264;
@@ -272,8 +275,12 @@ enum AFCodecID AVCodec2CicadaCodec(enum AVCodecID codec)
 //        case AV_CODEC_ID_VP6F:
 //            return AF_CODEC_ID_VP6;
 //
-//        case AV_CODEC_ID_VP8:
-//            return AF_CODEC_ID_VP8;
+        case AV_CODEC_ID_VP8:
+            return AF_CODEC_ID_VP8;
+
+        case AV_CODEC_ID_VP9:
+            return AF_CODEC_ID_VP9;
+
 //
 //        case AV_CODEC_ID_MJPEG:
 //            return AF_CODEC_ID_MJPEG;
@@ -326,6 +333,9 @@ static codec_pair codec_pair_table[] = {
     {AF_CODEC_ID_H264,      AV_CODEC_ID_H264},
     {AF_CODEC_ID_HEVC,      AV_CODEC_ID_HEVC},
     {AF_CODEC_ID_AV1,       AV_CODEC_ID_AV1},
+    {AF_CODEC_ID_VP8,       AV_CODEC_ID_VP8},
+    {AF_CODEC_ID_VP9,       AV_CODEC_ID_VP9},
+    {AF_CODEC_ID_OPUS,      AV_CODEC_ID_OPUS},
     {AF_CODEC_ID_MPEG4,     AV_CODEC_ID_MPEG4},
     {AF_CODEC_ID_NONE,      AV_CODEC_ID_NONE},
 };

diff --git a/platform/Apple/demo/iOS/CicadaDemo/CicadaDemo/CicadaCode/model/CicadaTool.m b/platform/Apple/demo/iOS/CicadaDemo/CicadaDemo/CicadaCode/model/CicadaTool.m
@@ -126,7 +126,7 @@ + (NSArray *)getDocumentMP4Array {
     NSFileManager *fileManager = [NSFileManager defaultManager];
     NSArray *fileList = [fileManager contentsOfDirectoryAtPath:documentPath error:nil];
     NSMutableArray *dirArray = [[NSMutableArray alloc] init];
-    NSArray *suffixArray = @[@"mp4",@"mp3",@"flv",@"mov"];
+    NSArray *suffixArray = @[@"webm", @"mp4",@"mp3",@"flv",@"mov"];
     for (NSString *file in fileList) {
         if ([suffixArray containsObject:[[file pathExtension] lowercaseString]]) {
             NSString *filePath = [NSString stringWithFormat:@"%@/%@",documentPath,file];