Skip to content

Commit 825de1a

Browse files
committed
update master patch. add amr for lite
1 parent bcd2b9c commit 825de1a

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

config-gpl-lite.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ USER_OPT="--enable-small \
1111
--enable-libfreetype \
1212
$USER_OPT
1313
"
14-
DEC_OPT_MOBILE="--enable-decoder=*sub*,movtext,*web*,aac*,ac3*,eac3*,alac*,ape,apv,ass,av1*,ccaption,cfhd,cook,dca,dnxhd,exr,truehd,*yuv*,flv,flac,gif,h26[3-4]*,hevc*,hap,mp[1-3]*,prores*,*[mj]peg*,mlp,mpl2,mss*,nellymoser,opus,pcm*,qtrle,*png*,tiff,rawvideo,sami,srt,ssa,v210*,vc1*,vorbis,vp[6-9]*,wm*,wrapped_avframe"
15-
DEMUX_OPT_MOBILE="--enable-demuxer=*sub*,sup,*ac3,*ac,*avs*,*[mj]peg*,*vc*,*web*,au,ape,ass,av[1i],concat,dhav,dnxhd,dts*,*dash*,*flv,gif,hls,h264,kux,matroska,mov,mp3,mxf,obu,ogg,pcm*,rawvideo,rt*p,spdif,srt,v210*,wav,*pipe,image2"
14+
DEC_OPT_MOBILE="--enable-decoder=*sub*,movtext,*web*,aac*,ac3*,eac3*,alac*,amr*,ape,apv,ass,av1*,ccaption,cfhd,cook,dca,dnxhd,exr,truehd,*yuv*,flv,flac,gif,h26[3-4]*,hevc*,hap,mp[1-3]*,prores*,*[mj]peg*,mlp,mpl2,mss*,nellymoser,opus,pcm*,qtrle,*png*,tiff,rawvideo,sami,srt,ssa,v210*,vc1*,vorbis,vp[6-9]*,wm*,wrapped_avframe"
15+
DEMUX_OPT_MOBILE="--enable-demuxer=*sub*,sup,*ac3,*ac,*avs*,*[mj]peg*,*vc*,*web*,au,amr*,ape,ass,av[1i],concat,dhav,dnxhd,dts*,*dash*,*flv,gif,hls,h264,kux,matroska,mov,mp3,mxf,obu,ogg,pcm*,rawvideo,rt*p,spdif,srt,v210*,wav,*pipe,image2"
1616
ENC_OPT_MOBILE="--enable-encoder=libx26*,aac,cfhd,dnxhd,exr,ff*,flv,*yuv*,gif,h26[3-4]*,av1*,hevc*,mjpeg*,*png,opus,pcm*,prores*,rawvideo,spdif,speedhq,tiff,vp[8-9]*,wrapped_avframe"
1717
MUX_OPT_MOBILE="--enable-muxer=mjpeg,dnxhd,fifo,flv,gif,hls,h264,hevc,image2,mov,mp4,mpegts,matroska,null,og*,pcm*,rawvideo,rt*,spdif,*pipe,*segment,webm,wav"
1818
PROT_OPT_MOBILE="--enable-protocol=cache,concat*,crypto*,data,fd,*file,ftp,h*,i*,pipe,rt*,s*,t*,u*"

config-lite.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ USER_OPT="--enable-small \
88
--disable-protocols \
99
$USER_OPT
1010
"
11-
DEC_OPT_MOBILE="--enable-decoder=*sub*,movtext,*web*,aac*,ac3*,eac3*,alac*,ape,apv,ass,av1*,ccaption,cfhd,cook,dca,dnxhd,exr,truehd,*yuv*,flv,flac,gif,h26[3-4]*,hevc*,hap,mp[1-3]*,prores*,*[mj]peg*,mlp,mpl2,mss*,nellymoser,opus,pcm*,qtrle,*png*,tiff,rawvideo,rv[1-4]*,sami,srt,ssa,v210*,vc1*,vorbis,vp[6-9]*,wm*,wrapped_avframe"
12-
DEMUX_OPT_MOBILE="--enable-demuxer=*sub*,sup,*ac3,*ac,*avs*,*[mj]peg*,*vc*,*web*,au,ape,ass,av[1i],concat,dhav,dnxhd,dts*,*dash*,*flv,gif,hls,h264,kux,matroska,mov,mp3,mxf,obu,ogg,pcm*,rawvideo,rt*p,spdif,srt,v210*,wav,*pipe,image2"
11+
DEC_OPT_MOBILE="--enable-decoder=*sub*,movtext,*web*,aac*,ac3*,eac3*,alac*,amr*,ape,apv,ass,av1*,ccaption,cfhd,cook,dca,dnxhd,exr,truehd,*yuv*,flv,flac,gif,h26[3-4]*,hevc*,hap,mp[1-3]*,prores*,*[mj]peg*,mlp,mpl2,mss*,nellymoser,opus,pcm*,qtrle,*png*,tiff,rawvideo,rv[1-4]*,sami,srt,ssa,v210*,vc1*,vorbis,vp[6-9]*,wm*,wrapped_avframe"
12+
DEMUX_OPT_MOBILE="--enable-demuxer=*sub*,sup,*ac3,*ac,*avs*,*[mj]peg*,*vc*,*web*,au,amr*,ape,ass,av[1i],concat,dhav,dnxhd,dts*,*dash*,*flv,gif,hls,h264,kux,matroska,mov,mp3,mxf,obu,ogg,pcm*,rawvideo,rt*p,spdif,srt,v210*,wav,*pipe,image2"
1313
ENC_OPT_MOBILE="--enable-encoder=*_at,aac,gif,h26[3-4]*,av1*,hevc*,mjpeg*,*png,opus,pcm*,prores*,rawvideo,spdif,speedhq,*png,vp[8-9]*,wrapped_avframe"
1414
MUX_OPT_MOBILE="--enable-muxer=mjpeg,fifo,flv,gif,hls,h264,hevc,image2,mov,mp4,mpegts,matroska,null,pcm*,rawvideo,rt*,spdif,*pipe,*segment,webm,wav"
1515
PROT_OPT_MOBILE="--enable-protocol=cache,concat*,crypto*,data,fd,*file,ftp,h*,i*,pipe,rt*,s*,t*,u*"

patches/master/0022-add-h264-max-bit-depth-to-disable-rarely-used-depths.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 41c96bb329cb928c6acafbac90be7577ebef47b8 Mon Sep 17 00:00:00 2001
1+
From fe7a2c3fa301d066cacec6b639cfd3e713ec52c5 Mon Sep 17 00:00:00 2001
22
From: wang-bin <wbsecg1@gmail.com>
33
Date: Fri, 1 Jul 2022 16:03:06 +0800
44
Subject: [PATCH 22/34] add h264-max-bit-depth to disable rarely used depths
@@ -255,7 +255,7 @@ index 5de0d6f846..e551866139 100644
255255
av_assert0(bit_depth<=8);
256256
H264_PRED(8)
257257
diff --git a/libavcodec/h264qpel.c b/libavcodec/h264qpel.c
258-
index c64d35b73d..d9546bc64d 100644
258+
index cf49c35f33..073bf32bcb 100644
259259
--- a/libavcodec/h264qpel.c
260260
+++ b/libavcodec/h264qpel.c
261261
@@ -28,23 +28,32 @@
@@ -291,28 +291,28 @@ index c64d35b73d..d9546bc64d 100644
291291

292292

293293
av_cold void ff_h264qpel_init(H264QpelContext *c, int bit_depth)
294-
@@ -82,18 +91,26 @@ av_cold void ff_h264qpel_init(H264QpelContext *c, int bit_depth)
294+
@@ -88,18 +97,26 @@ av_cold void ff_h264qpel_init(H264QpelContext *c, int bit_depth)
295295
default:
296-
SET_QPEL(8);
296+
SET_QPEL(dspfunc2, 8);
297297
break;
298298
+#if H264_MAX_BIT_DEPTH >= 9
299299
case 9:
300-
SET_QPEL(9);
300+
SET_QPEL(dspfunc2, 9);
301301
break;
302302
+#endif
303303
+#if H264_MAX_BIT_DEPTH >= 10
304304
case 10:
305-
SET_QPEL(10);
305+
SET_QPEL(dspfunc2, 10);
306306
break;
307307
+#endif
308308
+#if H264_MAX_BIT_DEPTH >= 12
309309
case 12:
310-
SET_QPEL(12);
310+
SET_QPEL(dspfunc2, 12);
311311
break;
312312
+#endif
313313
+#if H264_MAX_BIT_DEPTH >= 14
314314
case 14:
315-
SET_QPEL(14);
315+
SET_QPEL(dspfunc2, 14);
316316
break;
317317
+#endif
318318
}
@@ -357,7 +357,7 @@ index 6eb52746ad..5a94edbfc9 100644
357357
+#endif /* H264_MAX_BIT_DEPTH > 8 */
358358
}
359359
diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c
360-
index f617078d15..0c102d4dc1 100644
360+
index d853219fb1..807b304de2 100644
361361
--- a/libavcodec/x86/h264dsp_init.c
362362
+++ b/libavcodec/x86/h264dsp_init.c
363363
@@ -268,6 +268,7 @@ av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,

0 commit comments

Comments
 (0)