From 4068ce6ed8ed86dfe1ed777de963c7640374b406 Mon Sep 17 00:00:00 2001 From: zcqwrqwfzasfd Date: Thu, 24 Mar 2022 07:52:12 +0000 Subject: [PATCH] enable opus dec/enc Signed-off-by: zcqwrqwfzasfd --- BUILD.gn | 5 ++++- libavcodec/opusenc.c | 2 +- ohos_config.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index a291cdcb66..6d05c9e269 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1,4 +1,4 @@ -# FFmpeg build +# FFmpeg build import("//build/ohos.gni") @@ -125,6 +125,9 @@ config("ffmpeg_config") { "-DCONFIG_OGG_MUXER", "-DCONFIG_OGV_MUXER", "-DCONFIG_OPUS_MUXER", + "-DCONFIG_OPUS_DECODER", + "-DCONFIG_OPUS_ENCODER", + "-DCONFIG_OPUS_PARSER", "-DCONFIG_PIPE_PROTOCOL", "-DCONFIG_PSP_MUXER", "-DCONFIG_RAWVIDEO_MUXER", diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c index 953749af3a..624245c32e 100644 --- a/libavcodec/opusenc.c +++ b/libavcodec/opusenc.c @@ -730,7 +730,7 @@ AVCodec ff_opus_encoder = { .encode2 = opus_encode_frame, .close = opus_encode_end, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, - .capabilities = AV_CODEC_CAP_EXPERIMENTAL | AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY, + .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY, .supported_samplerates = (const int []){ 48000, 0 }, .channel_layouts = (const uint64_t []){ AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, 0 }, diff --git a/ohos_config.sh b/ohos_config.sh index d30a4ea355..654d89199a 100755 --- a/ohos_config.sh +++ b/ohos_config.sh @@ -61,7 +61,7 @@ FF_CONFIG_OPTIONS=" --enable-muxer=ac3,rtsp,matroska,matroska_audio,mjpeg,mlp,mmf,mov,mp2,mp4,mpeg1system,mpeg1vcd,mpeg1video,mpeg2dvd,mpeg2svcd,mpeg2video,mpeg2vob,oga,ogg,ogv,opus,psp,rawvideo,sbc,segment,stream_segment,singlejpeg,spx,swf,tg2,tgp,truehd,vc1,w64,wav,webm,webm_dash_manifest,webm_chunk --enable-demuxer=ac3,eac3,adf,sdf,img2,rtpdec,img,rtp,amrnb,amrwb,aptx,aptx_hd,vcl,au,bintext,bit,codec2,codec2raw,data,g726,g726le,idf,image2,image2pipe,mlp,mmf,truehd,v210,v210x,vobsub,w64,xbin,vc1 --enable-decoder=rtpdec,rtp,g726_16_dynamic,g726_24_dynamic,g726_32_dynamic,g726_40_dynamic,g7261e_16_dynamic,g7261e_24_dynamic,g726le_32_dynamic,g726le_40_dynamic,amv,asv1,asv2,aura,avrp,ayuv,cyuv,eightsvx_exp,eightsvx_fib,ffvhuff,hymt,iff_ilbm,mszh,mvc1,mvc2,pam,pbm,pgm,pgmyuv,ppm,r10k,r210,theora,thp,v408,vc1image,vp4,vp7,wmv3,wmv3image,aptx,aptx_hd,eac3,gsm_ms,iac,imc,mlp,sonic,truehd,wmav1,wmav2,pcm_f16le,pcm_f24le,pcm_s8,pcm_s8_planar,pcm_24be,pcm_s24daud,pcm_s24be,pcm_s24le,pcm_s24le_planar,pcm_s32be,pcm_s32le,pcm_s32le_planar,pcm_s64be,pcm_s64le,pcm_u8,pcm_u16be,pcm_u16le,pcm_u24be,pcm_u24le,pcm_u32be,pcm_u32le,pcm_vidc,ssa,ass,pjs,srt,stl,subrip,subviewer1,text,vplayer,bintext,xbin,idf,vp5,vp6,dirac,diracdsp - --enable-encoder=asv1,asv2,avrp,ayuv,ffvhuff,mjpeg,mpeg4,pbm,pgm,pgmyuv,ppm,r10k,r210,v408,aptx,aptx_hd,mlp,sonic,sonic_ls,truehd,wmav1,wmav2,pcm_alaw,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,pcm_mulaw,s8,s8_planar,pcm_s16be,pcm_s16be_planar,pcm_s24be,pcm_s24daud,pcm_s24le,pcm_s24le_planar,pcm_s32be,pcm_s32le,pcm_s32le_planar,adpcm_g726le,dvvideo,dvaudio,h263 + --enable-encoder=asv1,asv2,avrp,ayuv,ffvhuff,mjpeg,mpeg4,opus,pbm,pgm,pgmyuv,ppm,r10k,r210,v408,aptx,aptx_hd,mlp,sonic,sonic_ls,truehd,wmav1,wmav2,pcm_alaw,pcm_f32be,pcm_f32le,pcm_f64be,pcm_f64le,pcm_mulaw,s8,s8_planar,pcm_s16be,pcm_s16be_planar,pcm_s24be,pcm_s24daud,pcm_s24le,pcm_s24le_planar,pcm_s32be,pcm_s32le,pcm_s32le_planar,adpcm_g726le,dvvideo,dvaudio,h263 --enable-parser=rv30,rv40 " -- Gitee