History

all: fix typos found by codespell

Timo Rothenpieler committed 1 year ago

Commit 262d41c1 parent 8d439b2303 files · +482 −481Browse files

Unified · Split

303 files
  1. Changelog +1 −0
  2. INSTALL.md +1 −1
  3. compat/solaris/make_sunver.pl +1 −1
  4. configure +5 −5
  5. doc/APIchanges +2 −2
  6. doc/Doxyfile +2 −2
  7. doc/community.texi +1 −1
  8. doc/decoders.texi +5 −5
  9. doc/demuxers.texi +1 −1
  10. doc/developer.texi +3 −3
  11. doc/encoders.texi +5 −5
  12. doc/examples/mux.c +1 −1
  13. doc/examples/qsv_transcode.c +3 −3
  14. doc/ffmpeg.texi +3 −3
  15. doc/filters.texi +13 −13
  16. doc/general_contents.texi +1 −1
  17. doc/indevs.texi +1 −1
  18. doc/muxers.texi +5 −5
  19. doc/protocols.texi +2 −2
  20. doc/swscale-v2.txt +1 −1
  21. ffbuild/library.mak +1 −1
  22. fftools/ffmpeg_dec.c +1 −1
  23. fftools/ffmpeg_filter.c +2 −2
  24. fftools/ffmpeg_sched.c +1 −1
  25. fftools/ffmpeg_sched.h +2 −2
  26. fftools/ffprobe.c +1 −1
  27. libavcodec/aac/aacdec.c +3 −3
  28. libavcodec/aaccoder_twoloop.h +4 −4
  29. libavcodec/aacpsy.c +1 −1
  30. libavcodec/aacsbr_template.c +1 −1
  31. libavcodec/aarch64/me_cmp_neon.S +5 −5
  32. libavcodec/alsdec.c +2 −2
  33. libavcodec/amfdec.c +1 −1
  34. libavcodec/amfenc_av1.c +13 −13
  35. libavcodec/amfenc_h264.c +7 −7
  36. libavcodec/amfenc_hevc.c +9 −9
  37. libavcodec/aptx.h +1 −1
  38. libavcodec/arm/hevcdsp_idct_neon.S +1 −1
  39. libavcodec/arm/hevcdsp_sao_neon.S +1 −1
  40. libavcodec/ass_split.c +1 −1
  41. libavcodec/ass_split.h +1 −1
  42. libavcodec/atrac3plusdsp.c +1 −1
  43. libavcodec/atrac9dec.c +4 −4
  44. libavcodec/avcodec.h +2 −2
  45. libavcodec/bsf/h266_metadata.c +1 −1
  46. libavcodec/cavsdec.c +1 −1
  47. libavcodec/cbs.h +1 −1
  48. libavcodec/cbs_h266_syntax_template.c +1 −1
  49. libavcodec/cbs_internal.h +2 −2
  50. libavcodec/ccaption_dec.c +1 −1
  51. libavcodec/codec_par.h +1 −1
  52. libavcodec/dca_xll.c +2 −2
  53. libavcodec/dcaenc.c +1 −1
  54. libavcodec/diracdec.c +1 −1
  55. libavcodec/dovi_rpudec.c +1 −1
  56. libavcodec/dovi_rpuenc.c +1 −1
  57. libavcodec/evc.h +1 −1
  58. libavcodec/evc_parse.h +1 −1
  59. libavcodec/evc_ps.h +1 −1
  60. libavcodec/evrcdec.c +1 −1
  61. libavcodec/ffv1enc.c +1 −1
  62. libavcodec/flac_parse.h +1 −1
  63. libavcodec/g729postfilter.c +2 −2
  64. libavcodec/h264_parse.h +1 −1
  65. libavcodec/h264dec.c +1 −1
  66. libavcodec/h264dec.h +1 −1
  67. libavcodec/h274.c +2 −2
  68. libavcodec/hapenc.c +1 −1
  69. libavcodec/hevc/hevcdec.c +2 −2
  70. libavcodec/ilbcdec.c +3 −3
  71. libavcodec/j2kenc.c +1 −1
  72. libavcodec/jpeg2000dec.c +2 −2
  73. libavcodec/libaribcaption.c +1 −1
  74. libavcodec/libjxlenc.c +1 −1
  75. libavcodec/liboapvenc.c +2 −2
  76. libavcodec/loongarch/hevc_mc.S +2 −2
  77. libavcodec/loongarch/loongson_asm.S +1 −1
  78. libavcodec/loongarch/vc1dsp_loongarch.h +1 −1
  79. libavcodec/magicyuvenc.c +1 −1
  80. libavcodec/mjpegdec.c +1 −1
  81. libavcodec/mjpegenc_huffman.c +2 −2
  82. libavcodec/mlz.h +1 −1
  83. libavcodec/movtextenc.c +1 −1
  84. libavcodec/mpeg4videodec.c +1 −1
  85. libavcodec/mpegaudiodec_template.c +1 −1
  86. libavcodec/mpegvideo_enc.c +1 −1
  87. libavcodec/nellymoser.c +1 −1
  88. libavcodec/nellymoser.h +1 −1
  89. libavcodec/nellymoserdec.c +1 −1
  90. libavcodec/opus/enc.c +1 −1
  91. libavcodec/opus/tab.c +1 −1
  92. libavcodec/packet.h +1 −1
  93. libavcodec/pgssubdec.c +1 −1
  94. libavcodec/pictordec.c +1 −1
  95. libavcodec/ppc/hpeldsp_altivec.c +1 −1
  96. libavcodec/ppc/vp8dsp_altivec.c +1 −1
  97. libavcodec/psd.c +2 −2
  98. libavcodec/qsvdec.c +3 −3
  99. libavcodec/qsvenc.c +1 −1
  100. libavcodec/riscv/aacencdsp_init.c +1 −1
  101. libavcodec/riscv/aacencdsp_rvv.S +1 −1
  102. libavcodec/riscv/ac3dsp_rvv.S +1 −1
  103. libavcodec/riscv/blockdsp_init.c +1 −1
  104. libavcodec/riscv/blockdsp_rvv.S +1 −1
  105. libavcodec/riscv/h263dsp_rvv.S +1 −1
  106. libavcodec/riscv/h26x/asm.S +1 −1
  107. libavcodec/riscv/h26x/h2656_inter_rvv.S +1 −1
  108. libavcodec/riscv/h26x/h2656dsp.h +1 −1
  109. libavcodec/riscv/hevcdsp_init.c +1 −1
  110. libavcodec/riscv/me_cmp_init.c +1 −1
  111. libavcodec/riscv/me_cmp_rvv.S +1 −1
  112. libavcodec/riscv/rv34dsp_init.c +1 −1
  113. libavcodec/riscv/rv34dsp_rvv.S +1 −1
  114. libavcodec/riscv/rv40dsp_init.c +1 −1
  115. libavcodec/riscv/rv40dsp_rvv.S +1 −1
  116. libavcodec/riscv/svqenc_init.c +1 −1
  117. libavcodec/riscv/svqenc_rvv.S +1 −1
  118. libavcodec/riscv/takdsp_init.c +1 −1
  119. libavcodec/riscv/takdsp_rvv.S +1 −1
  120. libavcodec/riscv/vc1dsp_init.c +1 −1
  121. libavcodec/riscv/vc1dsp_rvi.S +1 −1
  122. libavcodec/riscv/vc1dsp_rvv.S +1 −1
  123. libavcodec/riscv/vp8dsp_init.c +1 −1
  124. libavcodec/riscv/vp8dsp_rvi.S +1 −1
  125. libavcodec/riscv/vp8dsp_rvv.S +1 −1
  126. libavcodec/riscv/vp9_intra_rvv.S +1 −1
  127. libavcodec/riscv/vp9_mc_rvi.S +1 −1
  128. libavcodec/riscv/vp9_mc_rvv.S +1 −1
  129. libavcodec/riscv/vp9dsp.h +1 −1
  130. libavcodec/riscv/vp9dsp_init.c +1 −1
  131. libavcodec/riscv/vvc/dsp_init.c +1 −1
  132. libavcodec/riscv/vvc/mc_rvv.S +1 −1
  133. libavcodec/riscv/vvc/sad_rvv.S +1 −1
  134. libavcodec/rpzaenc.c +1 −1
  135. libavcodec/snowenc.c +3 −3
  136. libavcodec/speexdec.c +1 −1
  137. libavcodec/tests/apv.c +1 −1
  138. libavcodec/tests/avpacket.c +1 −1
  139. libavcodec/tests/jpeg2000dwt.c +2 −2
  140. libavcodec/utils.c +1 −1
  141. libavcodec/v4l2_context.h +1 −1
  142. libavcodec/v4l2_m2m_dec.c +1 −1
  143. libavcodec/v4l2_m2m_enc.c +1 −1
  144. libavcodec/vaapi_encode_h265.c +1 −1
  145. libavcodec/vbndec.c +1 −1
  146. libavcodec/vc2enc.c +1 −1
  147. libavcodec/vlc.c +1 −1
  148. libavcodec/vorbisdec.c +2 −2
  149. libavcodec/vp3.c +1 −1
  150. libavcodec/vp8.c +3 −3
  151. libavcodec/vulkan/rangecoder.comp +1 −1
  152. libavcodec/vulkan_decode.c +1 −1
  153. libavcodec/vulkan_encode_h265.c +1 −1
  154. libavcodec/vvc/intra_utils.c +1 −1
  155. libavcodec/vvc/mvs.c +1 −1
  156. libavcodec/vvc_parser.c +2 −2
  157. libavcodec/x86/celt_pvq_search.asm +1 −1
  158. libavcodec/x86/dirac_dwt.asm +1 −1
  159. libavcodec/x86/hevc/idct.asm +1 −1
  160. libavcodec/x86/vp9itxfm_16bpp_avx512.asm +1 −1
  161. libavdevice/audiotoolbox.m +1 −1
  162. libavdevice/avdevice.h +1 −1
  163. libavdevice/xcbgrab.c +1 −1
  164. libavfilter/aarch64/vf_bwdif_neon.S +1 −1
  165. libavfilter/af_astats.c +2 −2
  166. libavfilter/af_atempo.c +1 −1
  167. libavfilter/af_drmeter.c +1 −1
  168. libavfilter/af_sofalizer.c +2 −2
  169. libavfilter/avf_showcqt.c +1 −1
  170. libavfilter/avfilter.h +2 −2
  171. libavfilter/dnn/dnn_backend_openvino.c +2 −2
  172. libavfilter/filters.h +1 −1
  173. libavfilter/framepool.h +5 −5
  174. libavfilter/framesync.h +3 −3
  175. libavfilter/qsvvpp.h +2 −2
  176. libavfilter/riscv/af_afir_init.c +1 −1
  177. libavfilter/riscv/af_afir_rvv.S +1 −1
  178. libavfilter/vf_amf_common.c +1 −1
  179. libavfilter/vf_bilateral_cuda.cu +2 −2
  180. libavfilter/vf_ciescope.c +1 −1
  181. libavfilter/vf_colorconstancy.c +9 −9
  182. libavfilter/vf_convolution_opencl.c +1 −1
  183. libavfilter/vf_coreimage.m +1 −1
  184. libavfilter/vf_curves.c +1 −1
  185. libavfilter/vf_dnn_detect.c +1 −1
  186. libavfilter/vf_drawbox.c +1 −1
  187. libavfilter/vf_drawtext.c +2 −2
  188. libavfilter/vf_fspp.c +1 −1
  189. libavfilter/vf_libplacebo.c +1 −1
  190. libavfilter/vf_mpdecimate.c +1 −1
  191. libavfilter/vf_overlay_qsv.c +1 −1
  192. libavfilter/vf_overlay_vaapi.c +1 −1
  193. libavfilter/vf_removelogo.c +2 −2
  194. libavfilter/vf_signalstats.c +3 −3
  195. libavfilter/vf_signature.c +1 −1
  196. libavfilter/vf_siti.c +1 −1
  197. libavfilter/vf_ssim360.c +2 −2
  198. libavfilter/vf_tonemap_opencl.c +1 −1
  199. libavfilter/vf_uspp.c +1 −1
  200. libavfilter/vf_zscale.c +1 −1
  201. libavfilter/vsrc_ddagrab.c +1 −1
  202. libavfilter/x86/vf_hqdn3d.asm +1 −1
  203. libavformat/amvenc.c +1 −1
  204. libavformat/apm.c +1 −1
  205. libavformat/av1.h +1 −1
  206. libavformat/avformat.h +4 −4
  207. libavformat/cache.c +1 −1
  208. libavformat/crypto.c +2 −2
  209. libavformat/dashdec.c +1 −1
  210. libavformat/demux.h +1 −1
  211. libavformat/flvenc.c +1 −1
  212. libavformat/ftp.c +1 −1
  213. libavformat/hevc.h +1 −1
  214. libavformat/hls.c +1 −1
  215. libavformat/http.c +1 −1
  216. libavformat/iamf_parse.c +2 −2
  217. libavformat/iamf_reader.c +1 −1
  218. libavformat/iamf_writer.c +1 −1
  219. libavformat/id3v2.c +1 −1
  220. libavformat/imfdec.c +3 −3
  221. libavformat/img2dec.c +1 −1
  222. libavformat/ipfsgateway.c +2 −2
  223. libavformat/ircamdec.c +1 −1
  224. libavformat/libssh.c +1 −1
  225. libavformat/m4vdec.c +1 −1
  226. libavformat/matroskadec.c +3 −3
  227. libavformat/mov.c +4 −4
  228. libavformat/movenc.c +3 −3
  229. libavformat/mpegts.c +2 −2
  230. libavformat/mpegts.h +2 −2
  231. libavformat/mvdec.c +1 −1
  232. libavformat/mxfdec.c +1 −1
  233. libavformat/mxfenc.c +1 −1
  234. libavformat/nsvdec.c +1 −1
  235. libavformat/oggdec.h +3 −3
  236. libavformat/scd.c +1 −1
  237. libavformat/segment.c +3 −3
  238. libavformat/srtdec.c +2 −2
  239. libavformat/tls_openssl.c +1 −1
  240. libavformat/tls_schannel.c +1 −1
  241. libavformat/ttaenc.c +1 −1
  242. libavformat/udp.c +1 −1
  243. libavformat/wavenc.c +1 −1
  244. libavformat/whip.c +1 −1
  245. libavformat/wtvenc.c +1 −1
  246. libavutil/channel_layout.h +2 −2
  247. libavutil/csp.h +1 −1
  248. libavutil/dict.h +1 −1
  249. libavutil/film_grain_params.h +1 −1
  250. libavutil/frame.h +1 −1
  251. libavutil/hdr_dynamic_vivid_metadata.h +3 −3
  252. libavutil/hwcontext.h +1 −1
  253. libavutil/hwcontext_opencl.h +1 −1
  254. libavutil/hwcontext_qsv.c +7 −7
  255. libavutil/hwcontext_vulkan.c +1 −1
  256. libavutil/hwcontext_vulkan.h +1 −1
  257. libavutil/iamf.h +2 −2
  258. libavutil/internal.h +1 −1
  259. libavutil/lfg.h +2 −2
  260. libavutil/log.h +2 −2
  261. libavutil/mathematics.h +1 −1
  262. libavutil/opt.h +4 −4
  263. libavutil/rational.h +1 −1
  264. libavutil/rc4.h +1 −1
  265. libavutil/refstruct.h +1 −1
  266. libavutil/tdrdi.h +1 −1
  267. libavutil/tests/opt.c +1 −1
  268. libavutil/tests/sha512.c +1 −1
  269. libavutil/tx.h +1 −1
  270. libavutil/tx_template.c +1 −1
  271. libavutil/version.h +2 −2
  272. libavutil/video_hint.h +1 −1
  273. libavutil/vulkan.c +1 −1
  274. libswresample/rematrix.c +2 −2
  275. libswresample/swresample.h +1 −1
  276. libswscale/aarch64/hscale.S +13 −13
  277. libswscale/arm/output.S +1 −1
  278. libswscale/arm/rgb2yuv_neon_common.S +1 −1
  279. libswscale/cms.c +1 −1
  280. libswscale/format.c +1 −1
  281. libswscale/graph.c +1 −1
  282. libswscale/ppc/yuv2rgb_altivec.c +1 −1
  283. libswscale/swscale.h +1 −1
  284. libswscale/swscale_internal.h +1 −1
  285. libswscale/x86/input.asm +1 −1
  286. tests/checkasm/aacencdsp.c +1 −1
  287. tests/checkasm/ac3dsp.c +1 −1
  288. tests/checkasm/hevc_deblock.c +1 −1
  289. tests/checkasm/opusdsp.c +1 −1
  290. tests/checkasm/rv34dsp.c +1 −1
  291. tests/checkasm/rv40dsp.c +1 −1
  292. tests/checkasm/svq1enc.c +1 −1
  293. tests/checkasm/sw_scale.c +1 −1
  294. tests/checkasm/takdsp.c +1 −1
  295. tests/checkasm/vp9dsp.c +1 −1
  296. tests/fate/h264.mak +1 −1
  297. tests/fate/lavf-audio.mak +1 −1
  298. tests/fate/spdif.mak +1 −1
  299. tools/enc_recon_frame_test.c +2 −2
  300. tools/ffeval.c +1 −1
  301. tools/merge-all-source-plugins +3 −3
  302. tools/target_dec_fate.sh +1 −1
  303. tools/zmqshell.py +1 −1
Changelog+1−0
@@ -156,6 +156,7 @@ version 6.1: · 155 unmodified lines
156 variable-fields elements within the same parent element156 variable-fields elements within the same parent element
157- ffprobe -output_format option added as an alias of -of157- ffprobe -output_format option added as an alias of -of
158 158
159# codespell:off
159 160
160version 6.0:161version 6.0:
161- Radiance HDR image support162- Radiance HDR image support
INSTALL.md+1−1
@@ -24,5 +24,5 @@ NOTICE for Package Maintainers · 23 unmodified lines
24 24
25 - It is recommended to build FFmpeg twice, first with minimal external dependencies so25 - It is recommended to build FFmpeg twice, first with minimal external dependencies so
26 that 3rd party packages, which depend on FFmpegs libavutil/libavfilter/libavcodec/libavformat26 that 3rd party packages, which depend on FFmpegs libavutil/libavfilter/libavcodec/libavformat
27 can then be built. And last build FFmpeg with full dependancies (which may in turn depend on27 can then be built. And last build FFmpeg with full dependencies (which may in turn depend on
28 some of these 3rd party packages). This avoids circular dependencies during build.28 some of these 3rd party packages). This avoids circular dependencies during build.
compat/solaris/make_sunver.pl+1−1
@@ -218,7 +218,7 @@ while (<F>) { · 217 unmodified lines
218 # Lines of the form '} SOME_VERSION_NAME_1.0;'218 # Lines of the form '} SOME_VERSION_NAME_1.0;'
219 if (/^[ \t]*\}[ \tA-Z0-9_.a-z]+;[ \t]*$/) {219 if (/^[ \t]*\}[ \tA-Z0-9_.a-z]+;[ \t]*$/) {
220 $glob = 'glob';220 $glob = 'glob';
221 # We tried to match symbols agains this version, but none matched.221 # We tried to match symbols against this version, but none matched.
222 # Emit dummy hidden symbol to avoid marking this version WEAK.222 # Emit dummy hidden symbol to avoid marking this version WEAK.
223 if ($matches_attempted && $matched_symbols == 0) {223 if ($matches_attempted && $matched_symbols == 0) {
224 print " hidden:\n";224 print " hidden:\n";
configure+5−5
@@ -823,7 +823,7 @@ is_in(){ · 822 unmodified lines
823}823}
824 824
825# The cfg loop is very hot (several thousands iterations), and in bash also825# The cfg loop is very hot (several thousands iterations), and in bash also
826# potentialy quite slow. Try to abort the iterations early, preferably without826# potentially quite slow. Try to abort the iterations early, preferably without
827# calling functions. 70%+ of the time cfg is already done or without deps.827# calling functions. 70%+ of the time cfg is already done or without deps.
828check_deps(){828check_deps(){
829 for cfg; do829 for cfg; do
@@ -929,7 +929,7 @@ reverse () { · 99 unmodified lines
929 '929 '
930}930}
931 931
932# keeps the last occurence of each non-unique item932# keeps the last occurrence of each non-unique item
933unique(){933unique(){
934 unique_out=934 unique_out=
935 eval unique_in=\$$1935 eval unique_in=\$$1
@@ -4530,7 +4530,7 @@ done · 3594 unmodified lines
4530 4530
4531if disabled autodetect; then4531if disabled autodetect; then
4532 4532
4533 # Unless iconv is explicitely disabled by the user, we still want to probe4533 # Unless iconv is explicitly disabled by the user, we still want to probe
4534 # for the iconv from the libc.4534 # for the iconv from the libc.
4535 disabled iconv || enable libc_iconv4535 disabled iconv || enable libc_iconv
4536 4536
@@ -5142,7 +5142,7 @@ probe_cc(){ · 605 unmodified lines
5142 disable stripping5142 disable stripping
5143 elif $_cc -? 2>/dev/null | grep -q 'LLVM.*Linker'; then5143 elif $_cc -? 2>/dev/null | grep -q 'LLVM.*Linker'; then
5144 # lld can emulate multiple different linkers; in ms link.exe mode,5144 # lld can emulate multiple different linkers; in ms link.exe mode,
5145 # the -? parameter gives the help output which contains an identifyable5145 # the -? parameter gives the help output which contains an identifiable
5146 # string, while it gives an error in other modes.5146 # string, while it gives an error in other modes.
5147 _type=lld-link5147 _type=lld-link
5148 # The link.exe mode doesn't have a switch for getting the version,5148 # The link.exe mode doesn't have a switch for getting the version,
@@ -7794,7 +7794,7 @@ elif enabled_any msvc icl; then · 2645 unmodified lines
7794 fi7794 fi
7795 # msvcrt10 x64 incorrectly enables log2, only msvcrt12 (MSVC 2013) onwards actually has log2.7795 # msvcrt10 x64 incorrectly enables log2, only msvcrt12 (MSVC 2013) onwards actually has log2.
7796 check_cpp_condition log2 crtversion.h "_VC_CRT_MAJOR_VERSION >= 12"7796 check_cpp_condition log2 crtversion.h "_VC_CRT_MAJOR_VERSION >= 12"
7797 # the new SSA optimzer in VS2015 U3 is mis-optimizing some parts of the code7797 # the new SSA optimizer in VS2015 U3 is mis-optimizing some parts of the code
7798 # Issue has been fixed in MSVC v19.00.24218.7798 # Issue has been fixed in MSVC v19.00.24218.
7799 test_cpp_condition windows.h "_MSC_FULL_VER >= 190024218" ||7799 test_cpp_condition windows.h "_MSC_FULL_VER >= 190024218" ||
7800 check_cflags -d2SSAOptimizer-7800 check_cflags -d2SSAOptimizer-
doc/APIchanges+2−2
@@ -613,7 +613,7 @@ API changes, most recent first: · 612 unmodified lines
613 Deprecate AVFrame.palette_has_changed without replacement.613 Deprecate AVFrame.palette_has_changed without replacement.
614 614
6152023-05-15 - 7d1d61cc5f5 - lavc 60 - avcodec.h6152023-05-15 - 7d1d61cc5f5 - lavc 60 - avcodec.h
616 Depreate AVCodecContext.ticks_per_frame in favor of616 Deprecate AVCodecContext.ticks_per_frame in favor of
617 AVCodecContext.framerate (encoding) and617 AVCodecContext.framerate (encoding) and
618 AV_CODEC_PROP_FIELDS (decoding).618 AV_CODEC_PROP_FIELDS (decoding).
619 619
@@ -621,7 +621,7 @@ API changes, most recent first: · 1 unmodified line
621 Add AV_CODEC_PROP_FIELDS.621 Add AV_CODEC_PROP_FIELDS.
622 622
6232023-05-15 - 8b20d0dcb5c - lavc 60 - codec.h6232023-05-15 - 8b20d0dcb5c - lavc 60 - codec.h
624 Depreate AV_CODEC_CAP_SUBFRAMES without replacement.624 Deprecate AV_CODEC_CAP_SUBFRAMES without replacement.
625 625
6262023-05-07 - c2ae8e30b7f - lavc 60.11.100 - codec_par.h6262023-05-07 - c2ae8e30b7f - lavc 60.11.100 - codec_par.h
627 Add AVCodecParameters.framerate.627 Add AVCodecParameters.framerate.
doc/Doxyfile+2−2
@@ -1093,7 +1093,7 @@ HTML_STYLESHEET = · 1092 unmodified lines
1093# cascading style sheets that are included after the standard style sheets1093# cascading style sheets that are included after the standard style sheets
1094# created by doxygen. Using this option one can overrule certain style aspects.1094# created by doxygen. Using this option one can overrule certain style aspects.
1095# This is preferred over using HTML_STYLESHEET since it does not replace the1095# This is preferred over using HTML_STYLESHEET since it does not replace the
1096# standard style sheet and is therefor more robust against future updates.1096# standard style sheet and is therefore more robust against future updates.
1097# Doxygen will copy the style sheet files to the output directory.1097# Doxygen will copy the style sheet files to the output directory.
1098# Note: The order of the extra stylesheet files is of importance (e.g. the last1098# Note: The order of the extra stylesheet files is of importance (e.g. the last
1099# stylesheet in the list overrules the setting of the previous ones in the1099# stylesheet in the list overrules the setting of the previous ones in the
@@ -1636,7 +1636,7 @@ EXTRA_PACKAGES = · 536 unmodified lines
1636# Note: Only use a user-defined header if you know what you are doing! The1636# Note: Only use a user-defined header if you know what you are doing! The
1637# following commands have a special meaning inside the header: $title,1637# following commands have a special meaning inside the header: $title,
1638# $datetime, $date, $doxygenversion, $projectname, $projectnumber,1638# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
1639# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,1639# $projectbrief, $projectlogo. Doxygen will replace $title with the empty string,
1640# for the replacement values of the other commands the user is referred to1640# for the replacement values of the other commands the user is referred to
1641# HTML_HEADER.1641# HTML_HEADER.
1642# This tag requires that the tag GENERATE_LATEX is set to YES.1642# This tag requires that the tag GENERATE_LATEX is set to YES.
doc/community.texi+1−1
@@ -123,7 +123,7 @@ Internally, the TC should take decisions with a majority, or using ranked-choice · 122 unmodified lines
123 123
124Each TC member must vote on such decision according to what is, in their view, best for the project.124Each TC member must vote on such decision according to what is, in their view, best for the project.
125 125
126If a TC member feels they are affected by a conflict of interest with regards to the case, they should announce it and recuse themselves from the TC126If a TC member feels they are affected by a conflict of interest with regards to the case, they should announce it and recurse themselves from the TC
127discussion and vote.127discussion and vote.
128 128
129A conflict of interest is presumed to occur when a TC member has a personal interest (e.g. financial) in a specific outcome of the case.129A conflict of interest is presumed to occur when a TC member has a personal interest (e.g. financial) in a specific outcome of the case.
doc/decoders.texi+5−5
@@ -395,7 +395,7 @@ without this library. · 394 unmodified lines
395@c man end AUDIO DECODERS395@c man end AUDIO DECODERS
396 396
397@chapter Subtitles Decoders397@chapter Subtitles Decoders
398@c man begin SUBTILES DECODERS398@c man begin SUBTITLES DECODERS
399 399
400@section libaribb24400@section libaribb24
401 401
@@ -427,7 +427,7 @@ Enabled by default. · 25 unmodified lines
427Yet another ARIB STD-B24 caption decoder using external @dfn{libaribcaption}427Yet another ARIB STD-B24 caption decoder using external @dfn{libaribcaption}
428library.428library.
429 429
430Implements profiles A and C of the Japanse ARIB STD-B24 standard,430Implements profiles A and C of the Japanese ARIB STD-B24 standard,
431Brazilian ABNT NBR 15606-1, and Philippines version of ISDB-T.431Brazilian ABNT NBR 15606-1, and Philippines version of ISDB-T.
432 432
433Requires the presence of the libaribcaption headers and library433Requires the presence of the libaribcaption headers and library
@@ -477,7 +477,7 @@ Specify comma-separated list of font family names to be used for @dfn{bitmap} · 43 unmodified lines
477or @dfn{ass} type subtitle rendering.477or @dfn{ass} type subtitle rendering.
478Only first font name is used for @dfn{ass} type subtitle.478Only first font name is used for @dfn{ass} type subtitle.
479 479
480If not specified, use internaly defined default font family.480If not specified, use internally defined default font family.
481 481
482@item -ass_single_rect @var{boolean}482@item -ass_single_rect @var{boolean}
483ARIB STD-B24 specifies that some captions may be displayed at different483ARIB STD-B24 specifies that some captions may be displayed at different
@@ -495,7 +495,7 @@ default behavior at compilation. · 11 unmodified lines
495 495
496@item -force_outline_text @var{boolean}496@item -force_outline_text @var{boolean}
497Specify whether always render outline text for all characters regardless of497Specify whether always render outline text for all characters regardless of
498the indication by charactor style.498the indication by character style.
499 499
500The default is @var{false}.500The default is @var{false}.
501 501
@@ -696,4 +696,4 @@ box and an end box, typically subtitles. Default value is 0 if · 194 unmodified lines
696 696
697@end table697@end table
698 698
699@c man end SUBTILES DECODERS699@c man end SUBTITLES DECODERS
doc/demuxers.texi+1−1
@@ -990,7 +990,7 @@ to 1 (-1 means automatic setting, 1 means enabled, 0 means · 989 unmodified lines
990disabled). Default value is -1.990disabled). Default value is -1.
991 991
992@item merge_pmt_versions992@item merge_pmt_versions
993Re-use existing streams when a PMT's version is updated and elementary993Reuse existing streams when a PMT's version is updated and elementary
994streams move to different PIDs. Default value is 0.994streams move to different PIDs. Default value is 0.
995 995
996@item max_packet_size996@item max_packet_size
doc/developer.texi+3−3
@@ -546,7 +546,7 @@ FFmpeg also has a defined scope - your new API must fit within it. · 545 unmodified lines
546 546
547@subsubheading Replacing existing APIs547@subsubheading Replacing existing APIs
548If your new API is replacing an existing one, it should be strictly superior to548If your new API is replacing an existing one, it should be strictly superior to
549it, so that the advantages of using the new API outweight the cost to the549it, so that the advantages of using the new API outweigh the cost to the
550callers of changing their code. After adding the new API you should then550callers of changing their code. After adding the new API you should then
551deprecate the old one and schedule it for removal, as described in551deprecate the old one and schedule it for removal, as described in
552@ref{Removing interfaces}.552@ref{Removing interfaces}.
@@ -596,7 +596,7 @@ change in @file{doc/APIchanges}. · 43 unmodified lines
596Backward-incompatible API or ABI changes require incrementing (bumping) the596Backward-incompatible API or ABI changes require incrementing (bumping) the
597major version number, as described in @ref{Major version bumps}. Major597major version number, as described in @ref{Major version bumps}. Major
598bumps are significant events that happen on a schedule - so if your change598bumps are significant events that happen on a schedule - so if your change
599strictly requires one you should add it under @code{#if} preprocesor guards that599strictly requires one you should add it under @code{#if} preprocessor guards that
600disable it until the next major bump happens.600disable it until the next major bump happens.
601 601
602New APIs that can be added without breaking API or ABI compatibility require602New APIs that can be added without breaking API or ABI compatibility require
@@ -917,7 +917,7 @@ improves readability. · 314 unmodified lines
917Consider adding a regression test for your code. All new modules917Consider adding a regression test for your code. All new modules
918should be covered by tests. That includes demuxers, muxers, decoders, encoders918should be covered by tests. That includes demuxers, muxers, decoders, encoders
919filters, bitstream filters, parsers. If its not possible to do that, add919filters, bitstream filters, parsers. If its not possible to do that, add
920an explanation why to your patchset, its ok to not test if theres a reason.920an explanation why to your patchset, its ok to not test if there's a reason.
921 921
922@item922@item
923If you added NASM code please check that things still work with --disable-x86asm.923If you added NASM code please check that things still work with --disable-x86asm.
doc/encoders.texi+5−5
@@ -1038,7 +1038,7 @@ forces a wideband cutoff for bitrates < 15 kbps, unless CELT-only · 1037 unmodified lines
1038Set channel mapping family to be used by the encoder. The default value of -11038Set channel mapping family to be used by the encoder. The default value of -1
1039uses mapping family 0 for mono and stereo inputs, and mapping family 11039uses mapping family 0 for mono and stereo inputs, and mapping family 1
1040otherwise. The default also disables the surround masking and LFE bandwidth1040otherwise. The default also disables the surround masking and LFE bandwidth
1041optimzations in libopus, and requires that the input contains 8 channels or1041optimizations in libopus, and requires that the input contains 8 channels or
1042fewer.1042fewer.
1043 1043
1044Other values include 0 for mono and stereo, 1 for surround sound with masking1044Other values include 0 for mono and stereo, 1 for surround sound with masking
@@ -3703,7 +3703,7 @@ For encoders set this flag to ON to reduce power consumption and GPU usage. · 2658 unmodified lines
3703@end table3703@end table
3704 3704
3705@subsection Runtime Options3705@subsection Runtime Options
3706Following options can be used durning qsv encoding.3706Following options can be used during qsv encoding.
3707 3707
3708@table @option3708@table @option
3709@item @var{global_quality}3709@item @var{global_quality}
@@ -3813,7 +3813,7 @@ improves subjective visual quality. Enabling this flag may have negative impact · 103 unmodified lines
3813on performance and objective visual quality metric.3813on performance and objective visual quality metric.
3814 3814
3815@item @var{low_delay_brc}3815@item @var{low_delay_brc}
3816Setting this flag turns on or off LowDelayBRC feautre in qsv plugin, which provides3816Setting this flag turns on or off LowDelayBRC feature in qsv plugin, which provides
3817more accurate bitrate control to minimize the variance of bitstream size frame3817more accurate bitrate control to minimize the variance of bitstream size frame
3818by frame. Value: -1-default 0-off 1-on3818by frame. Value: -1-default 0-off 1-on
3819 3819
@@ -4012,7 +4012,7 @@ improves subjective visual quality. Enabling this flag may have negative impact · 192 unmodified lines
4012on performance and objective visual quality metric.4012on performance and objective visual quality metric.
4013 4013
4014@item @var{low_delay_brc}4014@item @var{low_delay_brc}
4015Setting this flag turns on or off LowDelayBRC feautre in qsv plugin, which provides4015Setting this flag turns on or off LowDelayBRC feature in qsv plugin, which provides
4016more accurate bitrate control to minimize the variance of bitstream size frame4016more accurate bitrate control to minimize the variance of bitstream size frame
4017by frame. Value: -1-default 0-off 1-on4017by frame. Value: -1-default 0-off 1-on
4018 4018
@@ -4246,7 +4246,7 @@ Extended bitrate control. · 227 unmodified lines
4246Depth of look ahead in number frames, available when extbrc option is enabled.4246Depth of look ahead in number frames, available when extbrc option is enabled.
4247 4247
4248@item @var{low_delay_brc}4248@item @var{low_delay_brc}
4249Setting this flag turns on or off LowDelayBRC feautre in qsv plugin, which provides4249Setting this flag turns on or off LowDelayBRC feature in qsv plugin, which provides
4250more accurate bitrate control to minimize the variance of bitstream size frame4250more accurate bitrate control to minimize the variance of bitstream size frame
4251by frame. Value: -1-default 0-off 1-on4251by frame. Value: -1-default 0-off 1-on
4252 4252
doc/examples/mux.c+1−1
@@ -418,7 +418,7 @@ static void open_video(AVFormatContext *oc, const AVCodec *codec, · 417 unmodified lines
418 exit(1);418 exit(1);
419 }419 }
420 420
421 /* allocate and init a re-usable frame */421 /* allocate and init a reusable frame */
422 ost->frame = alloc_frame(c->pix_fmt, c->width, c->height);422 ost->frame = alloc_frame(c->pix_fmt, c->width, c->height);
423 if (!ost->frame) {423 if (!ost->frame) {
424 fprintf(stderr, "Could not allocate video frame\n");424 fprintf(stderr, "Could not allocate video frame\n");
doc/examples/qsv_transcode.c+3−3
@@ -101,7 +101,7 @@ static int dynamic_set_parameter(AVCodecContext *avctx) · 100 unmodified lines
101 /* Set codec specific option */101 /* Set codec specific option */
102 if ((ret = av_opt_set_dict(avctx->priv_data, &opts)) < 0)102 if ((ret = av_opt_set_dict(avctx->priv_data, &opts)) < 0)
103 goto fail;103 goto fail;
104 /* There is no "framerate" option in commom option list. Use "-r" to set104 /* There is no "framerate" option in common option list. Use "-r" to set
105 * framerate, which is compatible with ffmpeg commandline. The video is105 * framerate, which is compatible with ffmpeg commandline. The video is
106 * assumed to be average frame rate, so set time_base to 1/framerate. */106 * assumed to be average frame rate, so set time_base to 1/framerate. */
107 e = av_dict_get(opts, "r", NULL, 0);107 e = av_dict_get(opts, "r", NULL, 0);
@@ -180,7 +180,7 @@ static int open_input_file(char *filename) · 72 unmodified lines
180 decoder = avcodec_find_decoder_by_name("mjpeg_qsv");180 decoder = avcodec_find_decoder_by_name("mjpeg_qsv");
181 break;181 break;
182 default:182 default:
183 fprintf(stderr, "Codec is not supportted by qsv\n");183 fprintf(stderr, "Codec is not supported by qsv\n");
184 return AVERROR(EINVAL);184 return AVERROR(EINVAL);
185 }185 }
186 186
@@ -289,7 +289,7 @@ static int dec_enc(AVPacket *pkt, const AVCodec *enc_codec, char *optstr) · 102 unmodified lines
289 fprintf(stderr, "Failed to set encoding parameter.\n");289 fprintf(stderr, "Failed to set encoding parameter.\n");
290 goto fail;290 goto fail;
291 }291 }
292 /* There is no "framerate" option in commom option list. Use "-r" to292 /* There is no "framerate" option in common option list. Use "-r" to
293 * set framerate, which is compatible with ffmpeg commandline. The293 * set framerate, which is compatible with ffmpeg commandline. The
294 * video is assumed to be average frame rate, so set time_base to294 * video is assumed to be average frame rate, so set time_base to
295 * 1/framerate. */295 * 1/framerate. */
doc/ffmpeg.texi+3−3
@@ -376,7 +376,7 @@ which they are placed. · 375 unmodified lines
376These examples can of course be further generalized into arbitrary remappings376These examples can of course be further generalized into arbitrary remappings
377of any number of inputs into any number of outputs.377of any number of inputs into any number of outputs.
378 378
379@section Trancoding379@section Transcoding
380@emph{Transcoding} is the process of decoding a stream and then encoding it380@emph{Transcoding} is the process of decoding a stream and then encoding it
381again. Since encoding tends to be computationally expensive and in most cases381again. Since encoding tends to be computationally expensive and in most cases
382degrades the stream quality (i.e. it is @emph{lossy}), you should only transcode382degrades the stream quality (i.e. it is @emph{lossy}), you should only transcode
@@ -443,7 +443,7 @@ that simple filtergraphs are tied to their output stream, so e.g. if you have · 60 unmodified lines
443multiple audio streams, @option{-af} will create a separate filtergraph for each443multiple audio streams, @option{-af} will create a separate filtergraph for each
444one.444one.
445 445
446Taking the trancoding example from above, adding filtering (and omitting audio,446Taking the transcoding example from above, adding filtering (and omitting audio,
447for clarity) makes it look like this:447for clarity) makes it look like this:
448@verbatim448@verbatim
449┌──────────┬───────────────┐449┌──────────┬───────────────┐
@@ -1048,7 +1048,7 @@ The following flags are available: · 598 unmodified lines
1048 1048
1049@table @option1049@table @option
1050@item recon_gain1050@item recon_gain
1051Wether to signal if recon_gain is present as metadata in parameter blocks within frames1051Whether to signal if recon_gain is present as metadata in parameter blocks within frames
1052@end table1052@end table
1053 1053
1054@item output_gain1054@item output_gain
doc/filters.texi+13−13
@@ -216,7 +216,7 @@ filter input and output pads of all the filterchains are connected. · 215 unmodified lines
216 216
217Leading and trailing whitespaces (space, tabs, or line feeds) separating tokens217Leading and trailing whitespaces (space, tabs, or line feeds) separating tokens
218in the filtergraph specification are ignored. This means that the filtergraph218in the filtergraph specification are ignored. This means that the filtergraph
219can be expressed using empty lines and spaces to improve redability.219can be expressed using empty lines and spaces to improve readability.
220 220
221For example, the filtergraph:221For example, the filtergraph:
222@example222@example
@@ -3383,7 +3383,7 @@ where applicable, an overall figure is also given. · 3160 unmodified lines
3383It accepts the following option:3383It accepts the following option:
3384@table @option3384@table @option
3385@item length3385@item length
3386Short window length in seconds, used for peak and trough RMS measurement.3386Short window length in seconds, used for peak and through RMS measurement.
3387Default is @code{0.05} (50 milliseconds). Allowed range is @code{[0 - 10]}.3387Default is @code{0.05} (50 milliseconds). Allowed range is @code{[0 - 10]}.
3388 3388
3389@item metadata3389@item metadata
@@ -3544,7 +3544,7 @@ standard RMS level measured in dBFS · 154 unmodified lines
3544 3544
3545@item RMS_peak3545@item RMS_peak
3546@item RMS_trough3546@item RMS_trough
3547peak and trough values for RMS level measured over a short window,3547peak and through values for RMS level measured over a short window,
3548measured in dBFS.3548measured in dBFS.
3549 3549
3550@item Zero crossings3550@item Zero crossings
@@ -7904,7 +7904,7 @@ Gains are separated by white spaces and each gain is set in dBFS. · 4353 unmodified lines
7904Default is @code{0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0}.7904Default is @code{0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0}.
7905 7905
7906@item bands, b7906@item bands, b
7907Set the custom bands from where custon equalizer gains are set.7907Set the custom bands from where custom equalizer gains are set.
7908This must be in strictly increasing order. Only used if the preset option is set to @code{custom}.7908This must be in strictly increasing order. Only used if the preset option is set to @code{custom}.
7909Bands are separated by white spaces and each band represent frequency in Hz.7909Bands are separated by white spaces and each band represent frequency in Hz.
7910Default is @code{25 40 63 100 160 250 400 630 1000 1600 2500 4000 6300 10000 16000 24000}.7910Default is @code{25 40 63 100 160 250 400 630 1000 1600 2500 4000 6300 10000 16000 24000}.
@@ -9214,7 +9214,7 @@ The default value is @code{all}. · 1303 unmodified lines
9214 9214
9215Repack CEA-708 closed captioning side data9215Repack CEA-708 closed captioning side data
9216 9216
9217This filter fixes various issues seen with commerical encoders9217This filter fixes various issues seen with commercial encoders
9218related to upstream malformed CEA-708 payloads, specifically9218related to upstream malformed CEA-708 payloads, specifically
9219incorrect number of tuples (wrong cc_count for the target FPS),9219incorrect number of tuples (wrong cc_count for the target FPS),
9220and incorrect ordering of tuples (i.e. the CEA-608 tuples are not at9220and incorrect ordering of tuples (i.e. the CEA-608 tuples are not at
@@ -9357,19 +9357,19 @@ Mostly useful to speed-up filtering. · 136 unmodified lines
9357@item threy9357@item threy
9358Set Y threshold for averaging chrominance values.9358Set Y threshold for averaging chrominance values.
9359Set finer control for max allowed difference between Y components9359Set finer control for max allowed difference between Y components
9360of current pixel and neigbour pixels.9360of current pixel and neighbour pixels.
9361Default value is 200. Allowed range is from 1 to 200.9361Default value is 200. Allowed range is from 1 to 200.
9362 9362
9363@item threu9363@item threu
9364Set U threshold for averaging chrominance values.9364Set U threshold for averaging chrominance values.
9365Set finer control for max allowed difference between U components9365Set finer control for max allowed difference between U components
9366of current pixel and neigbour pixels.9366of current pixel and neighbour pixels.
9367Default value is 200. Allowed range is from 1 to 200.9367Default value is 200. Allowed range is from 1 to 200.
9368 9368
9369@item threv9369@item threv
9370Set V threshold for averaging chrominance values.9370Set V threshold for averaging chrominance values.
9371Set finer control for max allowed difference between V components9371Set finer control for max allowed difference between V components
9372of current pixel and neigbour pixels.9372of current pixel and neighbour pixels.
9373Default value is 200. Allowed range is from 1 to 200.9373Default value is 200. Allowed range is from 1 to 200.
9374 9374
9375@item distance9375@item distance
@@ -9768,7 +9768,7 @@ Accepts a combination of the following flags: · 392 unmodified lines
9768 9768
9769@table @samp9769@table @samp
9770@item color_range9770@item color_range
9771Detect if the source countains luma pixels outside the limited (MPEG) range,9771Detect if the source contains luma pixels outside the limited (MPEG) range,
9772which indicates that this is a full range YUV source.9772which indicates that this is a full range YUV source.
9773@item alpha_mode9773@item alpha_mode
9774Detect if the source contains color values above the alpha channel, which9774Detect if the source contains color values above the alpha channel, which
@@ -19817,7 +19817,7 @@ To enable the compilation of this filter, you need to configure FFmpeg with · 10042 unmodified lines
19817@code{--enable-libqrencode}.19817@code{--enable-libqrencode}.
19818 19818
19819The QR code is generated from the provided text or text pattern. The19819The QR code is generated from the provided text or text pattern. The
19820corresponding QR code is scaled and overlayed into the video output according to19820corresponding QR code is scaled and overlaid into the video output according to
19821the specified options.19821the specified options.
19822 19822
19823In case no text is specified, no QR code is overlaied.19823In case no text is specified, no QR code is overlaied.
@@ -23146,7 +23146,7 @@ by progressively selecting a different column from each input frame. · 3322 unmodified lines
23146 23146
23147The end result is a sort of inverted parallax, so that far away objects move23147The end result is a sort of inverted parallax, so that far away objects move
23148much faster that the ones in the front. The ideal conditions for this video23148much faster that the ones in the front. The ideal conditions for this video
23149effect are when there is either very little motion and the backgroud is static,23149effect are when there is either very little motion and the background is static,
23150or when there is a lot of motion and a very wide depth of field (e.g. wide23150or when there is a lot of motion and a very wide depth of field (e.g. wide
23151panorama, while moving on a train).23151panorama, while moving on a train).
23152 23152
@@ -23174,7 +23174,7 @@ How many columns should be inserted before end of filtering. · 21 unmodified lines
23174 23174
23175Normally the filter shifts and tilts from the very first frame, and stops when23175Normally the filter shifts and tilts from the very first frame, and stops when
23176the last one is received. However, before filtering starts, normal video may23176the last one is received. However, before filtering starts, normal video may
23177be preseved, so that the effect is slowly shifted in its place. Similarly,23177be preserved, so that the effect is slowly shifted in its place. Similarly,
23178the last video frame may be reconstructed at the end. Alternatively it is23178the last video frame may be reconstructed at the end. Alternatively it is
23179possible to just start and end with black.23179possible to just start and end with black.
23180 23180
@@ -25495,7 +25495,7 @@ pixel formats are not RGB. · 2314 unmodified lines
25495@item fitmode, fm25495@item fitmode, fm
25496Set sample aspect ratio of video output frames.25496Set sample aspect ratio of video output frames.
25497Can be used to configure waveform so it is not25497Can be used to configure waveform so it is not
25498streched too much in one of directions.25498stretched too much in one of directions.
25499 25499
25500@table @samp25500@table @samp
25501@item none25501@item none
doc/general_contents.texi+1−1
@@ -162,7 +162,7 @@ Then pass @code{--enable-libmp3lame} to configure to enable it. · 161 unmodified lines
162 162
163@section LCEVCdec163@section LCEVCdec
164 164
165FFmpeg can make use of the liblcevc_dec library for LCEVC enhacement layer165FFmpeg can make use of the liblcevc_dec library for LCEVC enhancement layer
166decoding on supported bitstreams.166decoding on supported bitstreams.
167 167
168Go to @url{https://github.com/v-novaltd/LCEVCdec} and follow the instructions168Go to @url{https://github.com/v-novaltd/LCEVCdec} and follow the instructions
doc/indevs.texi+1−1
@@ -704,7 +704,7 @@ Win32 GDI-based screen capture device. · 703 unmodified lines
704 704
705This device allows you to capture a region of the display on Windows.705This device allows you to capture a region of the display on Windows.
706 706
707Amongst options for the imput filenames are such elements as:707Amongst options for the input filenames are such elements as:
708@example708@example
709desktop709desktop
710@end example710@end example
doc/muxers.texi+5−5
@@ -319,7 +319,7 @@ This is the same as the @samp{vob} muxer with a few differences. · 318 unmodified lines
319@table @option319@table @option
320@item muxrate @var{rate}320@item muxrate @var{rate}
321Set user-defined mux rate expressed as a number of bits/s. If not321Set user-defined mux rate expressed as a number of bits/s. If not
322specied the automatically computed mux rate is employed. Default value322specified the automatically computed mux rate is employed. Default value
323is @code{0}.323is @code{0}.
324 324
325@item preload @var{delay}325@item preload @var{delay}
@@ -772,7 +772,7 @@ Force a delay expressed in seconds after the last frame of each · 446 unmodified lines
772repetition. Default value is @code{0.0}.772repetition. Default value is @code{0.0}.
773 773
774@item plays @var{repetitions}774@item plays @var{repetitions}
775specify how many times to play the content, @code{0} causes an infinte775specify how many times to play the content, @code{0} causes an infinite
776loop, with @code{1} there is no loop776loop, with @code{1} there is no loop
777@end table777@end table
778 778
@@ -1770,7 +1770,7 @@ for looping indefinitely (default). · 991 unmodified lines
1770@item final_delay @var{delay}1770@item final_delay @var{delay}
1771Force the delay (expressed in centiseconds) after the last frame. Each frame1771Force the delay (expressed in centiseconds) after the last frame. Each frame
1772ends with a delay until the next frame. The default is @code{-1}, which is a1772ends with a delay until the next frame. The default is @code{-1}, which is a
1773special value to tell the muxer to re-use the previous delay. In case of a1773special value to tell the muxer to reuse the previous delay. In case of a
1774loop, you might want to customize this value to mark a pause for instance.1774loop, you might want to customize this value to mark a pause for instance.
1775@end table1775@end table
1776 1776
@@ -1856,7 +1856,7 @@ This muxer creates an .f4m (Adobe Flash Media Manifest File) manifest, an .abst · 79 unmodified lines
1856(Adobe Bootstrap File) for each stream, and segment files in a directory1856(Adobe Bootstrap File) for each stream, and segment files in a directory
1857specified as the output.1857specified as the output.
1858 1858
1859These needs to be accessed by an HDS player throuhg HTTPS for it to be able to1859These needs to be accessed by an HDS player through HTTPS for it to be able to
1860perform playback on the generated stream.1860perform playback on the generated stream.
1861 1861
1862@subsection Options1862@subsection Options
@@ -2538,7 +2538,7 @@ these applications, audio may be played back on a wide range of devices, e.g., · 675 unmodified lines
2538headphones, mobile phones, tablets, TVs, sound bars, home theater systems, and2538headphones, mobile phones, tablets, TVs, sound bars, home theater systems, and
2539big screens.2539big screens.
2540 2540
2541This format was promoted and desgined by Alliance for Open Media.2541This format was promoted and designed by Alliance for Open Media.
2542 2542
2543For more information about this format, see @url{https://aomedia.org/iamf/}.2543For more information about this format, see @url{https://aomedia.org/iamf/}.
2544 2544
doc/protocols.texi+2−2
@@ -71,7 +71,7 @@ client may also set a user/password for authentication. The default for both · 70 unmodified lines
71fields is "guest". Name of virtual host on broker can be set with vhost. The71fields is "guest". Name of virtual host on broker can be set with vhost. The
72default value is "/".72default value is "/".
73 73
74Muliple subscribers may stream from the broker using the command:74Multiple subscribers may stream from the broker using the command:
75@example75@example
76ffplay amqp://[[user]:[password]@@]hostname[:port][/vhost]76ffplay amqp://[[user]:[password]@@]hostname[:port][/vhost]
77@end example77@end example
@@ -607,7 +607,7 @@ The resource requested by a client, when the experimental HTTP server is in use. · 529 unmodified lines
607The HTTP code returned to the client, when the experimental HTTP server is in use.607The HTTP code returned to the client, when the experimental HTTP server is in use.
608 608
609@item short_seek_size609@item short_seek_size
610Set the threshold, in bytes, for when a readahead should be prefered over a seek and610Set the threshold, in bytes, for when a readahead should be preferred over a seek and
611new HTTP request. This is useful, for example, to make sure the same connection611new HTTP request. This is useful, for example, to make sure the same connection
612is used for reading large video packets with small audio packets in between.612is used for reading large video packets with small audio packets in between.
613 613
doc/swscale-v2.txt+1−1
@@ -295,7 +295,7 @@ for improvements: · 294 unmodified lines
295 - op_scale_1110295 - op_scale_1110
296 - op_scale_1111296 - op_scale_1111
297 297
298 This reflects the four different arangements of pixel components that are298 This reflects the four different arrangements of pixel components that are
299 typically present (or absent). While best for performance, it does turn into299 typically present (or absent). While best for performance, it does turn into
300 a bit of a chore when implementing these kernels.300 a bit of a chore when implementing these kernels.
301 301
ffbuild/library.mak+1−1
@@ -26,7 +26,7 @@ ifdef CONFIG_SHARED · 25 unmodified lines
26# for purely shared builds.26# for purely shared builds.
27# Test programs are always statically linked against their library27# Test programs are always statically linked against their library
28# to be able to access their library's internals, even with shared builds.28# to be able to access their library's internals, even with shared builds.
29# Yet linking against dependend libraries still uses dynamic linking.29# Yet linking against dependent libraries still uses dynamic linking.
30# This means that we are in the scenario described above.30# This means that we are in the scenario described above.
31# In case only static libs are used, the linker will only use31# In case only static libs are used, the linker will only use
32# one of these copies; this depends on the duplicated object files32# one of these copies; this depends on the duplicated object files
fftools/ffmpeg_dec.c+1−1
@@ -1594,7 +1594,7 @@ static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts, · 1593 unmodified lines
1594 if (o->flags & DECODER_FLAG_BITEXACT)1594 if (o->flags & DECODER_FLAG_BITEXACT)
1595 dp->dec_ctx->flags |= AV_CODEC_FLAG_BITEXACT;1595 dp->dec_ctx->flags |= AV_CODEC_FLAG_BITEXACT;
1596 1596
1597 // we apply cropping outselves1597 // we apply cropping ourselves
1598 dp->apply_cropping = dp->dec_ctx->apply_cropping;1598 dp->apply_cropping = dp->dec_ctx->apply_cropping;
1599 dp->dec_ctx->apply_cropping = 0;1599 dp->dec_ctx->apply_cropping = 0;
1600 1600
fftools/ffmpeg_filter.c+2−2
@@ -2728,7 +2728,7 @@ static void sub2video_heartbeat(InputFilter *ifilter, int64_t pts, AVRational tb · 2727 unmodified lines
2728 if (pts2 >= ifp->sub2video.end_pts || ifp->sub2video.initialize)2728 if (pts2 >= ifp->sub2video.end_pts || ifp->sub2video.initialize)
2729 /* if we have hit the end of the current displayed subpicture,2729 /* if we have hit the end of the current displayed subpicture,
2730 or if we need to initialize the system, update the2730 or if we need to initialize the system, update the
2731 overlayed subpicture and its start/end times */2731 overlaid subpicture and its start/end times */
2732 sub2video_update(ifp, pts2 + 1, NULL);2732 sub2video_update(ifp, pts2 + 1, NULL);
2733 else2733 else
2734 sub2video_push_ref(ifp, pts2);2734 sub2video_push_ref(ifp, pts2);
@@ -3141,7 +3141,7 @@ static int filter_thread(void *arg) · 406 unmodified lines
3141 goto finish;3141 goto finish;
3142 3142
3143read_frames:3143read_frames:
3144 // retrieve all newly avalable frames3144 // retrieve all newly available frames
3145 ret = read_frames(fg, &fgt, fgt.frame);3145 ret = read_frames(fg, &fgt, fgt.frame);
3146 if (ret == AVERROR_EOF) {3146 if (ret == AVERROR_EOF) {
3147 av_log(fg, AV_LOG_VERBOSE, "All consumers returned EOF\n");3147 av_log(fg, AV_LOG_VERBOSE, "All consumers returned EOF\n");
fftools/ffmpeg_sched.c+1−1
@@ -1899,7 +1899,7 @@ static int send_to_mux(Scheduler *sch, SchMux *mux, unsigned stream_idx, · 1898 unmodified lines
1899 1899
1900update_schedule:1900update_schedule:
1901 // TODO: use atomics to check whether this changes trailing dts1901 // TODO: use atomics to check whether this changes trailing dts
1902 // to avoid locking unnecesarily1902 // to avoid locking unnecessarily
1903 if (dts != AV_NOPTS_VALUE || !pkt) {1903 if (dts != AV_NOPTS_VALUE || !pkt) {
1904 pthread_mutex_lock(&sch->schedule_lock);1904 pthread_mutex_lock(&sch->schedule_lock);
1905 1905
fftools/ffmpeg_sched.h+2−2
@@ -355,7 +355,7 @@ enum DemuxSendFlags { · 354 unmodified lines
355 * @retval "non-negative value" success355 * @retval "non-negative value" success
356 * @retval AVERROR_EOF all consumers for the stream are done356 * @retval AVERROR_EOF all consumers for the stream are done
357 * @retval AVERROR_EXIT all consumers are done, should terminate demuxing357 * @retval AVERROR_EXIT all consumers are done, should terminate demuxing
358 * @retval "anoter negative error code" other failure358 * @retval "another negative error code" other failure
359 */359 */
360int sch_demux_send(Scheduler *sch, unsigned demux_idx, struct AVPacket *pkt,360int sch_demux_send(Scheduler *sch, unsigned demux_idx, struct AVPacket *pkt,
361 unsigned flags);361 unsigned flags);
@@ -436,7 +436,7 @@ void sch_filter_receive_finish(Scheduler *sch, unsigned fg_idx, unsigned in_idx) · 74 unmodified lines
436 *436 *
437 * @retval "non-negative value" success437 * @retval "non-negative value" success
438 * @retval AVERROR_EOF all consumers are done438 * @retval AVERROR_EOF all consumers are done
439 * @retval "anoter negative error code" other failure439 * @retval "another negative error code" other failure
440 */440 */
441int sch_filter_send(Scheduler *sch, unsigned fg_idx, unsigned out_idx,441int sch_filter_send(Scheduler *sch, unsigned fg_idx, unsigned out_idx,
442 struct AVFrame *frame);442 struct AVFrame *frame);
fftools/ffprobe.c+1−1
@@ -2381,7 +2381,7 @@ static int open_input_file(InputFile *ifile, const char *filename, · 2380 unmodified lines
2381 exit(1);2381 exit(1);
2382 2382
2383 if (do_show_log) {2383 if (do_show_log) {
2384 // For loging it is needed to disable at least frame threads as otherwise2384 // For logging it is needed to disable at least frame threads as otherwise
2385 // the log information would need to be reordered and matches up to contexts and frames2385 // the log information would need to be reordered and matches up to contexts and frames
2386 // That is in fact possible but not trivial2386 // That is in fact possible but not trivial
2387 av_dict_set(&codec_opts, "threads", "1", 0);2387 av_dict_set(&codec_opts, "threads", "1", 0);
libavcodec/aac/aacdec.c+3−3
@@ -395,8 +395,8 @@ static uint64_t sniff_channel_order(uint8_t (*layout_map)[3], int tags) · 394 unmodified lines
395 FFSWAP(struct elem_to_channel, e2c_vec[6], e2c_vec[4]); // FLc & FRc fifth (final), SiL & SiR seventh395 FFSWAP(struct elem_to_channel, e2c_vec[6], e2c_vec[4]); // FLc & FRc fifth (final), SiL & SiR seventh
396 FFSWAP(struct elem_to_channel, e2c_vec[7], e2c_vec[6]); // LFE2 seventh (final), SiL & SiR eight (final)396 FFSWAP(struct elem_to_channel, e2c_vec[7], e2c_vec[6]); // LFE2 seventh (final), SiL & SiR eight (final)
397 FFSWAP(struct elem_to_channel, e2c_vec[9], e2c_vec[8]); // TpFL & TpFR ninth (final), TFC tenth (final)397 FFSWAP(struct elem_to_channel, e2c_vec[9], e2c_vec[8]); // TpFL & TpFR ninth (final), TFC tenth (final)
398 FFSWAP(struct elem_to_channel, e2c_vec[11], e2c_vec[10]); // TC eleventh (final), TpSiL & TpSiR twelth398 FFSWAP(struct elem_to_channel, e2c_vec[11], e2c_vec[10]); // TC eleventh (final), TpSiL & TpSiR twelfth
399 FFSWAP(struct elem_to_channel, e2c_vec[12], e2c_vec[11]); // TpBL & TpBR twelth (final), TpSiL & TpSiR thirteenth (final)399 FFSWAP(struct elem_to_channel, e2c_vec[12], e2c_vec[11]); // TpBL & TpBR twelfth (final), TpSiL & TpSiR thirteenth (final)
400 } else {400 } else {
401 // For everything else, utilize the AV channel position define as a401 // For everything else, utilize the AV channel position define as a
402 // stable sort.402 // stable sort.
@@ -1728,7 +1728,7 @@ int ff_aac_decode_ics(AACDecContext *ac, SingleChannelElement *sce, · 1325 unmodified lines
1728 }1728 }
1729 }1729 }
1730 // I see no textual basis in the spec for this occurring after SSR gain1730 // I see no textual basis in the spec for this occurring after SSR gain
1731 // control, but this is what both reference and real implmentations do1731 // control, but this is what both reference and real implementations do
1732 if (tns->present && er_syntax) {1732 if (tns->present && er_syntax) {
1733 ret = ff_aac_decode_tns(ac, tns, gb, ics);1733 ret = ff_aac_decode_tns(ac, tns, gb, ics);
1734 if (ret < 0)1734 if (ret < 0)
libavcodec/aaccoder_twoloop.h+4−4
@@ -311,14 +311,14 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, · 310 unmodified lines
311 311
312 /**312 /**
313 * Scale uplims to match rate distortion to quality313 * Scale uplims to match rate distortion to quality
314 * bu applying noisy band depriorization and tonal band priorization.314 * bu applying noisy band depriorization and tonal band prioritization.
315 * Maxval-energy ratio gives us an idea of how noisy/tonal the band is.315 * Maxval-energy ratio gives us an idea of how noisy/tonal the band is.
316 * If maxval^2 ~ energy, then that band is mostly noise, and we can relax316 * If maxval^2 ~ energy, then that band is mostly noise, and we can relax
317 * rate distortion requirements.317 * rate distortion requirements.
318 */318 */
319 memcpy(euplims, uplims, sizeof(euplims));319 memcpy(euplims, uplims, sizeof(euplims));
320 for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {320 for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {
321 /** psy already priorizes transients to some extent */321 /** psy already prioritizes transients to some extent */
322 float de_psy_factor = (sce->ics.num_windows > 1) ? 8.0f / sce->ics.group_len[w] : 1.0f;322 float de_psy_factor = (sce->ics.num_windows > 1) ? 8.0f / sce->ics.group_len[w] : 1.0f;
323 start = w*128;323 start = w*128;
324 for (g = 0; g < sce->ics.num_swb; g++) {324 for (g = 0; g < sce->ics.num_swb; g++) {
@@ -331,7 +331,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, · 6 unmodified lines
331 nzslope * cleanup_factor);331 nzslope * cleanup_factor);
332 energy2uplim *= de_psy_factor;332 energy2uplim *= de_psy_factor;
333 if (!(avctx->flags & AV_CODEC_FLAG_QSCALE)) {333 if (!(avctx->flags & AV_CODEC_FLAG_QSCALE)) {
334 /** In ABR, we need to priorize less and let rate control do its thing */334 /** In ABR, we need to prioritize less and let rate control do its thing */
335 energy2uplim = sqrtf(energy2uplim);335 energy2uplim = sqrtf(energy2uplim);
336 }336 }
337 energy2uplim = FFMAX(0.015625f, FFMIN(1.0f, energy2uplim));337 energy2uplim = FFMAX(0.015625f, FFMIN(1.0f, energy2uplim));
@@ -345,7 +345,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, · 7 unmodified lines
345 2.0f);345 2.0f);
346 energy2uplim *= de_psy_factor;346 energy2uplim *= de_psy_factor;
347 if (!(avctx->flags & AV_CODEC_FLAG_QSCALE)) {347 if (!(avctx->flags & AV_CODEC_FLAG_QSCALE)) {
348 /** In ABR, we need to priorize less and let rate control do its thing */348 /** In ABR, we need to prioritize less and let rate control do its thing */
349 energy2uplim = sqrtf(energy2uplim);349 energy2uplim = sqrtf(energy2uplim);
350 }350 }
351 energy2uplim = FFMAX(0.015625f, FFMIN(1.0f, energy2uplim));351 energy2uplim = FFMAX(0.015625f, FFMIN(1.0f, energy2uplim));
libavcodec/aacpsy.c+1−1
@@ -168,7 +168,7 @@ typedef struct AacPsyContext{ · 167 unmodified lines
168 * LAME psy model preset struct168 * LAME psy model preset struct
169 */169 */
170typedef struct PsyLamePreset {170typedef struct PsyLamePreset {
171 int quality; ///< Quality to map the rest of the vaules to.171 int quality; ///< Quality to map the rest of the values to.
172 /* This is overloaded to be both kbps per channel in ABR mode, and172 /* This is overloaded to be both kbps per channel in ABR mode, and
173 * requested quality in constant quality mode.173 * requested quality in constant quality mode.
174 */174 */
libavcodec/aacsbr_template.c+1−1
@@ -59,7 +59,7 @@ static void sbr_turnoff(SpectralBandReplication *sbr) { · 58 unmodified lines
59 sbr->start = 0;59 sbr->start = 0;
60 sbr->usac = 0;60 sbr->usac = 0;
61 sbr->ready_for_dequant = 0;61 sbr->ready_for_dequant = 0;
62 // Init defults used in pure upsampling mode62 // Init defaults used in pure upsampling mode
63 sbr->kx[1] = 32; //Typo in spec, kx' inits to 3263 sbr->kx[1] = 32; //Typo in spec, kx' inits to 32
64 sbr->m[1] = 0;64 sbr->m[1] = 0;
65 // Reset values for first SBR header65 // Reset values for first SBR header
libavcodec/aarch64/me_cmp_neon.S+5−5
@@ -534,7 +534,7 @@ function ff_pix_abs16_y2_neon, export=1 · 533 unmodified lines
534 ld1 {v2.16b}, [x2], x3 // Load pix3 for first iteration534 ld1 {v2.16b}, [x2], x3 // Load pix3 for first iteration
535 ld1 {v0.16b}, [x1], x3 // Load pix1 for first iteration535 ld1 {v0.16b}, [x1], x3 // Load pix1 for first iteration
536 urhadd v30.16b, v1.16b, v2.16b // Rounding halving add, first iteration536 urhadd v30.16b, v1.16b, v2.16b // Rounding halving add, first iteration
537 ld1 {v5.16b}, [x2], x3 // Load pix3 for second iteartion537 ld1 {v5.16b}, [x2], x3 // Load pix3 for second iteration
538 uabal v29.8h, v0.8b, v30.8b // Absolute difference of lower half, first iteration538 uabal v29.8h, v0.8b, v30.8b // Absolute difference of lower half, first iteration
539 uabal2 v28.8h, v0.16b, v30.16b // Absolute difference of upper half, first iteration539 uabal2 v28.8h, v0.16b, v30.16b // Absolute difference of upper half, first iteration
540 ld1 {v3.16b}, [x1], x3 // Load pix1 for second iteration540 ld1 {v3.16b}, [x1], x3 // Load pix1 for second iteration
@@ -606,7 +606,7 @@ function sse16_neon, export=1 · 65 unmodified lines
606 uabd v27.16b, v2.16b, v3.16b // Absolute difference, second iteration606 uabd v27.16b, v2.16b, v3.16b // Absolute difference, second iteration
607 uadalp v17.4s, v29.8h // Pairwise add, first iteration607 uadalp v17.4s, v29.8h // Pairwise add, first iteration
608 ld1 {v4.16b}, [x1], x3 // Load pix1 for third iteration608 ld1 {v4.16b}, [x1], x3 // Load pix1 for third iteration
609 umull v26.8h, v27.8b, v27.8b // Mulitply lower half, second iteration609 umull v26.8h, v27.8b, v27.8b // Multiply lower half, second iteration
610 umull2 v25.8h, v27.16b, v27.16b // Multiply upper half, second iteration610 umull2 v25.8h, v27.16b, v27.16b // Multiply upper half, second iteration
611 ld1 {v5.16b}, [x2], x3 // Load pix2 for third iteration611 ld1 {v5.16b}, [x2], x3 // Load pix2 for third iteration
612 uadalp v17.4s, v26.8h // Pairwise add and accumulate, second iteration612 uadalp v17.4s, v26.8h // Pairwise add and accumulate, second iteration
@@ -616,7 +616,7 @@ function sse16_neon, export=1 · 3 unmodified lines
616 umull v23.8h, v24.8b, v24.8b // Multiply lower half, third iteration616 umull v23.8h, v24.8b, v24.8b // Multiply lower half, third iteration
617 umull2 v22.8h, v24.16b, v24.16b // Multiply upper half, third iteration617 umull2 v22.8h, v24.16b, v24.16b // Multiply upper half, third iteration
618 uadalp v17.4s, v23.8h // Pairwise add and accumulate, third iteration618 uadalp v17.4s, v23.8h // Pairwise add and accumulate, third iteration
619 ld1 {v7.16b}, [x2], x3 // Load pix2 for fouth iteration619 ld1 {v7.16b}, [x2], x3 // Load pix2 for fourth iteration
620 uadalp v17.4s, v22.8h // Pairwise add and accumulate, third iteration620 uadalp v17.4s, v22.8h // Pairwise add and accumulate, third iteration
621 uabd v21.16b, v6.16b, v7.16b // Absolute difference, fourth iteration621 uabd v21.16b, v6.16b, v7.16b // Absolute difference, fourth iteration
622 uadalp v17.4s, v28.8h // Pairwise add and accumulate, first iteration622 uadalp v17.4s, v28.8h // Pairwise add and accumulate, first iteration
@@ -748,7 +748,7 @@ function sse4_neon, export=1 · 125 unmodified lines
748 uabdl v28.8h, v4.8b, v5.8b // Absolute difference, third iteration748 uabdl v28.8h, v4.8b, v5.8b // Absolute difference, third iteration
749 umlal v16.4s, v29.4h, v29.4h // Multiply and accumulate, second iteration749 umlal v16.4s, v29.4h, v29.4h // Multiply and accumulate, second iteration
750 sub w4, w4, #4750 sub w4, w4, #4
751 uabdl v27.8h, v6.8b, v7.8b // Absolue difference, fourth iteration751 uabdl v27.8h, v6.8b, v7.8b // Absolute difference, fourth iteration
752 umlal v16.4s, v28.4h, v28.4h // Multiply and accumulate, third iteration752 umlal v16.4s, v28.4h, v28.4h // Multiply and accumulate, third iteration
753 cmp w4, #4753 cmp w4, #4
754 umlal v16.4s, v27.4h, v27.4h // Multiply and accumulate, fourth iteration754 umlal v16.4s, v27.4h, v27.4h // Multiply and accumulate, fourth iteration
@@ -1593,7 +1593,7 @@ function sse16_neon_dotprod, export=1 · 838 unmodified lines
1593 uabd v24.16b, v4.16b, v5.16b // Absolute difference, third iteration1593 uabd v24.16b, v4.16b, v5.16b // Absolute difference, third iteration
1594 ld1 {v6.16b}, [x1], x3 // Load pix1 for fourth iteration1594 ld1 {v6.16b}, [x1], x3 // Load pix1 for fourth iteration
1595 udot v17.4s, v24.16b, v24.16b1595 udot v17.4s, v24.16b, v24.16b
1596 ld1 {v7.16b}, [x2], x3 // Load pix2 for fouth iteration1596 ld1 {v7.16b}, [x2], x3 // Load pix2 for fourth iteration
1597 uabd v21.16b, v6.16b, v7.16b // Absolute difference, fourth iteration1597 uabd v21.16b, v6.16b, v7.16b // Absolute difference, fourth iteration
1598 sub w4, w4, #4 // h -= 41598 sub w4, w4, #4 // h -= 4
1599 udot v17.4s, v21.16b, v21.16b1599 udot v17.4s, v21.16b, v21.16b
libavcodec/alsdec.c+2−2
@@ -224,7 +224,7 @@ typedef struct ALSDecContext { · 223 unmodified lines
224 int32_t *quant_cof_buffer; ///< contains all quantized parcor coefficients224 int32_t *quant_cof_buffer; ///< contains all quantized parcor coefficients
225 int32_t **lpc_cof; ///< coefficients of the direct form prediction filter for a channel225 int32_t **lpc_cof; ///< coefficients of the direct form prediction filter for a channel
226 int32_t *lpc_cof_buffer; ///< contains all coefficients of the direct form prediction filter226 int32_t *lpc_cof_buffer; ///< contains all coefficients of the direct form prediction filter
227 int32_t *lpc_cof_reversed_buffer; ///< temporary buffer to set up a reversed versio of lpc_cof_buffer227 int32_t *lpc_cof_reversed_buffer; ///< temporary buffer to set up a reversed version of lpc_cof_buffer
228 ALSChannelData **chan_data; ///< channel data for multi-channel correlation228 ALSChannelData **chan_data; ///< channel data for multi-channel correlation
229 ALSChannelData *chan_data_buffer; ///< contains channel data for all channels229 ALSChannelData *chan_data_buffer; ///< contains channel data for all channels
230 int *reverted_channels; ///< stores a flag for each reverted channel230 int *reverted_channels; ///< stores a flag for each reverted channel
@@ -1558,7 +1558,7 @@ static int read_diff_float_data(ALSDecContext *ctx, unsigned int ra_frame) { · 1327 unmodified lines
1558 if (highest_byte) {1558 if (highest_byte) {
1559 for (i = 0; i < frame_length; ++i) {1559 for (i = 0; i < frame_length; ++i) {
1560 if (ctx->raw_samples[c][i] != 0) {1560 if (ctx->raw_samples[c][i] != 0) {
1561 //The following logic is taken from Tabel 14.45 and 14.46 from the ISO spec1561 //The following logic is taken from Table 14.45 and 14.46 from the ISO spec
1562 if (av_cmp_sf_ieee754(acf[c], FLOAT_1)) {1562 if (av_cmp_sf_ieee754(acf[c], FLOAT_1)) {
1563 nbits[i] = 23 - av_log2(abs(ctx->raw_samples[c][i]));1563 nbits[i] = 23 - av_log2(abs(ctx->raw_samples[c][i]));
1564 } else {1564 } else {
libavcodec/amfdec.c+1−1
@@ -656,7 +656,7 @@ static int amf_decode_frame(AVCodecContext *avctx, struct AVFrame *frame) · 655 unmodified lines
656 }else656 }else
657 return AVERROR_EOF;657 return AVERROR_EOF;
658 } else {658 } else {
659 av_log(avctx, AV_LOG_ERROR, "Unkown result from QueryOutput %d\n", res);659 av_log(avctx, AV_LOG_ERROR, "Unknown result from QueryOutput %d\n", res);
660 }660 }
661 return got_frame ? 0 : AVERROR(EAGAIN);661 return got_frame ? 0 : AVERROR(EAGAIN);
662}662}
libavcodec/amfenc_av1.c+13−13
@@ -32,11 +32,11 @@ static const AVOption options[] = { · 31 unmodified lines
32 32
33 { "usage", "Set the encoding usage", OFFSET(usage), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY_HIGH_QUALITY, VE, .unit = "usage" },33 { "usage", "Set the encoding usage", OFFSET(usage), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY_HIGH_QUALITY, VE, .unit = "usage" },
34 { "transcoding", "Generic Transcoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_TRANSCODING }, 0, 0, VE, .unit = "usage" },34 { "transcoding", "Generic Transcoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_TRANSCODING }, 0, 0, VE, .unit = "usage" },
35 { "ultralowlatency", "ultra low latency trancoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_ULTRA_LOW_LATENCY }, 0, 0, VE, .unit = "usage" },35 { "ultralowlatency", "ultra low latency transcoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_ULTRA_LOW_LATENCY }, 0, 0, VE, .unit = "usage" },
36 { "lowlatency", "Low latency usecase", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY }, 0, 0, VE, .unit = "usage" },36 { "lowlatency", "Low latency usecase", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY }, 0, 0, VE, .unit = "usage" },
37 { "webcam", "Webcam", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_WEBCAM }, 0, 0, VE, .unit = "usage" },37 { "webcam", "Webcam", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_WEBCAM }, 0, 0, VE, .unit = "usage" },
38 { "high_quality", "high quality trancoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_HIGH_QUALITY }, 0, 0, VE, .unit = "usage" },38 { "high_quality", "high quality transcoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_HIGH_QUALITY }, 0, 0, VE, .unit = "usage" },
39 { "lowlatency_high_quality","low latency yet high quality trancoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY_HIGH_QUALITY }, 0, 0, VE, .unit = "usage" },39 { "lowlatency_high_quality","low latency yet high quality transcoding", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_USAGE_LOW_LATENCY_HIGH_QUALITY }, 0, 0, VE, .unit = "usage" },
40 40
41 { "bitdepth", "Set color bit deph", OFFSET(bit_depth), AV_OPT_TYPE_INT, {.i64 = AMF_COLOR_BIT_DEPTH_UNDEFINED }, AMF_COLOR_BIT_DEPTH_UNDEFINED, AMF_COLOR_BIT_DEPTH_10, VE, .unit = "bitdepth" },41 { "bitdepth", "Set color bit deph", OFFSET(bit_depth), AV_OPT_TYPE_INT, {.i64 = AMF_COLOR_BIT_DEPTH_UNDEFINED }, AMF_COLOR_BIT_DEPTH_UNDEFINED, AMF_COLOR_BIT_DEPTH_10, VE, .unit = "bitdepth" },
42 { "8", "8 bit", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_COLOR_BIT_DEPTH_8 }, 0, 0, VE, .unit = "bitdepth" },42 { "8", "8 bit", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_COLOR_BIT_DEPTH_8 }, 0, 0, VE, .unit = "bitdepth" },
@@ -88,7 +88,7 @@ static const AVOption options[] = { · 45 unmodified lines
88 { "rc", "Set the rate control mode", OFFSET(rate_control_mode), AV_OPT_TYPE_INT, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR, VE, .unit = "rc" },88 { "rc", "Set the rate control mode", OFFSET(rate_control_mode), AV_OPT_TYPE_INT, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR, VE, .unit = "rc" },
89 { "cqp", "Constant Quantization Parameter", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CONSTANT_QP }, 0, 0, VE, .unit = "rc" },89 { "cqp", "Constant Quantization Parameter", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CONSTANT_QP }, 0, 0, VE, .unit = "rc" },
90 { "vbr_latency", "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },90 { "vbr_latency", "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },
91 { "vbr_peak", "Peak Contrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },91 { "vbr_peak", "Peak Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },
92 { "cbr", "Constant Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CBR }, 0, 0, VE, .unit = "rc" },92 { "cbr", "Constant Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_CBR }, 0, 0, VE, .unit = "rc" },
93 { "qvbr", "Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },93 { "qvbr", "Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },
94 { "hqvbr", "High Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },94 { "hqvbr", "High Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_VIDEO_ENCODER_AV1_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },
@@ -148,16 +148,16 @@ static const AVOption options[] = { · 53 unmodified lines
148 { "pa_scene_change_detection_enable", "Enable scene change detection", OFFSET(pa_scene_change_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },148 { "pa_scene_change_detection_enable", "Enable scene change detection", OFFSET(pa_scene_change_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },
149 149
150 { "pa_scene_change_detection_sensitivity", "Set the sensitivity of scene change detection", OFFSET(pa_scene_change_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH, VE, .unit = "scene_change_sensitivity" },150 { "pa_scene_change_detection_sensitivity", "Set the sensitivity of scene change detection", OFFSET(pa_scene_change_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH, VE, .unit = "scene_change_sensitivity" },
151 { "low", "low scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "scene_change_sensitivity" },151 { "low", "low scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "scene_change_sensitivity" },
152 { "medium", "medium scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "scene_change_sensitivity" },152 { "medium", "medium scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "scene_change_sensitivity" },
153 { "high", "high scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "scene_change_sensitivity" },153 { "high", "high scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "scene_change_sensitivity" },
154 154
155 { "pa_static_scene_detection_enable", "Enable static scene detection", OFFSET(pa_static_scene_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },155 { "pa_static_scene_detection_enable", "Enable static scene detection", OFFSET(pa_static_scene_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },
156 156
157 { "pa_static_scene_detection_sensitivity", "Set the sensitivity of static scene detection", OFFSET(pa_static_scene_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH, VE , .unit = "static_scene_sensitivity" },157 { "pa_static_scene_detection_sensitivity", "Set the sensitivity of static scene detection", OFFSET(pa_static_scene_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH, VE , .unit = "static_scene_sensitivity" },
158 { "low", "low static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "static_scene_sensitivity" },158 { "low", "low static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "static_scene_sensitivity" },
159 { "medium", "medium static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "static_scene_sensitivity" },159 { "medium", "medium static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "static_scene_sensitivity" },
160 { "high", "high static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "static_scene_sensitivity" },160 { "high", "high static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "static_scene_sensitivity" },
161 161
162 { "pa_initial_qp_after_scene_change", "The QP value that is used immediately after a scene change", OFFSET(pa_initial_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },162 { "pa_initial_qp_after_scene_change", "The QP value that is used immediately after a scene change", OFFSET(pa_initial_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },
163 { "pa_max_qp_before_force_skip", "The QP threshold to allow a skip frame", OFFSET(pa_max_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },163 { "pa_max_qp_before_force_skip", "The QP threshold to allow a skip frame", OFFSET(pa_max_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },
@@ -267,7 +267,7 @@ static av_cold int amf_encode_init_av1(AVCodecContext* avctx) · 103 unmodified lines
267 // Color Transfer Characteristics (AMF matches ISO/IEC)267 // Color Transfer Characteristics (AMF matches ISO/IEC)
268 if(avctx->color_primaries != AVCOL_PRI_UNSPECIFIED && (pix_fmt == AV_PIX_FMT_NV12 || pix_fmt == AV_PIX_FMT_P010)){268 if(avctx->color_primaries != AVCOL_PRI_UNSPECIFIED && (pix_fmt == AV_PIX_FMT_NV12 || pix_fmt == AV_PIX_FMT_P010)){
269 // if input is YUV, color_primaries are for VUI only269 // if input is YUV, color_primaries are for VUI only
270 // AMF VCN color coversion supports only specifc output primaries BT2020 for 10-bit and BT709 for 8-bit270 // AMF VCN color conversion supports only specific output primaries BT2020 for 10-bit and BT709 for 8-bit
271 // vpp_amf supports more271 // vpp_amf supports more
272 AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, avctx->color_trc);272 AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_TRANSFER_CHARACTERISTIC, avctx->color_trc);
273 }273 }
@@ -275,7 +275,7 @@ static av_cold int amf_encode_init_av1(AVCodecContext* avctx) · 1 unmodified line
275 // Color Primaries (AMF matches ISO/IEC)275 // Color Primaries (AMF matches ISO/IEC)
276 if(avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || pix_fmt == AV_PIX_FMT_NV12 || pix_fmt == AV_PIX_FMT_P010 )276 if(avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || pix_fmt == AV_PIX_FMT_NV12 || pix_fmt == AV_PIX_FMT_P010 )
277 {277 {
278 // AMF VCN color coversion supports only specifc primaries BT2020 for 10-bit and BT709 for 8-bit278 // AMF VCN color conversion supports only specific primaries BT2020 for 10-bit and BT709 for 8-bit
279 // vpp_amf supports more279 // vpp_amf supports more
280 AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, avctx->color_primaries);280 AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_AV1_OUTPUT_COLOR_PRIMARIES, avctx->color_primaries);
281 }281 }
@@ -657,7 +657,7 @@ static av_cold int amf_encode_init_av1(AVCodecContext* avctx) · 375 unmodified lines
657 buffer->pVtbl->Release(buffer);657 buffer->pVtbl->Release(buffer);
658 var.pInterface->pVtbl->Release(var.pInterface);658 var.pInterface->pVtbl->Release(var.pInterface);
659 659
660 //processing crop informaiton according to alignment660 //processing crop information according to alignment
661 if (ctx->encoder->pVtbl->GetProperty(ctx->encoder, AMF_VIDEO_ENCODER_AV1_CAP_WIDTH_ALIGNMENT_FACTOR_LOCAL, &var) != AMF_OK)661 if (ctx->encoder->pVtbl->GetProperty(ctx->encoder, AMF_VIDEO_ENCODER_AV1_CAP_WIDTH_ALIGNMENT_FACTOR_LOCAL, &var) != AMF_OK)
662 // assume older driver and Navi3x662 // assume older driver and Navi3x
663 width_alignment_factor = 64;663 width_alignment_factor = 64;
libavcodec/amfenc_h264.c+7−7
@@ -82,7 +82,7 @@ static const AVOption options[] = { · 81 unmodified lines
82 { "rc", "Rate Control Method", OFFSET(rate_control_mode), AV_OPT_TYPE_INT, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR, VE, .unit = "rc" },82 { "rc", "Rate Control Method", OFFSET(rate_control_mode), AV_OPT_TYPE_INT, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR, VE, .unit = "rc" },
83 { "cqp", "Constant Quantization Parameter", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP }, 0, 0, VE, .unit = "rc" },83 { "cqp", "Constant Quantization Parameter", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CONSTANT_QP }, 0, 0, VE, .unit = "rc" },
84 { "cbr", "Constant Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR }, 0, 0, VE, .unit = "rc" },84 { "cbr", "Constant Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_CBR }, 0, 0, VE, .unit = "rc" },
85 { "vbr_peak", "Peak Contrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },85 { "vbr_peak", "Peak Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },
86 { "vbr_latency", "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },86 { "vbr_latency", "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },
87 { "qvbr", "Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },87 { "qvbr", "Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },
88 { "hqvbr", "High Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },88 { "hqvbr", "High Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },
@@ -151,16 +151,16 @@ static const AVOption options[] = { · 62 unmodified lines
151 { "pa_scene_change_detection_enable", "Enable scene change detection", OFFSET(pa_scene_change_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },151 { "pa_scene_change_detection_enable", "Enable scene change detection", OFFSET(pa_scene_change_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },
152 152
153 { "pa_scene_change_detection_sensitivity", "Set the sensitivity of scene change detection", OFFSET(pa_scene_change_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH, VE, .unit = "scene_change_sensitivity" },153 { "pa_scene_change_detection_sensitivity", "Set the sensitivity of scene change detection", OFFSET(pa_scene_change_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH, VE, .unit = "scene_change_sensitivity" },
154 { "low", "low scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "scene_change_sensitivity" },154 { "low", "low scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "scene_change_sensitivity" },
155 { "medium", "medium scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "scene_change_sensitivity" },155 { "medium", "medium scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "scene_change_sensitivity" },
156 { "high", "high scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "scene_change_sensitivity" },156 { "high", "high scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "scene_change_sensitivity" },
157 157
158 { "pa_static_scene_detection_enable", "Enable static scene detection", OFFSET(pa_static_scene_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },158 { "pa_static_scene_detection_enable", "Enable static scene detection", OFFSET(pa_static_scene_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },
159 159
160 { "pa_static_scene_detection_sensitivity", "Set the sensitivity of static scene detection", OFFSET(pa_static_scene_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH, VE , .unit = "static_scene_sensitivity" },160 { "pa_static_scene_detection_sensitivity", "Set the sensitivity of static scene detection", OFFSET(pa_static_scene_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH, VE , .unit = "static_scene_sensitivity" },
161 { "low", "low static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "static_scene_sensitivity" },161 { "low", "low static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "static_scene_sensitivity" },
162 { "medium", "medium static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "static_scene_sensitivity" },162 { "medium", "medium static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "static_scene_sensitivity" },
163 { "high", "high static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "static_scene_sensitivity" },163 { "high", "high static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "static_scene_sensitivity" },
164 164
165 { "pa_initial_qp_after_scene_change", "The QP value that is used immediately after a scene change", OFFSET(pa_initial_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },165 { "pa_initial_qp_after_scene_change", "The QP value that is used immediately after a scene change", OFFSET(pa_initial_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },
166 { "pa_max_qp_before_force_skip", "The QP threshold to allow a skip frame", OFFSET(pa_max_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },166 { "pa_max_qp_before_force_skip", "The QP threshold to allow a skip frame", OFFSET(pa_max_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },
libavcodec/amfenc_hevc.c+9−9
@@ -74,7 +74,7 @@ static const AVOption options[] = { · 73 unmodified lines
74 { "rc", "Set the rate control mode", OFFSET(rate_control_mode), AV_OPT_TYPE_INT, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR, VE, .unit = "rc" },74 { "rc", "Set the rate control mode", OFFSET(rate_control_mode), AV_OPT_TYPE_INT, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_UNKNOWN }, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_UNKNOWN, AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_HIGH_QUALITY_CBR, VE, .unit = "rc" },
75 { "cqp", "Constant Quantization Parameter", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP }, 0, 0, VE, .unit = "rc" },75 { "cqp", "Constant Quantization Parameter", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CONSTANT_QP }, 0, 0, VE, .unit = "rc" },
76 { "cbr", "Constant Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR }, 0, 0, VE, .unit = "rc" },76 { "cbr", "Constant Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_CBR }, 0, 0, VE, .unit = "rc" },
77 { "vbr_peak", "Peak Contrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },77 { "vbr_peak", "Peak Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_PEAK_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },
78 { "vbr_latency", "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },78 { "vbr_latency", "Latency Constrained Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_LATENCY_CONSTRAINED_VBR }, 0, 0, VE, .unit = "rc" },
79 { "qvbr", "Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },79 { "qvbr", "Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },
80 { "hqvbr", "High Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },80 { "hqvbr", "High Quality Variable Bitrate", 0, AV_OPT_TYPE_CONST, { .i64 = AMF_VIDEO_ENCODER_HEVC_RATE_CONTROL_METHOD_HIGH_QUALITY_VBR }, 0, 0, VE, .unit = "rc" },
@@ -121,16 +121,16 @@ static const AVOption options[] = { · 40 unmodified lines
121 { "pa_scene_change_detection_enable", "Enable scene change detection", OFFSET(pa_scene_change_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },121 { "pa_scene_change_detection_enable", "Enable scene change detection", OFFSET(pa_scene_change_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },
122 122
123 { "pa_scene_change_detection_sensitivity", "Set the sensitivity of scene change detection", OFFSET(pa_scene_change_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH, VE, .unit = "scene_change_sensitivity" },123 { "pa_scene_change_detection_sensitivity", "Set the sensitivity of scene change detection", OFFSET(pa_scene_change_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH, VE, .unit = "scene_change_sensitivity" },
124 { "low", "low scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "scene_change_sensitivity" },124 { "low", "low scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "scene_change_sensitivity" },
125 { "medium", "medium scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "scene_change_sensitivity" },125 { "medium", "medium scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "scene_change_sensitivity" },
126 { "high", "high scene change dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "scene_change_sensitivity" },126 { "high", "high scene change detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_SCENE_CHANGE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "scene_change_sensitivity" },
127 127
128 { "pa_static_scene_detection_enable", "Enable static scene detection", OFFSET(pa_static_scene_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },128 { "pa_static_scene_detection_enable", "Enable static scene detection", OFFSET(pa_static_scene_detection), AV_OPT_TYPE_BOOL, {.i64 = -1 }, -1, 1, VE },
129 129
130 { "pa_static_scene_detection_sensitivity", "Set the sensitivity of static scene detection", OFFSET(pa_static_scene_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH, VE , .unit = "static_scene_sensitivity" },130 { "pa_static_scene_detection_sensitivity", "Set the sensitivity of static scene detection", OFFSET(pa_static_scene_detection_sensitivity), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH, VE , .unit = "static_scene_sensitivity" },
131 { "low", "low static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "static_scene_sensitivity" },131 { "low", "low static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_LOW }, 0, 0, VE, .unit = "static_scene_sensitivity" },
132 { "medium", "medium static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "static_scene_sensitivity" },132 { "medium", "medium static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_MEDIUM }, 0, 0, VE, .unit = "static_scene_sensitivity" },
133 { "high", "high static scene dectection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "static_scene_sensitivity" },133 { "high", "high static scene detection sensitivity", 0, AV_OPT_TYPE_CONST, {.i64 = AMF_PA_STATIC_SCENE_DETECTION_SENSITIVITY_HIGH }, 0, 0, VE, .unit = "static_scene_sensitivity" },
134 134
135 { "pa_initial_qp_after_scene_change", "The QP value that is used immediately after a scene change", OFFSET(pa_initial_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },135 { "pa_initial_qp_after_scene_change", "The QP value that is used immediately after a scene change", OFFSET(pa_initial_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },
136 { "pa_max_qp_before_force_skip", "The QP threshold to allow a skip frame", OFFSET(pa_max_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },136 { "pa_max_qp_before_force_skip", "The QP threshold to allow a skip frame", OFFSET(pa_max_qp), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 51, VE },
@@ -261,7 +261,7 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) · 124 unmodified lines
261 // Color Transfer Characteristics (AMF matches ISO/IEC)261 // Color Transfer Characteristics (AMF matches ISO/IEC)
262 if(avctx->color_trc != AVCOL_TRC_UNSPECIFIED && (pix_fmt == AV_PIX_FMT_NV12 || pix_fmt == AV_PIX_FMT_P010)){262 if(avctx->color_trc != AVCOL_TRC_UNSPECIFIED && (pix_fmt == AV_PIX_FMT_NV12 || pix_fmt == AV_PIX_FMT_P010)){
263 // if input is YUV, color_trc is for VUI only - any value263 // if input is YUV, color_trc is for VUI only - any value
264 // AMF VCN color coversion supports only specifc output transfer characterstic SMPTE2084 for 10-bit and BT709 for 8-bit264 // AMF VCN color conversion supports only specific output transfer characteristic SMPTE2084 for 10-bit and BT709 for 8-bit
265 // vpp_amf supports more265 // vpp_amf supports more
266 AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, avctx->color_trc);266 AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_TRANSFER_CHARACTERISTIC, avctx->color_trc);
267 }267 }
@@ -269,7 +269,7 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) · 1 unmodified line
269 // Color Primaries (AMF matches ISO/IEC)269 // Color Primaries (AMF matches ISO/IEC)
270 if(avctx->color_primaries != AVCOL_PRI_UNSPECIFIED && (pix_fmt == AV_PIX_FMT_NV12 || pix_fmt == AV_PIX_FMT_P010)){270 if(avctx->color_primaries != AVCOL_PRI_UNSPECIFIED && (pix_fmt == AV_PIX_FMT_NV12 || pix_fmt == AV_PIX_FMT_P010)){
271 // if input is YUV, color_primaries are for VUI only271 // if input is YUV, color_primaries are for VUI only
272 // AMF VCN color coversion supports only specifc output primaries BT2020 for 10-bit and BT709 for 8-bit272 // AMF VCN color conversion supports only specific output primaries BT2020 for 10-bit and BT709 for 8-bit
273 // vpp_amf supports more273 // vpp_amf supports more
274 AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, avctx->color_primaries);274 AMF_ASSIGN_PROPERTY_INT64(res, ctx->encoder, AMF_VIDEO_ENCODER_HEVC_OUTPUT_COLOR_PRIMARIES, avctx->color_primaries);
275 }275 }
libavcodec/aptx.h+1−1
@@ -108,7 +108,7 @@ typedef const struct { · 107 unmodified lines
108 108
109extern ConstTables ff_aptx_quant_tables[2][NB_SUBBANDS];109extern ConstTables ff_aptx_quant_tables[2][NB_SUBBANDS];
110 110
111/* Rounded right shift with optionnal clipping */111/* Rounded right shift with optional clipping */
112#define RSHIFT_SIZE(size) \112#define RSHIFT_SIZE(size) \
113av_always_inline \113av_always_inline \
114static int##size##_t rshift##size(int##size##_t value, int shift) \114static int##size##_t rshift##size(int##size##_t value, int shift) \
libavcodec/arm/hevcdsp_idct_neon.S+1−1
@@ -783,7 +783,7 @@ endfunc · 782 unmodified lines
783 transpose8_4x4 d29, d3, d21, d23783 transpose8_4x4 d29, d3, d21, d23
784 store16 d22, d23, d20, d21, d2, d3, d28, d29, r8784 store16 d22, d23, d20, d21, d2, d3, d28, d29, r8
785 785
786 @ reload multiplication coefficiens to q1786 @ reload multiplication coefficients to q1
787 vld1.s16 {q1}, [r9, :128]787 vld1.s16 {q1}, [r9, :128]
788.endm788.endm
789 789
libavcodec/arm/hevcdsp_sao_neon.S+1−1
@@ -100,7 +100,7 @@ function ff_hevc_sao_edge_filter_neon_8, export=1 · 99 unmodified lines
100 mov r12, r4 // r12 = height100 mov r12, r4 // r12 = height
101 mov r6, r0 // r6 = r0 = dst101 mov r6, r0 // r6 = r0 = dst
102 mov r7, r1 // r7 = r1 = src102 mov r7, r1 // r7 = r1 = src
103 vld1.8 {d0}, [r11] // edge_idx tabel load in d0 5x8bit103 vld1.8 {d0}, [r11] // edge_idx table load in d0 5x8bit
104 vld1.16 {q1}, [r10] // sao_offset_val table load in q1, 5x16bit104 vld1.16 {q1}, [r10] // sao_offset_val table load in q1, 5x16bit
105 vmov.u8 d1, #2105 vmov.u8 d1, #2
106 vmov.u16 q2, #1106 vmov.u16 q2, #1
libavcodec/ass_split.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * SSA/ASS spliting functions2 * SSA/ASS splitting functions
3 * Copyright (c) 2010 Aurelien Jacobs <aurel@gnuage.org>3 * Copyright (c) 2010 Aurelien Jacobs <aurel@gnuage.org>
4 *4 *
5 * This file is part of FFmpeg.5 * This file is part of FFmpeg.
libavcodec/ass_split.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * SSA/ASS spliting functions2 * SSA/ASS splitting functions
3 * Copyright (c) 2010 Aurelien Jacobs <aurel@gnuage.org>3 * Copyright (c) 2010 Aurelien Jacobs <aurel@gnuage.org>
4 *4 *
5 * This file is part of FFmpeg.5 * This file is part of FFmpeg.
libavcodec/atrac3plusdsp.c+1−1
@@ -114,7 +114,7 @@ av_cold void ff_atrac3p_init_dsp_static(void) · 113 unmodified lines
114 * @param[in] fdsp ptr to floating-point DSP context114 * @param[in] fdsp ptr to floating-point DSP context
115 * @param[in] invert_phase flag indicating 180° phase shift115 * @param[in] invert_phase flag indicating 180° phase shift
116 * @param[in] reg_offset region offset for trimming envelope data116 * @param[in] reg_offset region offset for trimming envelope data
117 * @param[out] out receives sythesized data117 * @param[out] out receives synthesized data
118 */118 */
119static void waves_synth(Atrac3pWaveSynthParams *synth_param,119static void waves_synth(Atrac3pWaveSynthParams *synth_param,
120 Atrac3pWavesData *waves_info,120 Atrac3pWavesData *waves_info,
libavcodec/atrac9dec.c+4−4
@@ -80,7 +80,7 @@ typedef struct ATRAC9BlockData { · 79 unmodified lines
80 int cpe_base_channel;80 int cpe_base_channel;
81 int is_signs[30];81 int is_signs[30];
82 82
83 int reuseable;83 int reusable;
84 84
85} ATRAC9BlockData;85} ATRAC9BlockData;
86 86
@@ -689,7 +689,7 @@ static int atrac9_decode_block(ATRAC9Context *s, GetBitContext *gb, · 602 unmodified lines
689 if (!reuse_params) {689 if (!reuse_params) {
690 int stereo_band, ext_band;690 int stereo_band, ext_band;
691 const int min_band_count = s->samplerate_idx > 7 ? 1 : 3;691 const int min_band_count = s->samplerate_idx > 7 ? 1 : 3;
692 b->reuseable = 0;692 b->reusable = 0;
693 b->band_count = get_bits(gb, 4) + min_band_count;693 b->band_count = get_bits(gb, 4) + min_band_count;
694 b->q_unit_cnt = at9_tab_band_q_unit_map[b->band_count];694 b->q_unit_cnt = at9_tab_band_q_unit_map[b->band_count];
695 695
@@ -721,9 +721,9 @@ static int atrac9_decode_block(ATRAC9Context *s, GetBitContext *gb, · 25 unmodified lines
721 }721 }
722 b->band_ext_q_unit = at9_tab_band_q_unit_map[ext_band];722 b->band_ext_q_unit = at9_tab_band_q_unit_map[ext_band];
723 }723 }
724 b->reuseable = 1;724 b->reusable = 1;
725 }725 }
726 if (!b->reuseable) {726 if (!b->reusable) {
727 av_log(s->avctx, AV_LOG_ERROR, "invalid block reused!\n");727 av_log(s->avctx, AV_LOG_ERROR, "invalid block reused!\n");
728 return AVERROR_INVALIDDATA;728 return AVERROR_INVALIDDATA;
729 }729 }
libavcodec/avcodec.h+2−2
@@ -225,7 +225,7 @@ typedef struct RcOverride{ · 224 unmodified lines
225#define AV_CODEC_FLAG_QPEL (1 << 4)225#define AV_CODEC_FLAG_QPEL (1 << 4)
226/**226/**
227 * Request the encoder to output reconstructed frames, i.e.\ frames that would227 * Request the encoder to output reconstructed frames, i.e.\ frames that would
228 * be produced by decoding the encoded bistream. These frames may be retrieved228 * be produced by decoding the encoded bitstream. These frames may be retrieved
229 * by calling avcodec_receive_frame() immediately after a successful call to229 * by calling avcodec_receive_frame() immediately after a successful call to
230 * avcodec_receive_packet().230 * avcodec_receive_packet().
231 *231 *
@@ -2900,7 +2900,7 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, · 2668 unmodified lines
2900 *2900 *
2901 * @note for encoders, this function will only do something if the encoder2901 * @note for encoders, this function will only do something if the encoder
2902 * declares support for AV_CODEC_CAP_ENCODER_FLUSH. When called, the encoder2902 * declares support for AV_CODEC_CAP_ENCODER_FLUSH. When called, the encoder
2903 * will drain any remaining packets, and can then be re-used for a different2903 * will drain any remaining packets, and can then be reused for a different
2904 * stream (as opposed to sending a null frame which will leave the encoder2904 * stream (as opposed to sending a null frame which will leave the encoder
2905 * in a permanent EOF state after draining). This can be desirable if the2905 * in a permanent EOF state after draining). This can be desirable if the
2906 * cost of tearing down and replacing the encoder instance is high.2906 * cost of tearing down and replacing the encoder instance is high.
libavcodec/bsf/h266_metadata.c+1−1
@@ -80,7 +80,7 @@ static int h266_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, · 79 unmodified lines
80 }80 }
81 }81 }
82 if (!ph) {82 if (!ph) {
83 av_log(bsf, AV_LOG_ERROR, "no avaliable picture header");83 av_log(bsf, AV_LOG_ERROR, "no available picture header");
84 return AVERROR_INVALIDDATA;84 return AVERROR_INVALIDDATA;
85 }85 }
86 86
libavcodec/cavsdec.c+1−1
@@ -1184,7 +1184,7 @@ static int decode_seq_header(AVSContext *h) · 1183 unmodified lines
1184 h->profile = get_bits(&h->gb, 8);1184 h->profile = get_bits(&h->gb, 8);
1185 if (h->profile != 0x20) {1185 if (h->profile != 0x20) {
1186 avpriv_report_missing_feature(h->avctx,1186 avpriv_report_missing_feature(h->avctx,
1187 "only supprt JiZhun profile");1187 "only support JiZhun profile");
1188 return AVERROR_PATCHWELCOME;1188 return AVERROR_PATCHWELCOME;
1189 }1189 }
1190 h->level = get_bits(&h->gb, 8);1190 h->level = get_bits(&h->gb, 8);
libavcodec/cbs.h+1−1
@@ -516,7 +516,7 @@ enum CbsDiscardFlags { · 515 unmodified lines
516};516};
517 517
518/**518/**
519 * Discard units accroding to 'skip'.519 * Discard units according to 'skip'.
520 */520 */
521void CBS_FUNC(discard_units)(CodedBitstreamContext *ctx,521void CBS_FUNC(discard_units)(CodedBitstreamContext *ctx,
522 CodedBitstreamFragment *frag,522 CodedBitstreamFragment *frag,
libavcodec/cbs_h266_syntax_template.c+1−1
@@ -1725,7 +1725,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, · 1724 unmodified lines
1725 current->pps_pic_height_in_luma_samples !=1725 current->pps_pic_height_in_luma_samples !=
1726 sps->sps_pic_height_max_in_luma_samples)) {1726 sps->sps_pic_height_max_in_luma_samples)) {
1727 av_log(ctx->log_ctx, AV_LOG_ERROR,1727 av_log(ctx->log_ctx, AV_LOG_ERROR,
1728 "Resoltuion change is not allowed, "1728 "Resolution change is not allowed, "
1729 "in max resolution (%ux%u) mismatched with pps(%ux%u).\n",1729 "in max resolution (%ux%u) mismatched with pps(%ux%u).\n",
1730 sps->sps_pic_width_max_in_luma_samples,1730 sps->sps_pic_width_max_in_luma_samples,
1731 sps->sps_pic_height_max_in_luma_samples,1731 sps->sps_pic_height_max_in_luma_samples,
libavcodec/cbs_internal.h+2−2
@@ -273,7 +273,7 @@ int CBS_FUNC(write_signed)(CodedBitstreamContext *ctx, PutBitContext *pbc, · 272 unmodified lines
273 } while (0)273 } while (0)
274 274
275// End of a syntax element which is made up of subelements which275// End of a syntax element which is made up of subelements which
276// are aleady traced, so we are only showing the value.276// are already traced, so we are only showing the value.
277#define CBS_TRACE_READ_END_VALUE_ONLY() \277#define CBS_TRACE_READ_END_VALUE_ONLY() \
278 do { \278 do { \
279 if (ctx->trace_enable) { \279 if (ctx->trace_enable) { \
@@ -310,7 +310,7 @@ int CBS_FUNC(write_signed)(CodedBitstreamContext *ctx, PutBitContext *pbc, · 30 unmodified lines
310 } while (0)310 } while (0)
311 311
312// End of a syntax element which is made up of subelements which are312// End of a syntax element which is made up of subelements which are
313// aleady traced, so we are only showing the value. This forges a313// already traced, so we are only showing the value. This forges a
314// PutBitContext to point to the position of the start of the syntax314// PutBitContext to point to the position of the start of the syntax
315// element, but the other state doesn't matter because length is zero.315// element, but the other state doesn't matter because length is zero.
316#define CBS_TRACE_WRITE_END_VALUE_ONLY() \316#define CBS_TRACE_WRITE_END_VALUE_ONLY() \
libavcodec/ccaption_dec.c+1−1
@@ -814,7 +814,7 @@ static int process_cc608(CCaptionSubContext *ctx, uint8_t hi, uint8_t lo) · 813 unmodified lines
814 break;814 break;
815 case 0x2e:815 case 0x2e:
816 /* erase buffered (non displayed) memory */816 /* erase buffered (non displayed) memory */
817 // Only in realtime mode. In buffered mode, we re-use the inactive screen817 // Only in realtime mode. In buffered mode, we reuse the inactive screen
818 // for our own buffering.818 // for our own buffering.
819 if (ctx->real_time) {819 if (ctx->real_time) {
820 struct Screen *screen = ctx->screen + !ctx->active_screen;820 struct Screen *screen = ctx->screen + !ctx->active_screen;
libavcodec/codec_par.h+1−1
@@ -148,7 +148,7 @@ typedef struct AVCodecParameters { · 147 unmodified lines
148 * durations. Should be set to { 0, 1 } when some frames have differing148 * durations. Should be set to { 0, 1 } when some frames have differing
149 * durations or if the value is not known.149 * durations or if the value is not known.
150 *150 *
151 * @note This field correponds to values that are stored in codec-level151 * @note This field corresponds to values that are stored in codec-level
152 * headers and is typically overridden by container/transport-layer152 * headers and is typically overridden by container/transport-layer
153 * timestamps, when available. It should thus be used only as a last resort,153 * timestamps, when available. It should thus be used only as a last resort,
154 * when no higher-level timing information is available.154 * when no higher-level timing information is available.
libavcodec/dca_xll.c+2−2
@@ -311,7 +311,7 @@ static int chs_parse_header(DCAXllDecoder *s, DCAXllChSet *c, DCAExssAsset *asse · 310 unmodified lines
311 b->highest_pred_order = b->adapt_pred_order[i];311 b->highest_pred_order = b->adapt_pred_order[i];
312 }312 }
313 if (b->highest_pred_order > s->nsegsamples) {313 if (b->highest_pred_order > s->nsegsamples) {
314 av_log(s->avctx, AV_LOG_ERROR, "Invalid XLL adaptive predicition order\n");314 av_log(s->avctx, AV_LOG_ERROR, "Invalid XLL adaptive prediction order\n");
315 return AVERROR_INVALIDDATA;315 return AVERROR_INVALIDDATA;
316 }316 }
317 317
@@ -666,7 +666,7 @@ static void chs_filter_band_data(DCAXllDecoder *s, DCAXllChSet *c, int band) · 348 unmodified lines
666 }666 }
667 }667 }
668 668
669 // Inverse pairwise channel decorrellation669 // Inverse pairwise channel decorrelation
670 if (b->decor_enabled) {670 if (b->decor_enabled) {
671 int32_t *tmp[DCA_XLL_CHANNELS_MAX];671 int32_t *tmp[DCA_XLL_CHANNELS_MAX];
672 672
libavcodec/dcaenc.c+1−1
@@ -854,7 +854,7 @@ static int init_quantization_noise(DCAEncContext *c, int noise, int forbid_zero) · 853 unmodified lines
854 if (c->lfe_channel)854 if (c->lfe_channel)
855 c->consumed_bits += 72;855 c->consumed_bits += 72;
856 856
857 /* attempt to guess the bit distribution based on the prevoius frame */857 /* attempt to guess the bit distribution based on the previous frame */
858 for (ch = 0; ch < c->fullband_channels; ch++) {858 for (ch = 0; ch < c->fullband_channels; ch++) {
859 for (band = 0; band < 32; band++) {859 for (band = 0; band < 32; band++) {
860 int snr_cb = c->peak_cb[ch][band] - c->band_masking_cb[band] - noise;860 int snr_cb = c->peak_cb[ch][band] - c->band_masking_cb[band] - noise;
libavcodec/diracdec.c+1−1
@@ -826,7 +826,7 @@ static int subband_coeffs(const DiracContext *s, int x, int y, int p, · 825 unmodified lines
826 int level, coef = 0;826 int level, coef = 0;
827 for (level = 0; level < s->wavelet_depth; level++) {827 for (level = 0; level < s->wavelet_depth; level++) {
828 SliceCoeffs *o = &c[level];828 SliceCoeffs *o = &c[level];
829 const SubBand *b = &s->plane[p].band[level][3]; /* orientation doens't matter */829 const SubBand *b = &s->plane[p].band[level][3]; /* orientation doesn't matter */
830 o->top = b->height * y / s->num_y;830 o->top = b->height * y / s->num_y;
831 o->left = b->width * x / s->num_x;831 o->left = b->width * x / s->num_x;
832 o->tot_h = ((b->width * (x + 1)) / s->num_x) - o->left;832 o->tot_h = ((b->width * (x + 1)) / s->num_x) - o->left;
libavcodec/dovi_rpudec.c+1−1
@@ -365,7 +365,7 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, · 364 unmodified lines
365 365
366 /* Container */366 /* Container */
367 if (s->cfg.dv_profile == 10 /* dav1.10 */) {367 if (s->cfg.dv_profile == 10 /* dav1.10 */) {
368 /* DV inside AV1 re-uses an EMDF container skeleton, but with fixed368 /* DV inside AV1 reuses an EMDF container skeleton, but with fixed
369 * values - so we can effectively treat this as a magic byte sequence.369 * values - so we can effectively treat this as a magic byte sequence.
370 *370 *
371 * The exact fields are, as follows:371 * The exact fields are, as follows:
libavcodec/dovi_rpuenc.c+1−1
@@ -300,7 +300,7 @@ static int cmp_dm_level0(const AVDOVIColorMetadata *dm1, · 299 unmodified lines
300 sizeof(AVDOVIColorMetadata) -offsetof(AVDOVIColorMetadata, signal_eotf));300 sizeof(AVDOVIColorMetadata) -offsetof(AVDOVIColorMetadata, signal_eotf));
301}301}
302 302
303/* Tries to re-use the static ext blocks. May reorder `ext->dm_static` */303/* Tries to reuse the static ext blocks. May reorder `ext->dm_static` */
304static int try_reuse_ext(DOVIExt *ext, const AVDOVIMetadata *metadata)304static int try_reuse_ext(DOVIExt *ext, const AVDOVIMetadata *metadata)
305{305{
306 int i, j, idx = 0;306 int i, j, idx = 0;
libavcodec/evc.h+1−1
@@ -56,7 +56,7 @@ enum EVCNALUnitType { · 55 unmodified lines
56 EVC_RSV_VCL_NUT22 = 22,56 EVC_RSV_VCL_NUT22 = 22,
57 EVC_RSV_VCL_NUT23 = 23,57 EVC_RSV_VCL_NUT23 = 23,
58 EVC_SPS_NUT = 24, /* Sequence parameter set */58 EVC_SPS_NUT = 24, /* Sequence parameter set */
59 EVC_PPS_NUT = 25, /* Picture paremeter set */59 EVC_PPS_NUT = 25, /* Picture parameter set */
60 EVC_APS_NUT = 26, /* Adaptation parameter set */60 EVC_APS_NUT = 26, /* Adaptation parameter set */
61 EVC_FD_NUT = 27, /* Filler data */61 EVC_FD_NUT = 27, /* Filler data */
62 EVC_SEI_NUT = 28, /* Supplemental enhancement information */62 EVC_SEI_NUT = 28, /* Supplemental enhancement information */
libavcodec/evc_parse.h+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
31#include "evc.h"31#include "evc.h"
32#include "evc_ps.h"32#include "evc_ps.h"
33 33
34// The sturcture reflects Slice Header RBSP(raw byte sequence payload) layout34// The structure reflects Slice Header RBSP(raw byte sequence payload) layout
35// @see ISO_IEC_23094-1 section 7.3.2.635// @see ISO_IEC_23094-1 section 7.3.2.6
36//36//
37// The following descriptors specify the parsing process of each element37// The following descriptors specify the parsing process of each element
libavcodec/evc_ps.h+1−1
@@ -102,7 +102,7 @@ typedef struct VUIParameters { · 101 unmodified lines
102 HRDParameters hrd_parameters;102 HRDParameters hrd_parameters;
103} VUIParameters;103} VUIParameters;
104 104
105// The sturcture reflects SPS RBSP(raw byte sequence payload) layout105// The structure reflects SPS RBSP(raw byte sequence payload) layout
106// @see ISO_IEC_23094-1 section 7.3.2.1106// @see ISO_IEC_23094-1 section 7.3.2.1
107//107//
108// The following descriptors specify the parsing process of each element108// The following descriptors specify the parsing process of each element
libavcodec/evrcdec.c+1−1
@@ -182,7 +182,7 @@ static evrc_packet_rate buf_size2bitrate(const int buf_size) · 181 unmodified lines
182 *182 *
183 * @param avctx the AV codec context183 * @param avctx the AV codec context
184 * @param buf_size length of the buffer184 * @param buf_size length of the buffer
185 * @param buf the bufffer185 * @param buf the buffer
186 *186 *
187 * @return the bitrate on success,187 * @return the bitrate on success,
188 * RATE_ERRS if the bitrate cannot be satisfactorily determined188 * RATE_ERRS if the bitrate cannot be satisfactorily determined
libavcodec/ffv1enc.c+1−1
@@ -979,7 +979,7 @@ static av_cold int encode_init_internal(AVCodecContext *avctx) · 978 unmodified lines
979 if ((ret = ff_ffv1_common_init(avctx, s)) < 0)979 if ((ret = ff_ffv1_common_init(avctx, s)) < 0)
980 return ret;980 return ret;
981 981
982 if (s->ac == 1) // Compatbility with common command line usage982 if (s->ac == 1) // Compatibility with common command line usage
983 s->ac = AC_RANGE_CUSTOM_TAB;983 s->ac = AC_RANGE_CUSTOM_TAB;
984 else if (s->ac == AC_RANGE_DEFAULT_TAB_FORCE)984 else if (s->ac == AC_RANGE_DEFAULT_TAB_FORCE)
985 s->ac = AC_RANGE_DEFAULT_TAB;985 s->ac = AC_RANGE_DEFAULT_TAB;
libavcodec/flac_parse.h+1−1
@@ -58,7 +58,7 @@ typedef struct FLACFrameInfo { · 57 unmodified lines
58 * @param[out] s where parsed information is stored58 * @param[out] s where parsed information is stored
59 * @param[in] buffer pointer to start of 34-byte streaminfo data59 * @param[in] buffer pointer to start of 34-byte streaminfo data
60 *60 *
61 * @return negative error code on faiure or >= 0 on success61 * @return negative error code on failure or >= 0 on success
62 */62 */
63int ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,63int ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
64 const uint8_t *buffer);64 const uint8_t *buffer);
libavcodec/g729postfilter.c+2−2
@@ -211,8 +211,8 @@ static int16_t long_term_filter(AudioDSPContext *adsp, int pitch_delay_int, · 210 unmodified lines
211 /* Compute signals with non-integer delay k (with 1/8 precision),211 /* Compute signals with non-integer delay k (with 1/8 precision),
212 where k is in [0;6] range.212 where k is in [0;6] range.
213 Entire delay is qual to best_delay+(k+1)/8213 Entire delay is qual to best_delay+(k+1)/8
214 This is archieved by applying an interpolation filter of214 This is achieved by applying an interpolation filter of
215 legth 33 to source signal. */215 length 33 to source signal. */
216 for (k = 0; k < ANALYZED_FRAC_DELAYS; k++) {216 for (k = 0; k < ANALYZED_FRAC_DELAYS; k++) {
217 ff_acelp_interpolate(&delayed_signal[k][0],217 ff_acelp_interpolate(&delayed_signal[k][0],
218 &sig_scaled[RES_PREV_DATA_SIZE - best_delay_int],218 &sig_scaled[RES_PREV_DATA_SIZE - best_delay_int],
libavcodec/h264_parse.h+1−1
@@ -36,7 +36,7 @@ · 35 unmodified lines
36#define MB_TYPE_REF0 MB_TYPE_CODEC_SPECIFIC36#define MB_TYPE_REF0 MB_TYPE_CODEC_SPECIFIC
37#define MB_TYPE_8x8DCT 0x0100000037#define MB_TYPE_8x8DCT 0x01000000
38 38
39// This table must be here because scan8[constant] must be known at compiletime39// This table must be here because scan8[constant] must be known at compile time
40static const uint8_t scan8[16 * 3 + 3] = {40static const uint8_t scan8[16 * 3 + 3] = {
41 4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8,41 4 + 1 * 8, 5 + 1 * 8, 4 + 2 * 8, 5 + 2 * 8,
42 6 + 1 * 8, 7 + 1 * 8, 6 + 2 * 8, 7 + 2 * 8,42 6 + 1 * 8, 7 + 1 * 8, 6 + 2 * 8, 7 + 2 * 8,
libavcodec/h264dec.c+1−1
@@ -754,7 +754,7 @@ static int decode_nal_units(H264Context *h, AVBufferRef *buf_ref, · 753 unmodified lines
754 if (h->cur_pic_ptr->decode_error_flags) {754 if (h->cur_pic_ptr->decode_error_flags) {
755 /* Frame-threading in use */755 /* Frame-threading in use */
756 atomic_int *decode_error = h->cur_pic_ptr->decode_error_flags;756 atomic_int *decode_error = h->cur_pic_ptr->decode_error_flags;
757 /* Using atomics here is not supposed to provide syncronisation;757 /* Using atomics here is not supposed to provide synchronisation;
758 * they are merely used to allow to set decode_error from both758 * they are merely used to allow to set decode_error from both
759 * decoding threads in case of coded slices. */759 * decoding threads in case of coded slices. */
760 atomic_fetch_or_explicit(decode_error, FF_DECODE_ERROR_DECODE_SLICES,760 atomic_fetch_or_explicit(decode_error, FF_DECODE_ERROR_DECODE_SLICES,
libavcodec/h264dec.h+1−1
@@ -541,7 +541,7 @@ typedef struct H264Context { · 540 unmodified lines
541 * all subsequently output fraames are also marked as recovered541 * all subsequently output fraames are also marked as recovered
542 *542 *
543 * In effect, if you want all subsequent DECODED frames marked as recovered, set frame_recovered543 * In effect, if you want all subsequent DECODED frames marked as recovered, set frame_recovered
544 * If you want all subsequent DISPAYED frames marked as recovered, set the frame->recovered544 * If you want all subsequent DISPLAYED frames marked as recovered, set the frame->recovered
545 */545 */
546 int frame_recovered;546 int frame_recovered;
547 547
libavcodec/h274.c+2−2
@@ -96,7 +96,7 @@ static void init_slice_c(int8_t out[64][64], uint8_t h, uint8_t v, · 95 unmodified lines
96 }96 }
97 }97 }
98 98
99 // Deblock horizontal edges by simple attentuation of values99 // Deblock horizontal edges by simple attenuation of values
100 for (int y = 0; y < 64; y += 8) {100 for (int y = 0; y < 64; y += 8) {
101 for (int x = 0; x < 64; x++) {101 for (int x = 0; x < 64; x++) {
102 out[y + 0][x] = (out[y + 0][x] * deblock_coeff) >> 7;102 out[y + 0][x] = (out[y + 0][x] * deblock_coeff) >> 7;
@@ -239,7 +239,7 @@ int ff_h274_apply_film_grain(AVFrame *out_frame, const AVFrame *in_frame, · 136 unmodified lines
239 239
240 uint8_t * const out = out_frame->data[c];240 uint8_t * const out = out_frame->data[c];
241 const int out_stride = out_frame->linesize[c];241 const int out_stride = out_frame->linesize[c];
242 int8_t * const grain = out_frame->data[c]; // re-use output buffer for grain242 int8_t * const grain = out_frame->data[c]; // reuse output buffer for grain
243 const int grain_stride = out_stride;243 const int grain_stride = out_stride;
244 const uint8_t * const in = in_frame->data[c];244 const uint8_t * const in = in_frame->data[c];
245 const int in_stride = in_frame->linesize[c];245 const int in_stride = in_frame->linesize[c];
libavcodec/hapenc.c+1−1
@@ -305,7 +305,7 @@ static av_cold int hap_init(AVCodecContext *avctx) · 304 unmodified lines
305 }305 }
306 break;306 break;
307 default:307 default:
308 av_log(avctx, AV_LOG_ERROR, "Invalid compresor %02X\n", ctx->opt_compressor);308 av_log(avctx, AV_LOG_ERROR, "Invalid compressor %02X\n", ctx->opt_compressor);
309 return AVERROR_INVALIDDATA;309 return AVERROR_INVALIDDATA;
310 }310 }
311 if (corrected_chunk_count != ctx->opt_chunk_count) {311 if (corrected_chunk_count != ctx->opt_chunk_count) {
libavcodec/hevc/hevcdec.c+2−2
@@ -3544,7 +3544,7 @@ static int decode_slice(HEVCContext *s, unsigned nal_idx, GetBitContext *gb) · 3543 unmodified lines
3544 3544
3545 ret = hls_slice_header(&s->sh, s, gb);3545 ret = hls_slice_header(&s->sh, s, gb);
3546 if (ret < 0) {3546 if (ret < 0) {
3547 // hls_slice_header() does not cleanup on failure thus the state now is inconsistant so we cannot use it on depandant slices3547 // hls_slice_header() does not cleanup on failure thus the state now is inconsistent so we cannot use it on dependent slices
3548 s->slice_initialized = 0;3548 s->slice_initialized = 0;
3549 return ret;3549 return ret;
3550 }3550 }
@@ -4206,7 +4206,7 @@ static void hevc_decode_flush(AVCodecContext *avctx) · 655 unmodified lines
4206static const AVOption options[] = {4206static const AVOption options[] = {
4207 { "apply_defdispwin", "Apply default display window from VUI", OFFSET(apply_defdispwin),4207 { "apply_defdispwin", "Apply default display window from VUI", OFFSET(apply_defdispwin),
4208 AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR },4208 AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR },
4209 { "strict-displaywin", "stricly apply default display window size", OFFSET(apply_defdispwin),4209 { "strict-displaywin", "strictly apply default display window size", OFFSET(apply_defdispwin),
4210 AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR },4210 AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR },
4211 { "view_ids", "Array of view IDs that should be decoded and output; a single -1 to decode all views",4211 { "view_ids", "Array of view IDs that should be decoded and output; a single -1 to decode all views",
4212 .offset = OFFSET(view_ids), .type = AV_OPT_TYPE_INT | AV_OPT_TYPE_FLAG_ARRAY,4212 .offset = OFFSET(view_ids), .type = AV_OPT_TYPE_INT | AV_OPT_TYPE_FLAG_ARRAY,
libavcodec/ilbcdec.c+3−3
@@ -1097,7 +1097,7 @@ static void do_plc(int16_t *plc_residual, /* (o) concealed residual */ · 1096 unmodified lines
1097 use_gain = 29491; /* 0.9 in Q15 */1097 use_gain = 29491; /* 0.9 in Q15 */
1098 }1098 }
1099 1099
1100 /* Compute mixing factor of picth repeatition and noise:1100 /* Compute mixing factor of picth repetition and noise:
1101 for max_per>0.7 set periodicity to 1.01101 for max_per>0.7 set periodicity to 1.0
1102 0.4<max_per<0.7 set periodicity to (maxper-0.4)/0.7-0.4)1102 0.4<max_per<0.7 set periodicity to (maxper-0.4)/0.7-0.4)
1103 max_per<0.4 set periodicity to 0.01103 max_per<0.4 set periodicity to 0.0
@@ -1142,7 +1142,7 @@ static void do_plc(int16_t *plc_residual, /* (o) concealed residual */ · 38 unmodified lines
1142 randvec[i] = s->prevResidual[pick];1142 randvec[i] = s->prevResidual[pick];
1143 }1143 }
1144 1144
1145 /* pitch repeatition component */1145 /* pitch repetition component */
1146 pick = i - use_lag;1146 pick = i - use_lag;
1147 1147
1148 if (pick < 0) {1148 if (pick < 0) {
@@ -1160,7 +1160,7 @@ static void do_plc(int16_t *plc_residual, /* (o) concealed residual */ · 11 unmodified lines
1160 tot_gain = SPL_MUL_16_16_RSFT(29491, use_gain, 15); /* 0.9*use_gain */1160 tot_gain = SPL_MUL_16_16_RSFT(29491, use_gain, 15); /* 0.9*use_gain */
1161 }1161 }
1162 1162
1163 /* mix noise and pitch repeatition */1163 /* mix noise and pitch repetition */
1164 plc_residual[i] = SPL_MUL_16_16_RSFT(tot_gain, (pitchfact * plc_residual[i] + (32767 - pitchfact) * randvec[i] + 16384) >> 15, 15);1164 plc_residual[i] = SPL_MUL_16_16_RSFT(tot_gain, (pitchfact * plc_residual[i] + (32767 - pitchfact) * randvec[i] + 16384) >> 15, 15);
1165 1165
1166 /* Shifting down the result one step extra to ensure that no overflow1166 /* Shifting down the result one step extra to ensure that no overflow
libavcodec/j2kenc.c+1−1
@@ -1802,7 +1802,7 @@ static int j2kenc_destroy(AVCodecContext *avctx) · 1801 unmodified lines
1802 return 0;1802 return 0;
1803}1803}
1804 1804
1805// taken from the libopenjpeg wraper so it matches1805// taken from the libopenjpeg wrapper so it matches
1806 1806
1807#define OFFSET(x) offsetof(Jpeg2000EncoderContext, x)1807#define OFFSET(x) offsetof(Jpeg2000EncoderContext, x)
1808#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM1808#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
libavcodec/jpeg2000dec.c+2−2
@@ -1362,7 +1362,7 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, · 1361 unmodified lines
1362 }1362 }
1363 bits_to_read = (uint8_t) (bits_to_read + cblk->lblock);1363 bits_to_read = (uint8_t) (bits_to_read + cblk->lblock);
1364 segment_bytes = get_bits(s, bits_to_read);1364 segment_bytes = get_bits(s, bits_to_read);
1365 // Write length information for HT Refinment segment1365 // Write length information for HT Refinement segment
1366 cblk->pass_lengths[1] += segment_bytes;1366 cblk->pass_lengths[1] += segment_bytes;
1367 } else if (!(cblk->modes & (JPEG2000_CBLK_TERMALL | JPEG2000_CBLK_BYPASS))) {1367 } else if (!(cblk->modes & (JPEG2000_CBLK_TERMALL | JPEG2000_CBLK_BYPASS))) {
1368 // Common case for non-HT code-blocks; we have only one segment1368 // Common case for non-HT code-blocks; we have only one segment
@@ -2814,7 +2814,7 @@ static av_cold int jpeg2000_decode_init(AVCodecContext *avctx) · 1445 unmodified lines
2814 Jpeg2000DecoderContext *s = avctx->priv_data;2814 Jpeg2000DecoderContext *s = avctx->priv_data;
2815 2815
2816 if (avctx->lowres)2816 if (avctx->lowres)
2817 av_log(avctx, AV_LOG_WARNING, "lowres is overriden by reduction_factor but set anyway\n");2817 av_log(avctx, AV_LOG_WARNING, "lowres is overridden by reduction_factor but set anyway\n");
2818 if (!s->reduction_factor && avctx->lowres < JPEG2000_MAX_RESLEVELS) {2818 if (!s->reduction_factor && avctx->lowres < JPEG2000_MAX_RESLEVELS) {
2819 s->reduction_factor = avctx->lowres;2819 s->reduction_factor = avctx->lowres;
2820 }2820 }
libavcodec/libaribcaption.c+1−1
@@ -250,7 +250,7 @@ static uint8_t clut_pick_or_set(ARIBCaptionContext *ctx, int r, int g, int b, in · 249 unmodified lines
250 return c;250 return c;
251}251}
252 252
253/* initialiaze CLUT with each character colors */253/* initialize CLUT with each character colors */
254static void clut_init(ARIBCaptionContext *ctx, aribcc_caption_region_t *region)254static void clut_init(ARIBCaptionContext *ctx, aribcc_caption_region_t *region)
255{255{
256 aribcc_color_t text_color, back_color, stroke_color;256 aribcc_color_t text_color, back_color, stroke_color;
libavcodec/libjxlenc.c+1−1
@@ -93,7 +93,7 @@ static float quality_to_distance(float quality) · 92 unmodified lines
93}93}
94 94
95/**95/**
96 * Initalize the encoder on a per-file basis. All of these need to be set96 * Initialize the encoder on a per-file basis. All of these need to be set
97 * once each time the encoder is reset, which is each frame for still97 * once each time the encoder is reset, which is each frame for still
98 * images, to make the image2 muxer work. For animation this is run once.98 * images, to make the image2 muxer work. For animation this is run once.
99 *99 *
libavcodec/liboapvenc.c+2−2
@@ -44,7 +44,7 @@ · 43 unmodified lines
44#define MAX_BS_BUF (128 * 1024 * 1024)44#define MAX_BS_BUF (128 * 1024 * 1024)
45#define MAX_NUM_FRMS (1) // supports only 1-frame in an access unit45#define MAX_NUM_FRMS (1) // supports only 1-frame in an access unit
46#define FRM_IDX (0) // supports only 1-frame in an access unit46#define FRM_IDX (0) // supports only 1-frame in an access unit
47#define MAX_NUM_CC (OAPV_MAX_CC) // Max number of color componets (upto 4:4:4:4)47#define MAX_NUM_CC (OAPV_MAX_CC) // Max number of color components (upto 4:4:4:4)
48 48
49/**49/**
50 * The structure stores all the states associated with the instance of APV encoder50 * The structure stores all the states associated with the instance of APV encoder
@@ -393,7 +393,7 @@ static int liboapve_encode(AVCodecContext *avctx, AVPacket *avpkt, · 342 unmodified lines
393 uint8_t *data = apv->bitb.addr;393 uint8_t *data = apv->bitb.addr;
394 int size = apv->stat.write;394 int size = apv->stat.write;
395 395
396 // The encoder may return a "Raw bitstream" formated AU, including au_size.396 // The encoder may return a "Raw bitstream" formatted AU, including au_size.
397 // Discard it as we only need the access_unit() structure.397 // Discard it as we only need the access_unit() structure.
398 if (size > 4 && AV_RB32(data) != APV_SIGNATURE) {398 if (size > 4 && AV_RB32(data) != APV_SIGNATURE) {
399 data += 4;399 data += 4;
libavcodec/loongarch/hevc_mc.S+2−2
@@ -674,7 +674,7 @@ endfunc · 673 unmodified lines
674 vdp2.h.bu.b \out1, \in1, vr5674 vdp2.h.bu.b \out1, \in1, vr5
675 vdp2.h.bu.b vr12, \in2, vr5675 vdp2.h.bu.b vr12, \in2, vr5
676 vdp2.h.bu.b vr20, \in3, vr5676 vdp2.h.bu.b vr20, \in3, vr5
677 vbsrl.v \in0, \in0, 1 //Back up previous 7 loaded datas,677 vbsrl.v \in0, \in0, 1 //Back up previous 7 loaded data,
678 vbsrl.v \in1, \in1, 1 //so just need to insert the 8th678 vbsrl.v \in1, \in1, 1 //so just need to insert the 8th
679 vbsrl.v \in2, \in2, 1 //load in the next loop.679 vbsrl.v \in2, \in2, 1 //load in the next loop.
680 vbsrl.v \in3, \in3, 1680 vbsrl.v \in3, \in3, 1
@@ -903,7 +903,7 @@ endfunc · 222 unmodified lines
903 xvhaddw.d.h xr7903 xvhaddw.d.h xr7
904 xvhaddw.d.h xr8904 xvhaddw.d.h xr8
905 xvhaddw.d.h xr9905 xvhaddw.d.h xr9
906 xvbsrl.v xr14, xr14, 1 //Back up previous 7 loaded datas,906 xvbsrl.v xr14, xr14, 1 //Back up previous 7 loaded data,
907 xvbsrl.v xr15, xr15, 1 //so just need to insert the 8th907 xvbsrl.v xr15, xr15, 1 //so just need to insert the 8th
908 xvbsrl.v xr16, xr16, 1 //load in next loop.908 xvbsrl.v xr16, xr16, 1 //load in next loop.
909 xvbsrl.v xr17, xr17, 1909 xvbsrl.v xr17, xr17, 1
libavcodec/loongarch/loongson_asm.S+1−1
@@ -332,7 +332,7 @@ ASM_PREF\name: ; · 331 unmodified lines
332 332
333/*333/*
334 * Description : Store elements of vector334 * Description : Store elements of vector
335 * vd : Data vector to be stroed335 * vd : Data vector to be stored
336 * rk : Address of data storage336 * rk : Address of data storage
337 * ra : Offset of address337 * ra : Offset of address
338 * si : Index of data in vd338 * si : Index of data in vd
libavcodec/loongarch/vc1dsp_loongarch.h+1−1
@@ -30,7 +30,7 @@ void ff_vc1_inv_trans_8x8_dc_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *bloc · 29 unmodified lines
30void ff_vc1_inv_trans_8x4_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);30void ff_vc1_inv_trans_8x4_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
31void ff_vc1_inv_trans_8x4_dc_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);31void ff_vc1_inv_trans_8x4_dc_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
32void ff_vc1_inv_trans_4x8_dc_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);32void ff_vc1_inv_trans_4x8_dc_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
33void ff_vc1_inv_trans_4x8_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *blokc);33void ff_vc1_inv_trans_4x8_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
34void ff_vc1_inv_trans_4x4_dc_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);34void ff_vc1_inv_trans_4x4_dc_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
35void ff_vc1_inv_trans_4x4_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);35void ff_vc1_inv_trans_4x4_lasx(uint8_t *dest, ptrdiff_t stride, int16_t *block);
36 36
libavcodec/magicyuvenc.c+1−1
@@ -50,7 +50,7 @@ typedef struct HuffEntry { · 49 unmodified lines
50 50
51typedef struct PTable {51typedef struct PTable {
52 int value; ///< input value52 int value; ///< input value
53 int64_t prob; ///< number of occurences of this value in input53 int64_t prob; ///< number of occurrences of this value in input
54} PTable;54} PTable;
55 55
56typedef struct Slice {56typedef struct Slice {
libavcodec/mjpegdec.c+1−1
@@ -2124,7 +2124,7 @@ static int mjpeg_decode_app(MJpegDecodeContext *s) · 2123 unmodified lines
2124 av_log(s->avctx, AV_LOG_WARNING, "Invalid number of markers coded in APP2\n");2124 av_log(s->avctx, AV_LOG_WARNING, "Invalid number of markers coded in APP2\n");
2125 goto out;2125 goto out;
2126 } else if (s->iccnum != 0 && nummarkers != s->iccnum) {2126 } else if (s->iccnum != 0 && nummarkers != s->iccnum) {
2127 av_log(s->avctx, AV_LOG_WARNING, "Mistmatch in coded number of ICC markers between markers\n");2127 av_log(s->avctx, AV_LOG_WARNING, "Mismatch in coded number of ICC markers between markers\n");
2128 goto out;2128 goto out;
2129 } else if (seqno > nummarkers) {2129 } else if (seqno > nummarkers) {
2130 av_log(s->avctx, AV_LOG_WARNING, "Mismatching sequence number and coded number of ICC markers\n");2130 av_log(s->avctx, AV_LOG_WARNING, "Mismatching sequence number and coded number of ICC markers\n");
libavcodec/mjpegenc_huffman.c+2−2
@@ -30,7 +30,7 @@ · 29 unmodified lines
30 */30 */
31typedef struct PTable {31typedef struct PTable {
32 int value; ///< input value32 int value; ///< input value
33 int prob; ///< number of occurences of this value in input33 int prob; ///< number of occurrences of this value in input
34} PTable;34} PTable;
35 35
36/**36/**
@@ -179,7 +179,7 @@ void ff_mjpeg_encode_huffman_close(MJpegEncHuffmanContext *s, uint8_t bits[17], · 142 unmodified lines
179 179
180 // val_counts[0] is the fake element we added earlier.180 // val_counts[0] is the fake element we added earlier.
181 av_assert1(val_counts[0].prob == 0 && val_counts[0].value == 256);181 av_assert1(val_counts[0].prob == 0 && val_counts[0].value == 256);
182 // The following loop puts the values with higher occurence first,182 // The following loop puts the values with higher occurrence first,
183 // ensuring that they get the shorter codes.183 // ensuring that they get the shorter codes.
184 for (int i = 0; i < nval; ++i)184 for (int i = 0; i < nval; ++i)
185 val[i] = val_counts[nval - i].value;185 val[i] = val_counts[nval - i].value;
libavcodec/mlz.h+1−1
@@ -42,7 +42,7 @@ typedef struct MLZDict { · 41 unmodified lines
42 int match_len;42 int match_len;
43} MLZDict;43} MLZDict;
44 44
45/** MLZ data strucure45/** MLZ data structure
46 */46 */
47typedef struct MLZ {47typedef struct MLZ {
48 int dic_code_bit;48 int dic_code_bit;
libavcodec/movtextenc.c+1−1
@@ -259,7 +259,7 @@ static int encode_sample_description(AVCodecContext *avctx) · 258 unmodified lines
259 // Build font table259 // Build font table
260 // We can't build a complete font table since that would require260 // We can't build a complete font table since that would require
261 // scanning all dialogs first. But we can at least fill in what261 // scanning all dialogs first. But we can at least fill in what
262 // is avaiable in the ASS header262 // is available in the ASS header
263 if (style && ass->styles_count) {263 if (style && ass->styles_count) {
264 // Find unique font names264 // Find unique font names
265 if (style->font_name) {265 if (style->font_name) {
libavcodec/mpeg4videodec.c+1−1
@@ -3592,7 +3592,7 @@ int ff_mpeg4_parse_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, · 3591 unmodified lines
3592 3592
3593 // If we have not switched to studio profile than we also did not switch bps3593 // If we have not switched to studio profile than we also did not switch bps
3594 // that means something else (like a previous instance) outside set bps which3594 // that means something else (like a previous instance) outside set bps which
3595 // would be inconsistant with the currect state, thus reset it3595 // would be inconsistent with the correct state, thus reset it
3596 if (!s->studio_profile && s->avctx->bits_per_raw_sample != 8)3596 if (!s->studio_profile && s->avctx->bits_per_raw_sample != 8)
3597 s->avctx->bits_per_raw_sample = 0;3597 s->avctx->bits_per_raw_sample = 0;
3598 3598
libavcodec/mpegaudiodec_template.c+1−1
@@ -1770,7 +1770,7 @@ static av_cold int decode_init_mp3on4(AVCodecContext * avctx) · 1769 unmodified lines
1770 else1770 else
1771 s->syncword = 0xfff00000;1771 s->syncword = 0xfff00000;
1772 1772
1773 /* Init the first mp3 decoder in standard way, so that all tables get builded1773 /* Init the first mp3 decoder in standard way, so that all tables get built
1774 * We replace avctx->priv_data with the context of the first decoder so that1774 * We replace avctx->priv_data with the context of the first decoder so that
1775 * decode_init() does not have to be changed.1775 * decode_init() does not have to be changed.
1776 * Other decoders will be initialized here copying data from the first context1776 * Other decoders will be initialized here copying data from the first context
libavcodec/mpegvideo_enc.c+1−1
@@ -1828,7 +1828,7 @@ static int select_input_picture(MPVMainEncContext *const m) · 1827 unmodified lines
1828 1828
1829 if (m->reordered_input_picture[0]->shared || s->c.avctx->rc_buffer_size) {1829 if (m->reordered_input_picture[0]->shared || s->c.avctx->rc_buffer_size) {
1830 // input is a shared pix, so we can't modify it -> allocate a new1830 // input is a shared pix, so we can't modify it -> allocate a new
1831 // one & ensure that the shared one is reuseable1831 // one & ensure that the shared one is reusable
1832 av_frame_move_ref(s->new_pic, m->reordered_input_picture[0]->f);1832 av_frame_move_ref(s->new_pic, m->reordered_input_picture[0]->f);
1833 1833
1834 ret = prepare_picture(s, m->reordered_input_picture[0]->f, s->new_pic);1834 ret = prepare_picture(s, m->reordered_input_picture[0]->f, s->new_pic);
libavcodec/nellymoser.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
28/**28/**
29 * @file29 * @file
30 * The 3 alphanumeric copyright notices are md5summed they are from the original30 * The 3 alphanumeric copyright notices are md5summed they are from the original
31 * implementors. The original code is available from http://code.google.com/p/nelly2pcm/31 * implementers. The original code is available from http://code.google.com/p/nelly2pcm/
32 */32 */
33 33
34#include <stdlib.h>34#include <stdlib.h>
libavcodec/nellymoser.h+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
28/**28/**
29 * @file29 * @file
30 * The 3 alphanumeric copyright notices are md5summed they are from the original30 * The 3 alphanumeric copyright notices are md5summed they are from the original
31 * implementors. The original code is available from http://code.google.com/p/nelly2pcm/31 * implementers. The original code is available from http://code.google.com/p/nelly2pcm/
32 */32 */
33 33
34#ifndef AVCODEC_NELLYMOSER_H34#ifndef AVCODEC_NELLYMOSER_H
libavcodec/nellymoserdec.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
28/**28/**
29 * @file29 * @file
30 * The 3 alphanumeric copyright notices are md5summed they are from the original30 * The 3 alphanumeric copyright notices are md5summed they are from the original
31 * implementors. The original code is available from http://code.google.com/p/nelly2pcm/31 * implementers. The original code is available from http://code.google.com/p/nelly2pcm/
32 */32 */
33 33
34#include "libavutil/channel_layout.h"34#include "libavutil/channel_layout.h"
libavcodec/opus/enc.c+1−1
@@ -433,7 +433,7 @@ static void celt_encode_frame(OpusEncContext *s, OpusRangeCoder *rc, · 432 unmodified lines
433 433
434 if (f->silence) {434 if (f->silence) {
435 if (f->framebits >= 16)435 if (f->framebits >= 16)
436 ff_opus_rc_enc_log(rc, 1, 15); /* Silence (if using explicit singalling) */436 ff_opus_rc_enc_log(rc, 1, 15); /* Silence (if using explicit signalling) */
437 for (int ch = 0; ch < s->channels; ch++)437 for (int ch = 0; ch < s->channels; ch++)
438 memset(s->last_quantized_energy[ch], 0.0f, sizeof(float)*CELT_MAX_BANDS);438 memset(s->last_quantized_energy[ch], 0.0f, sizeof(float)*CELT_MAX_BANDS);
439 return;439 return;
libavcodec/opus/tab.c+1−1
@@ -1155,7 +1155,7 @@ const uint32_t * const ff_celt_pvq_u_row[15] = { · 1154 unmodified lines
1155};1155};
1156 1156
1157/* Deemphasis constant (alpha_p), as specified in RFC6716 as 0.8500061035.1157/* Deemphasis constant (alpha_p), as specified in RFC6716 as 0.8500061035.
1158 * libopus uses a slighly rounded constant, set to 0.85 exactly,1158 * libopus uses a slightly rounded constant, set to 0.85 exactly,
1159 * to simplify its fixed-point version, but it's not significant to impact1159 * to simplify its fixed-point version, but it's not significant to impact
1160 * compliance. */1160 * compliance. */
1161#define CELT_EMPH_COEFF 0.85000610351161#define CELT_EMPH_COEFF 0.8500061035
libavcodec/packet.h+1−1
@@ -142,7 +142,7 @@ enum AVPacketSideDataType { · 141 unmodified lines
142 AV_PKT_DATA_CPB_PROPERTIES,142 AV_PKT_DATA_CPB_PROPERTIES,
143 143
144 /**144 /**
145 * Recommmends skipping the specified number of samples145 * Recommends skipping the specified number of samples
146 * @code146 * @code
147 * u32le number of samples to skip from start of this packet147 * u32le number of samples to skip from start of this packet
148 * u32le number of samples to skip from end of this packet148 * u32le number of samples to skip from end of this packet
libavcodec/pgssubdec.c+1−1
@@ -447,7 +447,7 @@ static int parse_presentation_segment(AVCodecContext *avctx, · 446 unmodified lines
447 PGSSubObjectRef *const object = &ctx->presentation.objects[i];447 PGSSubObjectRef *const object = &ctx->presentation.objects[i];
448 448
449 if (buf_end - buf < 8) {449 if (buf_end - buf < 8) {
450 av_log(avctx, AV_LOG_ERROR, "Insufficent space for object\n");450 av_log(avctx, AV_LOG_ERROR, "Insufficient space for object\n");
451 ctx->presentation.object_count = i;451 ctx->presentation.object_count = i;
452 return AVERROR_INVALIDDATA;452 return AVERROR_INVALIDDATA;
453 }453 }
libavcodec/pictordec.c+1−1
@@ -172,7 +172,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, · 171 unmodified lines
172 1 byte run (=0)172 1 byte run (=0)
173 2 bytes run173 2 bytes run
174 1 byte val174 1 byte val
175 thats 5 bytes and the maximum run we can code is 65535175 that's 5 bytes and the maximum run we can code is 65535
176 176
177 The RLE decoder can exit prematurly but it does not on any image available177 The RLE decoder can exit prematurly but it does not on any image available
178 Based on this the formula is assumed correct for undamaged images.178 Based on this the formula is assumed correct for undamaged images.
libavcodec/ppc/hpeldsp_altivec.c+1−1
@@ -46,7 +46,7 @@ void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t li · 45 unmodified lines
46 register ptrdiff_t line_size_4 = line_size * (1 << 2);46 register ptrdiff_t line_size_4 = line_size * (1 << 2);
47 47
48// hand-unrolling the loop by 4 gains about 15%48// hand-unrolling the loop by 4 gains about 15%
49// mininum execution time goes from 74 to 60 cycles49// minimum execution time goes from 74 to 60 cycles
50// it's faster than -funroll-loops, but using50// it's faster than -funroll-loops, but using
51// -funroll-loops w/ this is bad - 74 cycles again.51// -funroll-loops w/ this is bad - 74 cycles again.
52// all this is on a 7450, tuning for the 745052// all this is on a 7450, tuning for the 7450
libavcodec/ppc/vp8dsp_altivec.c+1−1
@@ -312,7 +312,7 @@ static void put_vp8_pixels16_altivec(uint8_t *dst, ptrdiff_t dstride, const uint · 311 unmodified lines
312 perm = vec_lvsl(0, src);312 perm = vec_lvsl(0, src);
313#endif313#endif
314// hand-unrolling the loop by 4 gains about 15%314// hand-unrolling the loop by 4 gains about 15%
315// mininum execution time goes from 74 to 60 cycles315// minimum execution time goes from 74 to 60 cycles
316// it's faster than -funroll-loops, but using316// it's faster than -funroll-loops, but using
317// -funroll-loops w/ this is bad - 74 cycles again.317// -funroll-loops w/ this is bad - 74 cycles again.
318// all this is on a 7450, tuning for the 7450318// all this is on a 7450, tuning for the 7450
libavcodec/psd.c+2−2
@@ -173,10 +173,10 @@ static int decode_header(PSDContext * s) · 172 unmodified lines
173 }173 }
174 bytestream2_skip(&s->gb, len_section);174 bytestream2_skip(&s->gb, len_section);
175 175
176 /* image ressources */176 /* image resources */
177 len_section = bytestream2_get_be32(&s->gb);177 len_section = bytestream2_get_be32(&s->gb);
178 if (len_section < 0) {178 if (len_section < 0) {
179 av_log(s->avctx, AV_LOG_ERROR, "Negative size for image ressources section.\n");179 av_log(s->avctx, AV_LOG_ERROR, "Negative size for image resources section.\n");
180 return AVERROR_INVALIDDATA;180 return AVERROR_INVALIDDATA;
181 }181 }
182 182
libavcodec/qsvdec.c+3−3
@@ -696,7 +696,7 @@ static int qsv_export_hdr_side_data(AVCodecContext *avctx, mfxExtMasteringDispla · 695 unmodified lines
696{696{
697 int ret;697 int ret;
698 698
699 // The SDK re-uses this flag for HDR SEI parsing699 // The SDK reuses this flag for HDR SEI parsing
700 if (mdcv->InsertPayloadToggle) {700 if (mdcv->InsertPayloadToggle) {
701 AVMasteringDisplayMetadata *mastering;701 AVMasteringDisplayMetadata *mastering;
702 const int mapping[3] = {2, 0, 1};702 const int mapping[3] = {2, 0, 1};
@@ -726,7 +726,7 @@ static int qsv_export_hdr_side_data(AVCodecContext *avctx, mfxExtMasteringDispla · 23 unmodified lines
726 }726 }
727 }727 }
728 728
729 // The SDK re-uses this flag for HDR SEI parsing729 // The SDK reuses this flag for HDR SEI parsing
730 if (clli->InsertPayloadToggle) {730 if (clli->InsertPayloadToggle) {
731 AVContentLightMetadata *light;731 AVContentLightMetadata *light;
732 732
@@ -1002,7 +1002,7 @@ static int qsv_process_data(AVCodecContext *avctx, QSVContext *q, · 269 unmodified lines
1002 1002
1003 // sw_pix_fmt, coded_width/height should be set for ff_get_format(),1003 // sw_pix_fmt, coded_width/height should be set for ff_get_format(),
1004 // assume sw_pix_fmt is NV12 and coded_width/height to be 1280x720,1004 // assume sw_pix_fmt is NV12 and coded_width/height to be 1280x720,
1005 // the assumption may be not corret but will be updated after header decoded if not true.1005 // the assumption may be not correct but will be updated after header decoded if not true.
1006 if (q->orig_pix_fmt != AV_PIX_FMT_NONE)1006 if (q->orig_pix_fmt != AV_PIX_FMT_NONE)
1007 pix_fmt = q->orig_pix_fmt;1007 pix_fmt = q->orig_pix_fmt;
1008 if (!avctx->coded_width)1008 if (!avctx->coded_width)
libavcodec/qsvenc.c+1−1
@@ -2057,7 +2057,7 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame, · 2056 unmodified lines
2057 }2057 }
2058 } else {2058 } else {
2059 /* make a copy if the input is not padded as libmfx requires */2059 /* make a copy if the input is not padded as libmfx requires */
2060 /* and to make allocation continious for data[0]/data[1] */2060 /* and to make allocation continuous for data[0]/data[1] */
2061 if ((frame->height & (q->height_align - 1) || frame->linesize[0] & (q->width_align - 1)) ||2061 if ((frame->height & (q->height_align - 1) || frame->linesize[0] & (q->width_align - 1)) ||
2062 ((frame->format == AV_PIX_FMT_NV12 || frame->format == AV_PIX_FMT_P010 || frame->format == AV_PIX_FMT_P012) &&2062 ((frame->format == AV_PIX_FMT_NV12 || frame->format == AV_PIX_FMT_P010 || frame->format == AV_PIX_FMT_P012) &&
2063 (frame->data[1] - frame->data[0] != frame->linesize[0] * FFALIGN(qf->frame->height, q->height_align)))) {2063 (frame->data[1] - frame->data[0] != frame->linesize[0] * FFALIGN(qf->frame->height, q->height_align)))) {
libavcodec/riscv/aacencdsp_init.c+1−1
@@ -1,6 +1,6 @@
1/*1/*
2 * AAC encoder assembly optimizations2 * AAC encoder assembly optimizations
3 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).3 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
4 *4 *
5 * This file is part of FFmpeg.5 * This file is part of FFmpeg.
6 *6 *
libavcodec/riscv/aacencdsp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 * Copyright © 2024 Rémi Denis-Courmont.3 * Copyright © 2024 Rémi Denis-Courmont.
4 *4 *
5 * This file is part of FFmpeg.5 * This file is part of FFmpeg.
libavcodec/riscv/ac3dsp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/blockdsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/blockdsp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/h263dsp_rvv.S+1−1
@@ -43,7 +43,7 @@ func ff_h263_h_loop_filter_rvv, zve32x · 42 unmodified lines
43 vsrl.vi v18, v16, 16 - 3 # v18 = (v16 < 0) ? 7 : 043 vsrl.vi v18, v16, 16 - 3 # v18 = (v16 < 0) ? 7 : 0
44 slli t2, t1, 1 # 2 * strength44 slli t2, t1, 1 # 2 * strength
45 vadd.vv v16, v16, v1845 vadd.vv v16, v16, v18
46 # v16 (d) is signed 7-bit, but later arithmetics require 9 bits.46 # v16 (d) is signed 7-bit, but later arithmetic require 9 bits.
47 vsra.vi v16, v16, 3 # d47 vsra.vi v16, v16, 3 # d
48 vmv.v.x v20, t248 vmv.v.x v20, t2
49 vmslt.vi v0, v16, 049 vmslt.vi v0, v16, 0
libavcodec/riscv/h26x/asm.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/h26x/h2656_inter_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/h26x/h2656dsp.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/hevcdsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/me_cmp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/me_cmp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/rv34dsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/rv34dsp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/rv40dsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/rv40dsp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/svqenc_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/svqenc_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/takdsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/takdsp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 * Copyright (c) 2023 Rémi Denis-Courmont3 * Copyright (c) 2023 Rémi Denis-Courmont
4 *4 *
5 * This file is part of FFmpeg.5 * This file is part of FFmpeg.
libavcodec/riscv/vc1dsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vc1dsp_rvi.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vc1dsp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 * Copyright (c) 2024 Rémi Denis-Courmont.3 * Copyright (c) 2024 Rémi Denis-Courmont.
4 *4 *
5 * This file is part of FFmpeg.5 * This file is part of FFmpeg.
libavcodec/riscv/vp8dsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vp8dsp_rvi.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vp8dsp_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 * Copyright © 2024 Rémi Denis-Courmont.3 * Copyright © 2024 Rémi Denis-Courmont.
4 *4 *
5 * This file is part of FFmpeg.5 * This file is part of FFmpeg.
libavcodec/riscv/vp9_intra_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vp9_mc_rvi.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vp9_mc_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vp9dsp.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vp9dsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vvc/dsp_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vvc/mc_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/riscv/vvc/sad_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavcodec/rpzaenc.c+1−1
@@ -619,7 +619,7 @@ static void rpza_encode_stream(RpzaContext *s, const AVFrame *pict) · 618 unmodified lines
619 619
620 if (compare_blocks(&prev_pixels[pblock_offset],620 if (compare_blocks(&prev_pixels[pblock_offset],
621 &src_pixels[block_offset], &bi, s->skip_frame_thresh) != 0) {621 &src_pixels[block_offset], &bi, s->skip_frame_thresh) != 0) {
622 // write out skipable blocks622 // write out skippable blocks
623 if (n_blocks) {623 if (n_blocks) {
624 624
625 // write skip opcode625 // write skip opcode
libavcodec/snowenc.c+3−3
@@ -787,7 +787,7 @@ static int get_block_rd(SnowEncContext *enc, int mb_x, int mb_y, · 786 unmodified lines
787 int y1= FFMIN(block_h*2, h-sy);787 int y1= FFMIN(block_h*2, h-sy);
788 int i,x,y;788 int i,x,y;
789 789
790 av_assert2(s->chroma_h_shift == s->chroma_v_shift); //obmc and square assumtions below chckinhg only block_w790 av_assert2(s->chroma_h_shift == s->chroma_v_shift); //obmc and square assumptions below chckinhg only block_w
791 791
792 ff_snow_pred_block(s, cur, tmp, ref_stride, sx, sy, block_w*2, block_h*2, &s->block[mb_x + mb_y*b_stride], plane_index, w, h);792 ff_snow_pred_block(s, cur, tmp, ref_stride, sx, sy, block_w*2, block_h*2, &s->block[mb_x + mb_y*b_stride], plane_index, w, h);
793 793
@@ -884,7 +884,7 @@ static int get_4block_rd(SnowEncContext *enc, int mb_x, int mb_y, int plane_inde · 90 unmodified lines
884 int rate= 0;884 int rate= 0;
885 const int penalty_factor= get_penalty_factor(enc->lambda, enc->lambda2, s->avctx->me_cmp);885 const int penalty_factor= get_penalty_factor(enc->lambda, enc->lambda2, s->avctx->me_cmp);
886 886
887 av_assert2(s->chroma_h_shift == s->chroma_v_shift); //obmc and square assumtions below887 av_assert2(s->chroma_h_shift == s->chroma_v_shift); //obmc and square assumptions below
888 888
889 for(i=0; i<9; i++){889 for(i=0; i<9; i++){
890 int mb_x2= mb_x + (i%3) - 1;890 int mb_x2= mb_x + (i%3) - 1;
@@ -2108,7 +2108,7 @@ static const AVOption options[] = { · 1217 unmodified lines
2108 { "iter", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ITER }, 0, 0, VE, .unit = "motion_est" },2108 { "iter", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ITER }, 0, 0, VE, .unit = "motion_est" },
2109 { "memc_only", "Only do ME/MC (I frames -> ref, P frame -> ME+MC).", OFFSET(memc_only), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },2109 { "memc_only", "Only do ME/MC (I frames -> ref, P frame -> ME+MC).", OFFSET(memc_only), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
2110 { "no_bitstream", "Skip final bitstream writeout.", OFFSET(no_bitstream), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },2110 { "no_bitstream", "Skip final bitstream writeout.", OFFSET(no_bitstream), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
2111 { "intra_penalty", "Penalty for intra blocks in block decission", OFFSET(intra_penalty), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },2111 { "intra_penalty", "Penalty for intra blocks in block decision", OFFSET(intra_penalty), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
2112 { "iterative_dia_size", "Dia size for the iterative ME", OFFSET(iterative_dia_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },2112 { "iterative_dia_size", "Dia size for the iterative ME", OFFSET(iterative_dia_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
2113 { "sc_threshold", "Scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, VE },2113 { "sc_threshold", "Scene change threshold", OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX, VE },
2114 { "pred", "Spatial decomposition type", OFFSET(pred), AV_OPT_TYPE_INT, { .i64 = 0 }, DWT_97, DWT_53, VE, .unit = "pred" },2114 { "pred", "Spatial decomposition type", OFFSET(pred), AV_OPT_TYPE_INT, { .i64 = 0 }, DWT_97, DWT_53, VE, .unit = "pred" },
libavcodec/speexdec.c+1−1
@@ -1299,7 +1299,7 @@ static int sb_decode(AVCodecContext *avctx, void *ptr_st, · 1298 unmodified lines
1299 lsp_interpolate(st->old_qlsp, qlsp, interp_qlsp, st->lpc_size, sub, st->nb_subframes, 0.05f);1299 lsp_interpolate(st->old_qlsp, qlsp, interp_qlsp, st->lpc_size, sub, st->nb_subframes, 0.05f);
1300 lsp_to_lpc(interp_qlsp, ak, st->lpc_size);1300 lsp_to_lpc(interp_qlsp, ak, st->lpc_size);
1301 1301
1302 /* Calculate reponse ratio between the low and high filter in the middle1302 /* Calculate response ratio between the low and high filter in the middle
1303 of the band (4000 Hz) */1303 of the band (4000 Hz) */
1304 st->pi_gain[sub] = 1.f;1304 st->pi_gain[sub] = 1.f;
1305 rh = 1.f;1305 rh = 1.f;
libavcodec/tests/apv.c+1−1
@@ -285,7 +285,7 @@ static int random_coeff(AVLFG *lfg) · 284 unmodified lines
285 285
286static int random_run(AVLFG *lfg)286static int random_run(AVLFG *lfg)
287{287{
288 // Expoenential distrbution of run lengths.288 // Expoenential distribution of run lengths.
289 unsigned int random = av_lfg_get(lfg);289 unsigned int random = av_lfg_get(lfg);
290 for (int len = 0;; len++) {290 for (int len = 0;; len++) {
291 if (random & (1 << len))291 if (random & (1 << len))
libavcodec/tests/avpacket.c+1−1
@@ -87,7 +87,7 @@ int main(void) · 86 unmodified lines
87 /* test av_packet_alloc */87 /* test av_packet_alloc */
88 avpkt = av_packet_alloc();88 avpkt = av_packet_alloc();
89 if(!avpkt) {89 if(!avpkt) {
90 av_log(NULL, AV_LOG_ERROR, "av_packet_alloc failed to allcoate AVPacket\n");90 av_log(NULL, AV_LOG_ERROR, "av_packet_alloc failed to allocate AVPacket\n");
91 return 1;91 return 1;
92 }92 }
93 93
libavcodec/tests/jpeg2000dwt.c+2−2
@@ -58,7 +58,7 @@ static int test_dwt(int *array, int *ref, int border[2][2], int decomp_levels, i · 57 unmodified lines
58 }58 }
59 for (j = 0; j<MAX_W * MAX_W; j++) {59 for (j = 0; j<MAX_W * MAX_W; j++) {
60 if (FFABS(array[j] - (int64_t)ref[j]) > max_diff) {60 if (FFABS(array[j] - (int64_t)ref[j]) > max_diff) {
61 fprintf(stderr, "missmatch at %d (%d != %d) decomp:%d border %d %d %d %d\n",61 fprintf(stderr, "mismatch at %d (%d != %d) decomp:%d border %d %d %d %d\n",
62 j, array[j], ref[j],decomp_levels, border[0][0], border[0][1], border[1][0], border[1][1]);62 j, array[j], ref[j],decomp_levels, border[0][0], border[0][1], border[1][0], border[1][1]);
63 return 2;63 return 2;
64 }64 }
@@ -97,7 +97,7 @@ static int test_dwtf(float *array, float *ref, int border[2][2], int decomp_leve · 32 unmodified lines
97 }97 }
98 for (j = 0; j<MAX_W * MAX_W; j++) {98 for (j = 0; j<MAX_W * MAX_W; j++) {
99 if (FFABS(array[j] - ref[j]) > max_diff) {99 if (FFABS(array[j] - ref[j]) > max_diff) {
100 fprintf(stderr, "missmatch at %d (%f != %f) decomp:%d border %d %d %d %d\n",100 fprintf(stderr, "mismatch at %d (%f != %f) decomp:%d border %d %d %d %d\n",
101 j, array[j], ref[j],decomp_levels, border[0][0], border[0][1], border[1][0], border[1][1]);101 j, array[j], ref[j],decomp_levels, border[0][0], border[0][1], border[1][0], border[1][1]);
102 return 2;102 return 2;
103 }103 }
libavcodec/utils.c+1−1
@@ -336,7 +336,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, · 335 unmodified lines
336 336
337 // H.264 uses edge emulation for out of frame motion vectors, for this337 // H.264 uses edge emulation for out of frame motion vectors, for this
338 // it requires a temporary area large enough to hold a 21x21 block,338 // it requires a temporary area large enough to hold a 21x21 block,
339 // increasing witdth ensure that the temporary area is large enough,339 // increasing width ensure that the temporary area is large enough,
340 // the next rounded up width is 32340 // the next rounded up width is 32
341 *width = FFMAX(*width, 32);341 *width = FFMAX(*width, 32);
342 }342 }
libavcodec/v4l2_context.h+1−1
@@ -124,7 +124,7 @@ int ff_v4l2_context_get_format(V4L2Context* ctx, int probe); · 123 unmodified lines
124 * Releases a V4L2Context.124 * Releases a V4L2Context.
125 *125 *
126 * @param[in] ctx A pointer to a V4L2Context.126 * @param[in] ctx A pointer to a V4L2Context.
127 * The caller is reponsible for freeing it.127 * The caller is responsible for freeing it.
128 * It must not be used after calling this function.128 * It must not be used after calling this function.
129 */129 */
130void ff_v4l2_context_release(V4L2Context* ctx);130void ff_v4l2_context_release(V4L2Context* ctx);
libavcodec/v4l2_m2m_dec.c+1−1
@@ -164,7 +164,7 @@ static int v4l2_receive_frame(AVCodecContext *avctx, AVFrame *frame) · 163 unmodified lines
164 if (!s->draining) {164 if (!s->draining) {
165 ret = v4l2_try_start(avctx);165 ret = v4l2_try_start(avctx);
166 if (ret) {166 if (ret) {
167 /* cant recover */167 /* can't recover */
168 if (ret != AVERROR(ENOMEM))168 if (ret != AVERROR(ENOMEM))
169 ret = 0;169 ret = 0;
170 goto fail;170 goto fail;
libavcodec/v4l2_m2m_enc.c+1−1
@@ -187,7 +187,7 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) · 186 unmodified lines
187 return ret;187 return ret;
188 188
189 /**189 /**
190 * settingss190 * settings
191 */191 */
192 if (avctx->framerate.num || avctx->framerate.den)192 if (avctx->framerate.num || avctx->framerate.den)
193 v4l2_set_timeperframe(s, avctx->framerate.den, avctx->framerate.num);193 v4l2_set_timeperframe(s, avctx->framerate.den, avctx->framerate.num);
libavcodec/vaapi_encode_h265.c+1−1
@@ -526,7 +526,7 @@ static int vaapi_encode_h265_init_picture_params(AVCodecContext *avctx, · 525 unmodified lines
526 priv->sei_needed = 0;526 priv->sei_needed = 0;
527 527
528 // Only look for the metadata on I/IDR frame on the output. We528 // Only look for the metadata on I/IDR frame on the output. We
529 // may force an IDR frame on the output where the medadata gets529 // may force an IDR frame on the output where the metadata gets
530 // changed on the input frame.530 // changed on the input frame.
531 if ((priv->sei & SEI_MASTERING_DISPLAY) &&531 if ((priv->sei & SEI_MASTERING_DISPLAY) &&
532 (pic->type == FF_HW_PICTURE_TYPE_I || pic->type == FF_HW_PICTURE_TYPE_IDR)) {532 (pic->type == FF_HW_PICTURE_TYPE_I || pic->type == FF_HW_PICTURE_TYPE_IDR)) {
libavcodec/vbndec.c+1−1
@@ -142,7 +142,7 @@ static int vbn_decode_frame(AVCodecContext *avctx, · 141 unmodified lines
142 return image_len;142 return image_len;
143 143
144 if (image_len < linesize * avctx->coded_height) {144 if (image_len < linesize * avctx->coded_height) {
145 av_log(avctx, AV_LOG_ERROR, "Insufficent data\n");145 av_log(avctx, AV_LOG_ERROR, "Insufficient data\n");
146 ret = AVERROR_INVALIDDATA;146 ret = AVERROR_INVALIDDATA;
147 goto out;147 goto out;
148 }148 }
libavcodec/vc2enc.c+1−1
@@ -621,7 +621,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) · 620 unmodified lines
621 return bits;621 return bits;
622}622}
623 623
624/* Approaches the best possible quantizer asymptotically, its kinda exaustive624/* Approaches the best possible quantizer asymptotically, its kinda exhaustive
625 * but we have a LUT to get the coefficient size in bits. Guaranteed to never625 * but we have a LUT to get the coefficient size in bits. Guaranteed to never
626 * overshoot, which is apparently very important when streaming */626 * overshoot, which is apparently very important when streaming */
627static int rate_control(AVCodecContext *avctx, void *arg)627static int rate_control(AVCodecContext *avctx, void *arg)
libavcodec/vlc.c+1−1
@@ -491,7 +491,7 @@ static int vlc_multi_gen(VLC_MULTI_ELEM *table, const VLC *single, · 490 unmodified lines
491 // We can only add a code that fits with the shortest other code into the table491 // We can only add a code that fits with the shortest other code into the table
492 // We assume the table is sorted by bits and we skip subtables which from our492 // We assume the table is sorted by bits and we skip subtables which from our
493 // point of view are basically random corrupted entries493 // point of view are basically random corrupted entries
494 // If we have not a single useable vlc we end with max = nb_codes494 // If we have not a single usable vlc we end with max = nb_codes
495 if (buf[max - 1].bits+minbits > numbits)495 if (buf[max - 1].bits+minbits > numbits)
496 break;496 break;
497 }497 }
libavcodec/vorbisdec.c+2−2
@@ -375,13 +375,13 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) · 374 unmodified lines
375 }375 }
376 ff_dlog(NULL, " We expect %d numbers for building the codevectors. \n",376 ff_dlog(NULL, " We expect %d numbers for building the codevectors. \n",
377 codebook_lookup_values);377 codebook_lookup_values);
378 ff_dlog(NULL, " delta %f minmum %f \n",378 ff_dlog(NULL, " delta %f minimum %f \n",
379 codebook_delta_value, codebook_minimum_value);379 codebook_delta_value, codebook_minimum_value);
380 380
381 for (i = 0; i < codebook_lookup_values; ++i) {381 for (i = 0; i < codebook_lookup_values; ++i) {
382 codebook_multiplicands[i] = get_bits(gb, codebook_value_bits);382 codebook_multiplicands[i] = get_bits(gb, codebook_value_bits);
383 383
384 ff_dlog(NULL, " multiplicands*delta+minmum : %e \n",384 ff_dlog(NULL, " multiplicands*delta+minimum : %e \n",
385 (float)codebook_multiplicands[i] * codebook_delta_value + codebook_minimum_value);385 (float)codebook_multiplicands[i] * codebook_delta_value + codebook_minimum_value);
386 ff_dlog(NULL, " multiplicand %u\n", codebook_multiplicands[i]);386 ff_dlog(NULL, " multiplicand %u\n", codebook_multiplicands[i]);
387 }387 }
libavcodec/vp3.c+1−1
@@ -2713,7 +2713,7 @@ static int vp3_decode_frame(AVCodecContext *avctx, AVFrame *frame, · 2712 unmodified lines
2713 mb_height_mul = get_bits(&gb, 5);2713 mb_height_mul = get_bits(&gb, 5);
2714 mb_height_div = get_bits(&gb, 3);2714 mb_height_div = get_bits(&gb, 3);
2715 if (mb_width_mul != 1 || mb_width_div != 1 || mb_height_mul != 1 || mb_height_div != 1)2715 if (mb_width_mul != 1 || mb_width_div != 1 || mb_height_mul != 1 || mb_height_div != 1)
2716 avpriv_request_sample(s->avctx, "unexpected macroblock dimension multipler/divider");2716 avpriv_request_sample(s->avctx, "unexpected macroblock dimension multiplier/divider");
2717 2717
2718 if (get_bits(&gb, 2))2718 if (get_bits(&gb, 2))
2719 avpriv_request_sample(s->avctx, "unknown bits");2719 avpriv_request_sample(s->avctx, "unknown bits");
libavcodec/vp8.c+3−3
@@ -733,7 +733,7 @@ static int vp8_decode_frame_header(VP8Context *s, const uint8_t *buf, int buf_si · 732 unmodified lines
733 int height = s->avctx->height;733 int height = s->avctx->height;
734 734
735 if (buf_size < 3) {735 if (buf_size < 3) {
736 av_log(s->avctx, AV_LOG_ERROR, "Insufficent data (%d) for header\n", buf_size);736 av_log(s->avctx, AV_LOG_ERROR, "Insufficient data (%d) for header\n", buf_size);
737 return AVERROR_INVALIDDATA;737 return AVERROR_INVALIDDATA;
738 }738 }
739 739
@@ -2416,7 +2416,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void · 1676 unmodified lines
2416 mb = s->macroblocks_base + ((s->mb_width + 1) * (mb_y + 1) + 1);2416 mb = s->macroblocks_base + ((s->mb_width + 1) * (mb_y + 1) + 1);
2417 else {2417 else {
2418 // Make sure the previous frame has read its segmentation map,2418 // Make sure the previous frame has read its segmentation map,
2419 // if we re-use the same map.2419 // if we reuse the same map.
2420 if (prev_frame && s->segmentation.enabled &&2420 if (prev_frame && s->segmentation.enabled &&
2421 !s->segmentation.update_map)2421 !s->segmentation.update_map)
2422 ff_progress_frame_await(&prev_frame->tf, mb_y);2422 ff_progress_frame_await(&prev_frame->tf, mb_y);
@@ -2761,7 +2761,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, · 338 unmodified lines
2761 2761
2762 if (s->mb_layout == 1) {2762 if (s->mb_layout == 1) {
2763 // Make sure the previous frame has read its segmentation map,2763 // Make sure the previous frame has read its segmentation map,
2764 // if we re-use the same map.2764 // if we reuse the same map.
2765 if (prev_frame && s->segmentation.enabled &&2765 if (prev_frame && s->segmentation.enabled &&
2766 !s->segmentation.update_map)2766 !s->segmentation.update_map)
2767 ff_progress_frame_await(&prev_frame->tf, 1);2767 ff_progress_frame_await(&prev_frame->tf, 1);
libavcodec/vulkan/rangecoder.comp+1−1
@@ -189,7 +189,7 @@ void rac_init_dec(out RangeCoder r, u8buf data, uint buf_size) · 188 unmodified lines
189 rac_init(r, OFFBUF(u8buf, data, 2), buf_size - 2);189 rac_init(r, OFFBUF(u8buf, data, 2), buf_size - 2);
190 190
191 u8vec2 prime = u8vec2buf(data).v;191 u8vec2 prime = u8vec2buf(data).v;
192 /* Switch endianess of the priming bytes */192 /* Switch endianness of the priming bytes */
193 r.low = pack16(prime.yx);193 r.low = pack16(prime.yx);
194 194
195 if (r.low >= 0xFF00) {195 if (r.low >= 0xFF00) {
libavcodec/vulkan_decode.c+1−1
@@ -1327,7 +1327,7 @@ int ff_vk_decode_init(AVCodecContext *avctx) · 1326 unmodified lines
1327 1327
1328 ff_vk_decode_flush(avctx);1328 ff_vk_decode_flush(avctx);
1329 1329
1330 av_log(avctx, AV_LOG_VERBOSE, "Vulkan decoder initialization sucessful\n");1330 av_log(avctx, AV_LOG_VERBOSE, "Vulkan decoder initialization successful\n");
1331 1331
1332 return 0;1332 return 0;
1333 1333
libavcodec/vulkan_encode_h265.c+1−1
@@ -207,7 +207,7 @@ static int vk_enc_h265_update_pic_info(AVCodecContext *avctx, · 206 unmodified lines
207 }207 }
208 208
209 // Only look for the metadata on I/IDR frame on the output. We209 // Only look for the metadata on I/IDR frame on the output. We
210 // may force an IDR frame on the output where the medadata gets210 // may force an IDR frame on the output where the metadata gets
211 // changed on the input frame.211 // changed on the input frame.
212 if ((enc->unit_elems & UNIT_SEI_MASTERING_DISPLAY) &&212 if ((enc->unit_elems & UNIT_SEI_MASTERING_DISPLAY) &&
213 (pic->type == FF_HW_PICTURE_TYPE_I || pic->type == FF_HW_PICTURE_TYPE_IDR)) {213 (pic->type == FF_HW_PICTURE_TYPE_I || pic->type == FF_HW_PICTURE_TYPE_IDR)) {
libavcodec/vvc/intra_utils.c+1−1
@@ -193,7 +193,7 @@ int ff_vvc_intra_inv_angle_derive(const int intra_pred_angle) · 192 unmodified lines
193 return -ROUNDED_DIV(32*512, -intra_pred_angle);193 return -ROUNDED_DIV(32*512, -intra_pred_angle);
194}194}
195 195
196//8.4.5.2.7 Wide angle intra prediction mode mapping proces196//8.4.5.2.7 Wide angle intra prediction mode mapping process
197int ff_vvc_wide_angle_mode_mapping(const CodingUnit *cu,197int ff_vvc_wide_angle_mode_mapping(const CodingUnit *cu,
198 const int tb_width, const int tb_height, const int c_idx, int pred_mode_intra)198 const int tb_width, const int tb_height, const int c_idx, int pred_mode_intra)
199{199{
libavcodec/vvc/mvs.c+1−1
@@ -926,7 +926,7 @@ static void affine_cps_from_nb(const VVCLocalContext *lc, · 925 unmodified lines
926 }926 }
927}927}
928 928
929//derive affine neighbour's postion, width and height,929//derive affine neighbour's position, width and height,
930static int affine_neighbour_cb(const VVCFrameContext *fc, const int x_nb, const int y_nb, int *x_cb, int *y_cb, int *cbw, int *cbh)930static int affine_neighbour_cb(const VVCFrameContext *fc, const int x_nb, const int y_nb, int *x_cb, int *y_cb, int *cbw, int *cbh)
931{931{
932 const int log2_min_cb_size = fc->ps.sps->min_cb_log2_size_y;932 const int log2_min_cb_size = fc->ps.sps->min_cb_log2_size_y;
libavcodec/vvc_parser.c+2−2
@@ -300,14 +300,14 @@ static int get_pu_info(PuInfo *info, const CodedBitstreamH266Context *h266, · 299 unmodified lines
300 }300 }
301 info->pps = h266->pps[info->ph->ph_pic_parameter_set_id];301 info->pps = h266->pps[info->ph->ph_pic_parameter_set_id];
302 if (!info->pps) {302 if (!info->pps) {
303 av_log(logctx, AV_LOG_ERROR, "PPS id %d is not avaliable.\n",303 av_log(logctx, AV_LOG_ERROR, "PPS id %d is not available.\n",
304 info->ph->ph_pic_parameter_set_id);304 info->ph->ph_pic_parameter_set_id);
305 ret = AVERROR_INVALIDDATA;305 ret = AVERROR_INVALIDDATA;
306 goto error;306 goto error;
307 }307 }
308 info->sps = h266->sps[info->pps->pps_seq_parameter_set_id];308 info->sps = h266->sps[info->pps->pps_seq_parameter_set_id];
309 if (!info->sps) {309 if (!info->sps) {
310 av_log(logctx, AV_LOG_ERROR, "SPS id %d is not avaliable.\n",310 av_log(logctx, AV_LOG_ERROR, "SPS id %d is not available.\n",
311 info->pps->pps_seq_parameter_set_id);311 info->pps->pps_seq_parameter_set_id);
312 ret = AVERROR_INVALIDDATA;312 ret = AVERROR_INVALIDDATA;
313 goto error;313 goto error;
libavcodec/x86/celt_pvq_search.asm+1−1
@@ -104,7 +104,7 @@ align 16 · 103 unmodified lines
104 addps m5, m7 ; m5 = Sxy_new = X[i] + Sxy_norm104 addps m5, m7 ; m5 = Sxy_new = X[i] + Sxy_norm
105 105
106 %if USE_APPROXIMATION == 1106 %if USE_APPROXIMATION == 1
107 andps m5, m0 ; if(X[i] == 0) Sxy_new = 0; Prevent aproximation error from setting pulses in array padding.107 andps m5, m0 ; if(X[i] == 0) Sxy_new = 0; Prevent approximation error from setting pulses in array padding.
108 %endif108 %endif
109 109
110%else110%else
libavcodec/x86/dirac_dwt.asm+1−1
@@ -1,5 +1,5 @@
1;******************************************************************************1;******************************************************************************
2;* x86 optimized discrete wavelet trasnform2;* x86 optimized discrete wavelet transform
3;* Copyright (c) 2010 David Conrad3;* Copyright (c) 2010 David Conrad
4;*4;*
5;* This file is part of FFmpeg.5;* This file is part of FFmpeg.
libavcodec/x86/hevc/idct.asm+1−1
@@ -532,7 +532,7 @@ cglobal hevc_idct_8x8_%1, 1, 1, 8, coeffs · 531 unmodified lines
532; %1, %2 - transform constants532; %1, %2 - transform constants
533; %3, %4 - regs with interleaved coeffs533; %3, %4 - regs with interleaved coeffs
534; %5 - 1/0 SWAP or add534; %5 - 1/0 SWAP or add
535; %6, %7 - registers for intermidiate sums535; %6, %7 - registers for intermediate sums
536; %8 - accumulator register536; %8 - accumulator register
537%macro ADD_ROWS 8537%macro ADD_ROWS 8
538 pmaddwd %6, %3, %1538 pmaddwd %6, %3, %1
libavcodec/x86/vp9itxfm_16bpp_avx512.asm+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26 26
27SECTION_RODATA 6427SECTION_RODATA 64
28 28
29; Thw following set of constants are ordered to form the29; The following set of constants are ordered to form the
30; qword shuffle mask { 0, 2, 4, 6, 1, 3, 5, 7 }30; qword shuffle mask { 0, 2, 4, 6, 1, 3, 5, 7 }
31%define deintq_perm pd_552031%define deintq_perm pd_5520
32pd_5520: dd 552032pd_5520: dd 5520
libavdevice/audiotoolbox.m+1−1
@@ -247,7 +247,7 @@ static int at_write_packet(AVFormatContext *avctx, AVPacket *pkt) · 246 unmodified lines
247 // will be unlocked by queue callback247 // will be unlocked by queue callback
248 pthread_mutex_lock(&ctx->buffer_lock[ctx->cur_buf]);248 pthread_mutex_lock(&ctx->buffer_lock[ctx->cur_buf]);
249 249
250 // (re-)allocate the buffer if not existant or of different size250 // (re-)allocate the buffer if not existent or of different size
251 if (!ctx->buffer[ctx->cur_buf] || ctx->buffer[ctx->cur_buf]->mAudioDataBytesCapacity != pkt->size) {251 if (!ctx->buffer[ctx->cur_buf] || ctx->buffer[ctx->cur_buf]->mAudioDataBytesCapacity != pkt->size) {
252 err = AudioQueueAllocateBuffer(ctx->queue, pkt->size, &ctx->buffer[ctx->cur_buf]);252 err = AudioQueueAllocateBuffer(ctx->queue, pkt->size, &ctx->buffer[ctx->cur_buf]);
253 if (check_status(avctx, &err, "AudioQueueAllocateBuffer")) {253 if (check_status(avctx, &err, "AudioQueueAllocateBuffer")) {
libavdevice/avdevice.h+1−1
@@ -372,7 +372,7 @@ void avdevice_free_list_devices(AVDeviceInfoList **device_list); · 371 unmodified lines
372 * List devices.372 * List devices.
373 *373 *
374 * Returns available device names and their parameters.374 * Returns available device names and their parameters.
375 * These are convinient wrappers for avdevice_list_devices().375 * These are convenient wrappers for avdevice_list_devices().
376 * Device context is allocated and deallocated internally.376 * Device context is allocated and deallocated internally.
377 *377 *
378 * @param device device format. May be NULL if device name is set.378 * @param device device format. May be NULL if device name is set.
libavdevice/xcbgrab.c+1−1
@@ -830,7 +830,7 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s) · 829 unmodified lines
830 *display_name = 0;830 *display_name = 0;
831 if(sscanf(s->url, "+%d,%d", &c->x, &c->y) != 2) {831 if(sscanf(s->url, "+%d,%d", &c->x, &c->y) != 2) {
832 if (*s->url)832 if (*s->url)
833 av_log(s, AV_LOG_WARNING, "Ambigous URL: %s\n", s->url);833 av_log(s, AV_LOG_WARNING, "Ambiguous URL: %s\n", s->url);
834 }834 }
835 }835 }
836 836
libavfilter/aarch64/vf_bwdif_neon.S+1−1
@@ -148,7 +148,7 @@ · 147 unmodified lines
148// static const uint16_t coef_hf[3] = { 5570, 3801, 1016 };148// static const uint16_t coef_hf[3] = { 5570, 3801, 1016 };
149// static const uint16_t coef_sp[2] = { 5077, 981 };149// static const uint16_t coef_sp[2] = { 5077, 981 };
150 150
151const coeffs, align=4 // align 4 means align on 2^4 boundry151const coeffs, align=4 // align 4 means align on 2^4 boundary
152 .hword 4309 * 4, 213 * 4 // lf[0]*4 = v0.h[0]152 .hword 4309 * 4, 213 * 4 // lf[0]*4 = v0.h[0]
153 .hword 5570, 3801, 1016, -3801 // hf[0] = v0.h[2], -hf[1] = v0.h[5]153 .hword 5570, 3801, 1016, -3801 // hf[0] = v0.h[2], -hf[1] = v0.h[5]
154 .hword 5077, 981 // sp[0] = v0.h[6]154 .hword 5077, 981 // sp[0] = v0.h[6]
libavfilter/af_astats.c+2−2
@@ -836,7 +836,7 @@ static void print_stats(AVFilterContext *ctx) · 835 unmodified lines
836 av_log(ctx, AV_LOG_INFO, "RMS peak dB: %f\n", LINEAR_TO_DB(sqrt(p->max_sigma_x2)));836 av_log(ctx, AV_LOG_INFO, "RMS peak dB: %f\n", LINEAR_TO_DB(sqrt(p->max_sigma_x2)));
837 if (s->measure_perchannel & MEASURE_RMS_TROUGH)837 if (s->measure_perchannel & MEASURE_RMS_TROUGH)
838 if (p->min_sigma_x2 != 1)838 if (p->min_sigma_x2 != 1)
839 av_log(ctx, AV_LOG_INFO, "RMS trough dB: %f\n",LINEAR_TO_DB(sqrt(p->min_sigma_x2)));839 av_log(ctx, AV_LOG_INFO, "RMS through dB: %f\n",LINEAR_TO_DB(sqrt(p->min_sigma_x2)));
840 if (s->measure_perchannel & MEASURE_CREST_FACTOR)840 if (s->measure_perchannel & MEASURE_CREST_FACTOR)
841 av_log(ctx, AV_LOG_INFO, "Crest factor: %f\n", p->sigma_x2 ? FFMAX(-p->nmin, p->nmax) / sqrt(p->sigma_x2 / p->nb_samples) : 1);841 av_log(ctx, AV_LOG_INFO, "Crest factor: %f\n", p->sigma_x2 ? FFMAX(-p->nmin, p->nmax) / sqrt(p->sigma_x2 / p->nb_samples) : 1);
842 if (s->measure_perchannel & MEASURE_FLAT_FACTOR)842 if (s->measure_perchannel & MEASURE_FLAT_FACTOR)
@@ -896,7 +896,7 @@ static void print_stats(AVFilterContext *ctx) · 53 unmodified lines
896 av_log(ctx, AV_LOG_INFO, "RMS peak dB: %f\n", LINEAR_TO_DB(sqrt(max_sigma_x2)));896 av_log(ctx, AV_LOG_INFO, "RMS peak dB: %f\n", LINEAR_TO_DB(sqrt(max_sigma_x2)));
897 if (s->measure_overall & MEASURE_RMS_TROUGH)897 if (s->measure_overall & MEASURE_RMS_TROUGH)
898 if (min_sigma_x2 != 1)898 if (min_sigma_x2 != 1)
899 av_log(ctx, AV_LOG_INFO, "RMS trough dB: %f\n", LINEAR_TO_DB(sqrt(min_sigma_x2)));899 av_log(ctx, AV_LOG_INFO, "RMS through dB: %f\n", LINEAR_TO_DB(sqrt(min_sigma_x2)));
900 if (s->measure_overall & MEASURE_FLAT_FACTOR)900 if (s->measure_overall & MEASURE_FLAT_FACTOR)
901 av_log(ctx, AV_LOG_INFO, "Flat factor: %f\n", LINEAR_TO_DB((min_runs + max_runs) / (min_count + max_count)));901 av_log(ctx, AV_LOG_INFO, "Flat factor: %f\n", LINEAR_TO_DB((min_runs + max_runs) / (min_count + max_count)));
902 if (s->measure_overall & MEASURE_PEAK_COUNT)902 if (s->measure_overall & MEASURE_PEAK_COUNT)
libavfilter/af_atempo.c+1−1
@@ -112,7 +112,7 @@ typedef struct ATempoContext { · 111 unmodified lines
112 // number of channels:112 // number of channels:
113 int channels;113 int channels;
114 114
115 // row of bytes to skip from one sample to next, across multple channels;115 // row of bytes to skip from one sample to next, across multiple channels;
116 // stride = (number-of-channels * bits-per-sample-per-channel) / 8116 // stride = (number-of-channels * bits-per-sample-per-channel) / 8
117 int stride;117 int stride;
118 118
libavfilter/af_drmeter.c+1−1
@@ -138,7 +138,7 @@ static void print_stats(AVFilterContext *ctx) · 137 unmodified lines
138 int peak_bin = BINS;138 int peak_bin = BINS;
139 139
140 if (!p->nb_samples) {140 if (!p->nb_samples) {
141 av_log(ctx, AV_LOG_INFO, "No data, dynamic range not meassurable\n");141 av_log(ctx, AV_LOG_INFO, "No data, dynamic range not measurable\n");
142 return;142 return;
143 }143 }
144 144
libavfilter/af_sofalizer.c+2−2
@@ -734,7 +734,7 @@ static int load_data(AVFilterContext *ctx, int azim, int elev, float radius, int · 733 unmodified lines
734 AVComplexFloat *fft_in_r = NULL;734 AVComplexFloat *fft_in_r = NULL;
735 float *data_ir_l = NULL;735 float *data_ir_l = NULL;
736 float *data_ir_r = NULL;736 float *data_ir_r = NULL;
737 int offset = 0; /* used for faster pointer arithmetics in for-loop */737 int offset = 0; /* used for faster pointer arithmetic in for-loop */
738 int i, j, azim_orig = azim, elev_orig = elev;738 int i, j, azim_orig = azim, elev_orig = elev;
739 int ret = 0;739 int ret = 0;
740 int n_current;740 int n_current;
@@ -954,7 +954,7 @@ fail: · 213 unmodified lines
954 av_freep(&data_hrtf_l); /* free temporary HRTF memory */954 av_freep(&data_hrtf_l); /* free temporary HRTF memory */
955 av_freep(&data_hrtf_r);955 av_freep(&data_hrtf_r);
956 956
957 av_freep(&data_ir_l); /* free temprary IR memory */957 av_freep(&data_ir_l); /* free temporary IR memory */
958 av_freep(&data_ir_r);958 av_freep(&data_ir_r);
959 959
960 av_freep(&fft_out_l); /* free temporary FFT memory */960 av_freep(&fft_out_l); /* free temporary FFT memory */
libavfilter/avf_showcqt.c+1−1
@@ -619,7 +619,7 @@ static int render_fontconfig(ShowCQTContext *s, AVFrame *tmp, char* font) · 618 unmodified lines
619 FcDefaultSubstitute(pat);619 FcDefaultSubstitute(pat);
620 620
621 if (!FcConfigSubstitute(fontconfig, pat, FcMatchPattern)) {621 if (!FcConfigSubstitute(fontconfig, pat, FcMatchPattern)) {
622 av_log(s->ctx, AV_LOG_ERROR, "could not substitue fontconfig options.\n");622 av_log(s->ctx, AV_LOG_ERROR, "could not substitute fontconfig options.\n");
623 FcPatternDestroy(pat);623 FcPatternDestroy(pat);
624 FcConfigDestroy(fontconfig);624 FcConfigDestroy(fontconfig);
625 return AVERROR(ENOMEM);625 return AVERROR(ENOMEM);
libavfilter/avfilter.h+2−2
@@ -898,7 +898,7 @@ typedef struct AVFilterParams { · 897 unmodified lines
898 char *instance_name;898 char *instance_name;
899 899
900 /**900 /**
901 * Options to be apllied to the filter.901 * Options to be applied to the filter.
902 *902 *
903 * Filled by avfilter_graph_segment_parse(). Afterwards may be freely903 * Filled by avfilter_graph_segment_parse(). Afterwards may be freely
904 * modified by the caller.904 * modified by the caller.
@@ -1081,7 +1081,7 @@ int avfilter_graph_segment_init(AVFilterGraphSegment *seg, int flags); · 176 unmodified lines
1081 * Unlabeled outputs are1081 * Unlabeled outputs are
1082 * - linked to the first unlinked unlabeled input in the next non-disabled1082 * - linked to the first unlinked unlabeled input in the next non-disabled
1083 * filter in the chain, if one exists1083 * filter in the chain, if one exists
1084 * - exported in the ouputs linked list otherwise, with NULL label1084 * - exported in the outputs linked list otherwise, with NULL label
1085 *1085 *
1086 * Similarly, unlinked input pads are exported in the inputs linked list.1086 * Similarly, unlinked input pads are exported in the inputs linked list.
1087 *1087 *
libavfilter/dnn/dnn_backend_openvino.c+2−2
@@ -1331,7 +1331,7 @@ static int get_output_ov(DNNModel *model, const char *input_name, int input_widt · 1330 unmodified lines
1331#endif1331#endif
1332 ret = init_model_ov(ov_model, input_name, output_name ? &output_name : NULL, 1);1332 ret = init_model_ov(ov_model, input_name, output_name ? &output_name : NULL, 1);
1333 if (ret != 0) {1333 if (ret != 0) {
1334 av_log(ctx, AV_LOG_ERROR, "Failed init OpenVINO exectuable network or inference request\n");1334 av_log(ctx, AV_LOG_ERROR, "Failed init OpenVINO executable network or inference request\n");
1335 return ret;1335 return ret;
1336 }1336 }
1337 }1337 }
@@ -1487,7 +1487,7 @@ static int dnn_execute_model_ov(const DNNModel *model, DNNExecBaseParams *exec_p · 149 unmodified lines
1487 ret = init_model_ov(ov_model, exec_params->input_name,1487 ret = init_model_ov(ov_model, exec_params->input_name,
1488 exec_params->output_names, exec_params->nb_output);1488 exec_params->output_names, exec_params->nb_output);
1489 if (ret != 0) {1489 if (ret != 0) {
1490 av_log(ctx, AV_LOG_ERROR, "Failed init OpenVINO exectuable network or inference request\n");1490 av_log(ctx, AV_LOG_ERROR, "Failed init OpenVINO executable network or inference request\n");
1491 return ret;1491 return ret;
1492 }1492 }
1493 }1493 }
libavfilter/filters.h+1−1
@@ -508,7 +508,7 @@ int ff_inlink_check_available_frame(AVFilterLink *link); · 507 unmodified lines
508 508
509/***509/***
510 * Get the number of samples available on the link.510 * Get the number of samples available on the link.
511 * @return the numer of samples available on the link.511 * @return the number of samples available on the link.
512 */512 */
513int ff_inlink_queued_samples(AVFilterLink *link);513int ff_inlink_queued_samples(AVFilterLink *link);
514 514
libavfilter/framepool.h+5−5
@@ -41,7 +41,7 @@ typedef struct FFFramePool FFFramePool; · 40 unmodified lines
41 * @param width width of each frame in this pool41 * @param width width of each frame in this pool
42 * @param height height of each frame in this pool42 * @param height height of each frame in this pool
43 * @param format format of each frame in this pool43 * @param format format of each frame in this pool
44 * @param align buffers alignement of each frame in this pool44 * @param align buffers alignment of each frame in this pool
45 * @return newly created video frame pool on success, NULL on error.45 * @return newly created video frame pool on success, NULL on error.
46 */46 */
47FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size),47FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size),
@@ -59,7 +59,7 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size), · 11 unmodified lines
59 * @param channels channels of each frame in this pool59 * @param channels channels of each frame in this pool
60 * @param nb_samples number of samples of each frame in this pool60 * @param nb_samples number of samples of each frame in this pool
61 * @param format format of each frame in this pool61 * @param format format of each frame in this pool
62 * @param align buffers alignement of each frame in this pool62 * @param align buffers alignment of each frame in this pool
63 * @return newly created audio frame pool on success, NULL on error.63 * @return newly created audio frame pool on success, NULL on error.
64 */64 */
65FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(size_t size),65FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(size_t size),
@@ -82,7 +82,7 @@ void ff_frame_pool_uninit(FFFramePool **pool); · 16 unmodified lines
82 * @param width width of each frame in this pool82 * @param width width of each frame in this pool
83 * @param height height of each frame in this pool83 * @param height height of each frame in this pool
84 * @param format format of each frame in this pool84 * @param format format of each frame in this pool
85 * @param align buffers alignement of each frame in this pool85 * @param align buffers alignment of each frame in this pool
86 * @return 0 on success, a negative AVERROR otherwise.86 * @return 0 on success, a negative AVERROR otherwise.
87 */87 */
88int ff_frame_pool_get_video_config(FFFramePool *pool,88int ff_frame_pool_get_video_config(FFFramePool *pool,
@@ -97,7 +97,7 @@ int ff_frame_pool_get_video_config(FFFramePool *pool, · 8 unmodified lines
97 * @param channels channels of each frame in this pool97 * @param channels channels of each frame in this pool
98 * @param nb_samples number of samples of each frame in this pool98 * @param nb_samples number of samples of each frame in this pool
99 * @param format format of each frame in this pool99 * @param format format of each frame in this pool
100 * @param align buffers alignement of each frame in this pool100 * @param align buffers alignment of each frame in this pool
101 * @return 0 on success, a negative AVERROR otherwise.101 * @return 0 on success, a negative AVERROR otherwise.
102 */102 */
103int ff_frame_pool_get_audio_config(FFFramePool *pool,103int ff_frame_pool_get_audio_config(FFFramePool *pool,
@@ -108,7 +108,7 @@ int ff_frame_pool_get_audio_config(FFFramePool *pool, · 4 unmodified lines
108 108
109 109
110/**110/**
111 * Allocate a new AVFrame, reussing old buffers from the pool when available.111 * Allocate a new AVFrame, reusing old buffers from the pool when available.
112 * This function may be called simultaneously from multiple threads.112 * This function may be called simultaneously from multiple threads.
113 *113 *
114 * @return a new AVFrame on success, NULL on error.114 * @return a new AVFrame on success, NULL on error.
libavfilter/framesync.h+3−3
@@ -41,7 +41,7 @@ enum EOFAction { · 40 unmodified lines
41 * complex logic and a few user-tunable options.41 * complex logic and a few user-tunable options.
42 *42 *
43 * In this API, when a set of synchronized input frames is ready to be43 * In this API, when a set of synchronized input frames is ready to be
44 * procesed is called a frame event. Frame event can be generated in44 * processed is called a frame event. Frame event can be generated in
45 * response to input frames on any or all inputs and the handling of45 * response to input frames on any or all inputs and the handling of
46 * situations where some stream extend beyond the beginning or the end of46 * situations where some stream extend beyond the beginning or the end of
47 * others can be configured.47 * others can be configured.
@@ -76,9 +76,9 @@ enum FFFrameSyncExtMode { · 28 unmodified lines
76};76};
77 77
78/**78/**
79 * Timestamp syncronization mode79 * Timestamp synchronization mode
80 *80 *
81 * Describe how the frames of a stream are syncronized based on timestamp81 * Describe how the frames of a stream are synchronized based on timestamp
82 * distance.82 * distance.
83 */83 */
84enum FFFrameTSSyncMode {84enum FFFrameTSSyncMode {
libavfilter/qsvvpp.h+2−2
@@ -65,7 +65,7 @@ typedef struct QSVVPPContext { · 64 unmodified lines
65 65
66 mfxSession session;66 mfxSession session;
67 int (*filter_frame) (AVFilterLink *outlink, AVFrame *frame); /**< callback */67 int (*filter_frame) (AVFilterLink *outlink, AVFrame *frame); /**< callback */
68 int (*set_frame_ext_params)(AVFilterContext *ctx, const AVFrame *in, AVFrame *out, QSVVPPFrameParam *fp); /**< callbak */68 int (*set_frame_ext_params)(AVFilterContext *ctx, const AVFrame *in, AVFrame *out, QSVVPPFrameParam *fp); /**< callback */
69 enum AVPixelFormat out_sw_format; /**< Real output format */69 enum AVPixelFormat out_sw_format; /**< Real output format */
70 mfxVideoParam vpp_param;70 mfxVideoParam vpp_param;
71 mfxFrameInfo *frame_infos; /**< frame info for each input */71 mfxFrameInfo *frame_infos; /**< frame info for each input */
@@ -110,7 +110,7 @@ typedef struct QSVVPPCrop { · 38 unmodified lines
110typedef struct QSVVPPParam {110typedef struct QSVVPPParam {
111 /* default is ff_filter_frame */111 /* default is ff_filter_frame */
112 int (*filter_frame)(AVFilterLink *outlink, AVFrame *frame);112 int (*filter_frame)(AVFilterLink *outlink, AVFrame *frame);
113 int (*set_frame_ext_params)(AVFilterContext *ctx, const AVFrame *in, AVFrame *out, QSVVPPFrameParam *fp); /**< callbak */113 int (*set_frame_ext_params)(AVFilterContext *ctx, const AVFrame *in, AVFrame *out, QSVVPPFrameParam *fp); /**< callback */
114 114
115 /* To fill with MFX enhanced filter configurations */115 /* To fill with MFX enhanced filter configurations */
116 int num_ext_buf;116 int num_ext_buf;
libavfilter/riscv/af_afir_init.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavfilter/riscv/af_afir_rvv.S+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
libavfilter/vf_amf_common.c+1−1
@@ -176,7 +176,7 @@ int amf_setup_input_output_formats(AVFilterContext *avctx, · 175 unmodified lines
176 AVFilterFormats *input_formats;176 AVFilterFormats *input_formats;
177 AVFilterFormats *output_formats;177 AVFilterFormats *output_formats;
178 178
179 //in case if hw_device_ctx is set to DXVA2 we change order of pixel formats to set DXVA2 be choosen by default179 //in case if hw_device_ctx is set to DXVA2 we change order of pixel formats to set DXVA2 be chosen by default
180 //The order is ignored if hw_frames_ctx is not NULL on the config_output stage180 //The order is ignored if hw_frames_ctx is not NULL on the config_output stage
181 if (avctx->hw_device_ctx) {181 if (avctx->hw_device_ctx) {
182 AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data;182 AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)avctx->hw_device_ctx->data;
libavfilter/vf_bilateral_cuda.cu+2−2
@@ -28,7 +28,7 @@ extern "C" · 27 unmodified lines
28 * used float4 for better performance28 * used float4 for better performance
29 *29 *
30 * @param first_yuv first color vector30 * @param first_yuv first color vector
31 * @param second_yuv second color vecotr31 * @param second_yuv second color vector
32 * @return answer of squared norm difference32 * @return answer of squared norm difference
33 */33 */
34__device__ static inline float norm_squared(float4 first_yuv, float4 second_yuv)34__device__ static inline float norm_squared(float4 first_yuv, float4 second_yuv)
@@ -43,7 +43,7 @@ __device__ static inline float norm_squared(float4 first_yuv, float4 second_yuv) · 8 unmodified lines
43 * @brief calculate w as stated in bilateral filter research paper43 * @brief calculate w as stated in bilateral filter research paper
44 *44 *
45 * @param first_yuv first color vector45 * @param first_yuv first color vector
46 * @param second_yuv second color vecotr46 * @param second_yuv second color vector
47 * @return the calculated w47 * @return the calculated w
48 */48 */
49__device__ static inline float calculate_w(int x, int y, int r, int c,49__device__ static inline float calculate_w(int x, int y, int r, int c,
libavfilter/vf_ciescope.c+1−1
@@ -1132,7 +1132,7 @@ fill_in_tongue(uint16_t* const pixels, · 1131 unmodified lines
1132 1132
1133 /* Scan the image line by line and fill the tongue outline1133 /* Scan the image line by line and fill the tongue outline
1134 with the RGB values determined by the color system for the x-y1134 with the RGB values determined by the color system for the x-y
1135 co-ordinates within the tongue.1135 coordinates within the tongue.
1136 */1136 */
1137 1137
1138 for (y = 0; y < h; ++y) {1138 for (y = 0; y < h; ++y) {
libavfilter/vf_colorconstancy.c+9−9
@@ -176,7 +176,7 @@ static int set_gauss(AVFilterContext *ctx) · 175 unmodified lines
176 176
177/**177/**
178 * Frees up buffers used by grey edge for storing derivatives final178 * Frees up buffers used by grey edge for storing derivatives final
179 * and intermidiate results. Number of buffers and number of planes179 * and intermediate results. Number of buffers and number of planes
180 * for last buffer are given so it can be safely called at allocation180 * for last buffer are given so it can be safely called at allocation
181 * failure instances.181 * failure instances.
182 *182 *
@@ -201,7 +201,7 @@ static void cleanup_derivative_buffers(ThreadData *td, int nb_buff, int nb_plane · 18 unmodified lines
201 201
202/**202/**
203 * Allocates buffers used by grey edge for storing derivatives final203 * Allocates buffers used by grey edge for storing derivatives final
204 * and intermidiate results.204 * and intermediate results.
205 *205 *
206 * @param ctx the filter context.206 * @param ctx the filter context.
207 * @param td holds the buffers.207 * @param td holds the buffers.
@@ -236,12 +236,12 @@ static int setup_derivative_buffers(AVFilterContext* ctx, ThreadData *td) · 28 unmodified lines
236/**236/**
237 * Slice calculation of gaussian derivatives. Applies 1-D gaussian derivative filter237 * Slice calculation of gaussian derivatives. Applies 1-D gaussian derivative filter
238 * either horizontally or vertically according to meta data given in thread data.238 * either horizontally or vertically according to meta data given in thread data.
239 * When convoluting horizontally source is always the in frame withing thread data239 * When convoluting horizontally source is always the in frame within thread data
240 * while when convoluting vertically source is a buffer.240 * while when convoluting vertically source is a buffer.
241 *241 *
242 * @param ctx the filter context.242 * @param ctx the filter context.
243 * @param arg data to be passed between threads.243 * @param arg data to be passed between threads.
244 * @param jobnr current job nubmer.244 * @param jobnr current job number.
245 * @param nb_jobs total number of jobs.245 * @param nb_jobs total number of jobs.
246 *246 *
247 * @return 0.247 * @return 0.
@@ -309,7 +309,7 @@ static int slice_get_derivative(AVFilterContext* ctx, void* arg, int jobnr, int · 61 unmodified lines
309 *309 *
310 * @param ctx the filter context.310 * @param ctx the filter context.
311 * @param arg data to be passed between threads.311 * @param arg data to be passed between threads.
312 * @param jobnr current job nubmer.312 * @param jobnr current job number.
313 * @param nb_jobs total number of jobs.313 * @param nb_jobs total number of jobs.
314 *314 *
315 * @return 0.315 * @return 0.
@@ -430,7 +430,7 @@ static int get_derivative(AVFilterContext *ctx, ThreadData *td) · 114 unmodified lines
430 *430 *
431 * @param ctx the filter context.431 * @param ctx the filter context.
432 * @param arg data to be passed between threads.432 * @param arg data to be passed between threads.
433 * @param jobnr current job nubmer.433 * @param jobnr current job number.
434 * @param nb_jobs total number of jobs.434 * @param nb_jobs total number of jobs.
435 *435 *
436 * @return 0.436 * @return 0.
@@ -479,7 +479,7 @@ static int filter_slice_grey_edge(AVFilterContext* ctx, void* arg, int jobnr, in · 42 unmodified lines
479 * Main control function for grey edge algorithm.479 * Main control function for grey edge algorithm.
480 *480 *
481 * @param ctx the filter context.481 * @param ctx the filter context.
482 * @param in frame to perfrom grey edge on.482 * @param in frame to perform grey edge on.
483 *483 *
484 * @return 0 in case of success, a negative value corresponding to an484 * @return 0 in case of success, a negative value corresponding to an
485 * AVERROR code in case of failure.485 * AVERROR code in case of failure.
@@ -558,7 +558,7 @@ static void normalize_light(double *light) · 72 unmodified lines
558 * after estimation.558 * after estimation.
559 *559 *
560 * @param ctx the filter context.560 * @param ctx the filter context.
561 * @param in frame to perfrom estimation on.561 * @param in frame to perform estimation on.
562 *562 *
563 * @return 0 in case of success, a negative value corresponding to an563 * @return 0 in case of success, a negative value corresponding to an
564 * AVERROR code in case of failure.564 * AVERROR code in case of failure.
@@ -584,7 +584,7 @@ static int illumination_estimation(AVFilterContext *ctx, AVFrame *in) · 19 unmodified lines
584 *584 *
585 * @param ctx the filter context.585 * @param ctx the filter context.
586 * @param arg data to be passed between threads.586 * @param arg data to be passed between threads.
587 * @param jobnr current job nubmer.587 * @param jobnr current job number.
588 * @param nb_jobs total number of jobs.588 * @param nb_jobs total number of jobs.
589 *589 *
590 * @return 0.590 * @return 0.
libavfilter/vf_convolution_opencl.c+1−1
@@ -352,7 +352,7 @@ static const AVOption convolution_opencl_options[] = { · 351 unmodified lines
352 { "1m", "set matrix for 2nd plane", OFFSET(matrix_str[1]), AV_OPT_TYPE_STRING, {.str="0 0 0 0 1 0 0 0 0"}, 0, 0, FLAGS },352 { "1m", "set matrix for 2nd plane", OFFSET(matrix_str[1]), AV_OPT_TYPE_STRING, {.str="0 0 0 0 1 0 0 0 0"}, 0, 0, FLAGS },
353 { "2m", "set matrix for 3rd plane", OFFSET(matrix_str[2]), AV_OPT_TYPE_STRING, {.str="0 0 0 0 1 0 0 0 0"}, 0, 0, FLAGS },353 { "2m", "set matrix for 3rd plane", OFFSET(matrix_str[2]), AV_OPT_TYPE_STRING, {.str="0 0 0 0 1 0 0 0 0"}, 0, 0, FLAGS },
354 { "3m", "set matrix for 4th plane", OFFSET(matrix_str[3]), AV_OPT_TYPE_STRING, {.str="0 0 0 0 1 0 0 0 0"}, 0, 0, FLAGS },354 { "3m", "set matrix for 4th plane", OFFSET(matrix_str[3]), AV_OPT_TYPE_STRING, {.str="0 0 0 0 1 0 0 0 0"}, 0, 0, FLAGS },
355 { "0rdiv", "set rdiv for 1nd plane", OFFSET(rdivs[0]), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, INT_MAX, FLAGS},355 { "0rdiv", "set rdiv for 1st plane", OFFSET(rdivs[0]), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, INT_MAX, FLAGS},
356 { "1rdiv", "set rdiv for 2nd plane", OFFSET(rdivs[1]), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, INT_MAX, FLAGS},356 { "1rdiv", "set rdiv for 2nd plane", OFFSET(rdivs[1]), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, INT_MAX, FLAGS},
357 { "2rdiv", "set rdiv for 3rd plane", OFFSET(rdivs[2]), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, INT_MAX, FLAGS},357 { "2rdiv", "set rdiv for 3rd plane", OFFSET(rdivs[2]), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, INT_MAX, FLAGS},
358 { "3rdiv", "set rdiv for 4th plane", OFFSET(rdivs[3]), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, INT_MAX, FLAGS},358 { "3rdiv", "set rdiv for 4th plane", OFFSET(rdivs[3]), AV_OPT_TYPE_FLOAT, {.dbl=1.0}, 0.0, INT_MAX, FLAGS},
libavfilter/vf_coreimage.m+1−1
@@ -58,7 +58,7 @@ typedef struct CoreImageContext { · 57 unmodified lines
58 CFTypeRef *filters; ///< CIFilter object for all requested filters58 CFTypeRef *filters; ///< CIFilter object for all requested filters
59 int num_filters; ///< Amount of filters in *filters59 int num_filters; ///< Amount of filters in *filters
60 60
61 char *output_rect; ///< Rectangle to be filled with filter intput61 char *output_rect; ///< Rectangle to be filled with filter input
62 int list_filters; ///< Option used to list all available filters including generators62 int list_filters; ///< Option used to list all available filters including generators
63 int list_generators; ///< Option used to list all available generators63 int list_generators; ///< Option used to list all available generators
64} CoreImageContext;64} CoreImageContext;
libavfilter/vf_curves.c+1−1
@@ -493,7 +493,7 @@ static inline int interpolate_pchip(void *log_ctx, uint16_t *y, · 492 unmodified lines
493 goto end;493 goto end;
494 }494 }
495 495
496 fi = xi + n; /* output values at inteval endpoints */496 fi = xi + n; /* output values at interval endpoints */
497 di = fi + n; /* output slope wrt normalized input at interval endpoints */497 di = fi + n; /* output slope wrt normalized input at interval endpoints */
498 hi = di + n; /* interval widths */498 hi = di + n; /* interval widths */
499 mi = hi + n - 1; /* linear slope over intervals */499 mi = hi + n - 1; /* linear slope over intervals */
libavfilter/vf_dnn_detect.c+1−1
@@ -81,7 +81,7 @@ static const AVOption dnn_detect_options[] = { · 80 unmodified lines
81 { "cell_w", "cell width", OFFSET2(cell_w), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },81 { "cell_w", "cell width", OFFSET2(cell_w), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },
82 { "cell_h", "cell height", OFFSET2(cell_h), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },82 { "cell_h", "cell height", OFFSET2(cell_h), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },
83 { "nb_classes", "The number of class", OFFSET2(nb_classes), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },83 { "nb_classes", "The number of class", OFFSET2(nb_classes), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INTMAX_MAX, FLAGS },
84 { "anchors", "anchors, splited by '&'", OFFSET2(anchors), AV_OPT_TYPE_FLOAT | AV_OPT_TYPE_FLAG_ARRAY, { .arr = &anchor_array_def }, FLT_MIN, FLT_MAX, FLAGS },84 { "anchors", "anchors, split by '&'", OFFSET2(anchors), AV_OPT_TYPE_FLOAT | AV_OPT_TYPE_FLAG_ARRAY, { .arr = &anchor_array_def }, FLT_MIN, FLT_MAX, FLAGS },
85 { NULL }85 { NULL }
86};86};
87 87
libavfilter/vf_drawbox.c+1−1
@@ -454,7 +454,7 @@ static const AVOption drawbox_options[] = { · 453 unmodified lines
454 { "thickness", "set the box thickness", OFFSET(t_expr), AV_OPT_TYPE_STRING, { .str="3" }, 0, 0, FLAGS },454 { "thickness", "set the box thickness", OFFSET(t_expr), AV_OPT_TYPE_STRING, { .str="3" }, 0, 0, FLAGS },
455 { "t", "set the box thickness", OFFSET(t_expr), AV_OPT_TYPE_STRING, { .str="3" }, 0, 0, FLAGS },455 { "t", "set the box thickness", OFFSET(t_expr), AV_OPT_TYPE_STRING, { .str="3" }, 0, 0, FLAGS },
456 { "replace", "replace color & alpha", OFFSET(replace), AV_OPT_TYPE_BOOL, { .i64=0 }, 0, 1, FLAGS },456 { "replace", "replace color & alpha", OFFSET(replace), AV_OPT_TYPE_BOOL, { .i64=0 }, 0, 1, FLAGS },
457 { "box_source", "use datas from bounding box in side data", OFFSET(box_source_string), AV_OPT_TYPE_STRING, { .str=NULL }, 0, 1, FLAGS },457 { "box_source","use data from bounding box in side data", OFFSET(box_source_string), AV_OPT_TYPE_STRING, { .str=NULL }, 0, 1, FLAGS },
458 { NULL }458 { NULL }
459};459};
460 460
libavfilter/vf_drawtext.c+2−2
@@ -562,7 +562,7 @@ static int load_font_fontconfig(AVFilterContext *ctx) · 561 unmodified lines
562 FcDefaultSubstitute(pat);562 FcDefaultSubstitute(pat);
563 563
564 if (!FcConfigSubstitute(fontconfig, pat, FcMatchPattern)) {564 if (!FcConfigSubstitute(fontconfig, pat, FcMatchPattern)) {
565 av_log(ctx, AV_LOG_ERROR, "could not substitue fontconfig options"); /* very unlikely */565 av_log(ctx, AV_LOG_ERROR, "could not substitute fontconfig options"); /* very unlikely */
566 FcPatternDestroy(pat);566 FcPatternDestroy(pat);
567 return AVERROR(ENOMEM);567 return AVERROR(ENOMEM);
568 }568 }
@@ -866,7 +866,7 @@ static int func_pts(void *ctx, AVBPrint *bp, const char *function_name, unsigned · 297 unmodified lines
866 if (argc >= 3) {866 if (argc >= 3) {
867 if (!strcmp(fmt, "hms")) {867 if (!strcmp(fmt, "hms")) {
868 if (!strcmp(argv[2], "24HH")) {868 if (!strcmp(argv[2], "24HH")) {
869 av_log(ctx, AV_LOG_WARNING, "pts third argument 24HH is deprected, use pts:hms24hh instead\n");869 av_log(ctx, AV_LOG_WARNING, "pts third argument 24HH is deprecated, use pts:hms24hh instead\n");
870 fmt = "hms24";870 fmt = "hms24";
871 } else {871 } else {
872 av_log(ctx, AV_LOG_ERROR, "Invalid argument '%s', '24HH' was expected\n", argv[2]);872 av_log(ctx, AV_LOG_ERROR, "Invalid argument '%s', '24HH' was expected\n", argv[2]);
libavfilter/vf_fspp.c+1−1
@@ -463,7 +463,7 @@ static void row_fdct_c(int16_t *data, const uint8_t *pixels, ptrdiff_t line_size · 462 unmodified lines
463 tmp12 = tmp1 - tmp2;463 tmp12 = tmp1 - tmp2;
464 //Even columns are written first, this leads to different order of columns464 //Even columns are written first, this leads to different order of columns
465 //in column_fidct(), but they are processed independently, so all ok.465 //in column_fidct(), but they are processed independently, so all ok.
466 //Later in the row_idct() columns readed at the same order.466 //Later in the row_idct() columns are read in the same order.
467 dataptr[2] = tmp10 + tmp11;467 dataptr[2] = tmp10 + tmp11;
468 dataptr[3] = tmp10 - tmp11;468 dataptr[3] = tmp10 - tmp11;
469 469
libavfilter/vf_libplacebo.c+1−1
@@ -1412,7 +1412,7 @@ static int libplacebo_config_output(AVFilterLink *outlink) · 1411 unmodified lines
1412 1412
1413 s->vkctx.output_width = outlink->w;1413 s->vkctx.output_width = outlink->w;
1414 s->vkctx.output_height = outlink->h;1414 s->vkctx.output_height = outlink->h;
1415 /* Default to re-using the input format */1415 /* Default to reusing the input format */
1416 if (s->out_format == AV_PIX_FMT_NONE || s->out_format == AV_PIX_FMT_VULKAN) {1416 if (s->out_format == AV_PIX_FMT_NONE || s->out_format == AV_PIX_FMT_VULKAN) {
1417 s->vkctx.output_format = s->vkctx.input_format;1417 s->vkctx.output_format = s->vkctx.input_format;
1418 } else {1418 } else {
libavfilter/vf_mpdecimate.c+1−1
@@ -208,7 +208,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *cur) · 207 unmodified lines
208 av_frame_free(&decimate->ref);208 av_frame_free(&decimate->ref);
209 decimate->ref = cur;209 decimate->ref = cur;
210 decimate->drop_count = FFMIN(-1, decimate->drop_count-1);210 decimate->drop_count = FFMIN(-1, decimate->drop_count-1);
211 if (decimate->keep_count < 0) // re-enable counting similiar frames to ignore before dropping211 if (decimate->keep_count < 0) // re-enable counting similar frames to ignore before dropping
212 decimate->keep_count = 0;212 decimate->keep_count = 0;
213 213
214 if ((ret = ff_filter_frame(outlink, av_frame_clone(cur))) < 0)214 if ((ret = ff_filter_frame(outlink, av_frame_clone(cur))) < 0)
libavfilter/vf_overlay_qsv.c+1−1
@@ -137,7 +137,7 @@ static int eval_expr(AVFilterContext *ctx) · 136 unmodified lines
137 var_values[VAR_OVERLAY_X] =137 var_values[VAR_OVERLAY_X] =
138 var_values[VAR_OX] = av_expr_eval(ox_expr, var_values, NULL);138 var_values[VAR_OX] = av_expr_eval(ox_expr, var_values, NULL);
139 139
140 /* calc overlay_w and overlay_h again incase relative to ox,oy */140 /* calc overlay_w and overlay_h again in case relative to ox,oy */
141 var_values[VAR_OVERLAY_W] =141 var_values[VAR_OVERLAY_W] =
142 var_values[VAR_OW] = av_expr_eval(ow_expr, var_values, NULL);142 var_values[VAR_OW] = av_expr_eval(ow_expr, var_values, NULL);
143 var_values[VAR_OVERLAY_H] =143 var_values[VAR_OVERLAY_H] =
libavfilter/vf_overlay_vaapi.c+1−1
@@ -108,7 +108,7 @@ static int eval_expr(AVFilterContext *avctx) · 107 unmodified lines
108 var_values[VAR_OVERLAY_X] =108 var_values[VAR_OVERLAY_X] =
109 var_values[VAR_OX] = av_expr_eval(ox_expr, var_values, NULL);109 var_values[VAR_OX] = av_expr_eval(ox_expr, var_values, NULL);
110 110
111 /* calc overlay_w and overlay_h again incase relative to ox,oy */111 /* calc overlay_w and overlay_h again in case relative to ox,oy */
112 var_values[VAR_OVERLAY_W] =112 var_values[VAR_OVERLAY_W] =
113 var_values[VAR_OW] = av_expr_eval(ow_expr, var_values, NULL);113 var_values[VAR_OW] = av_expr_eval(ow_expr, var_values, NULL);
114 var_values[VAR_OVERLAY_H] =114 var_values[VAR_OVERLAY_H] =
libavfilter/vf_removelogo.c+2−2
@@ -49,7 +49,7 @@ · 48 unmodified lines
49 * remove rough edges, is stored in each pixel. This is done using an in-place49 * remove rough edges, is stored in each pixel. This is done using an in-place
50 * erosion algorithm, and incrementing each pixel that survives any given50 * erosion algorithm, and incrementing each pixel that survives any given
51 * erosion. Once every pixel is eroded, the maximum value is recorded, and a51 * erosion. Once every pixel is eroded, the maximum value is recorded, and a
52 * set of masks from size 0 to this size are generaged. The masks are circular52 * set of masks from size 0 to this size are generated. The masks are circular
53 * binary masks, where each pixel within a radius N (where N is the size of the53 * binary masks, where each pixel within a radius N (where N is the size of the
54 * mask) is a 1, and all other pixels are a 0. Although a gaussian mask would be54 * mask) is a 1, and all other pixels are a 0. Although a gaussian mask would be
55 * more mathematically accurate, a binary mask works better in practice because55 * more mathematically accurate, a binary mask works better in practice because
@@ -64,7 +64,7 @@ · 8 unmodified lines
64 * condition is met (that the image function itself is continuous), even if the64 * condition is met (that the image function itself is continuous), even if the
65 * second boundary condition (that the derivative of the image function is65 * second boundary condition (that the derivative of the image function is
66 * continuous) is not met. A masking algorithm that does preserve the second66 * continuous) is not met. A masking algorithm that does preserve the second
67 * boundary coundition (perhaps something based on a highly-modified bi-cubic67 * boundary condition (perhaps something based on a highly-modified bi-cubic
68 * algorithm) should offer even better results on paper, but the noise in a68 * algorithm) should offer even better results on paper, but the noise in a
69 * typical TV signal should make anything based on derivatives hopelessly noisy.69 * typical TV signal should make anything based on derivatives hopelessly noisy.
70 */70 */
libavfilter/vf_signalstats.c+3−3
@@ -1,7 +1,7 @@
1/*1/*
2 * Copyright (c) 2010 Mark Heath mjpeg0 @ silicontrip dot org2 * Copyright (c) 2010 Mark Heath mjpeg0 @ silicontrip dot org
3 * Copyright (c) 2014 Clément Bœsch3 * Copyright (c) 2014 Clément Bœsch
4 * Copyright (c) 2014 Dave Rice @dericed4 * Copyright (c) 2014 Dave Rice
5 *5 *
6 * This file is part of FFmpeg.6 * This file is part of FFmpeg.
7 *7 *
@@ -304,7 +304,7 @@ static int filter8_tout(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) · 296 unmodified lines
304 continue;304 continue;
305 305
306 // detect two pixels above and below (to eliminate interlace artefacts)306 // detect two pixels above and below (to eliminate interlace artefacts)
307 // should check that video format is infact interlaced.307 // should check that video format is in fact interlaced.
308 308
309#define FILTER(i, j) \309#define FILTER(i, j) \
310 filter_tout_outlier(p[(y-j) * lw + x + i], \310 filter_tout_outlier(p[(y-j) * lw + x + i], \
@@ -352,7 +352,7 @@ static int filter16_tout(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs · 41 unmodified lines
352 continue;352 continue;
353 353
354 // detect two pixels above and below (to eliminate interlace artefacts)354 // detect two pixels above and below (to eliminate interlace artefacts)
355 // should check that video format is infact interlaced.355 // should check that video format is in fact interlaced.
356 356
357 if (y - 2 >= 0 && y + 2 < h) {357 if (y - 2 >= 0 && y + 2 < h) {
358 for (x = 1; x < w - 1; x++) {358 for (x = 1; x < w - 1; x++) {
libavfilter/vf_signature.c+1−1
@@ -581,7 +581,7 @@ static int request_frame(AVFilterLink *outlink) · 580 unmodified lines
581 StreamContext *sc, *sc2;581 StreamContext *sc, *sc2;
582 MatchingInfo match;582 MatchingInfo match;
583 int i, j, ret;583 int i, j, ret;
584 int lookup = 1; /* indicates wheather EOF of all files is reached */584 int lookup = 1; /* indicates whether EOF of all files is reached */
585 585
586 /* process all inputs */586 /* process all inputs */
587 for (i = 0; i < sic->nb_inputs; i++){587 for (i = 0; i < sic->nb_inputs; i++){
libavfilter/vf_siti.c+1−1
@@ -103,7 +103,7 @@ static av_cold void uninit(AVFilterContext *ctx) · 102 unmodified lines
103 103
104static int config_input(AVFilterLink *inlink)104static int config_input(AVFilterLink *inlink)
105{105{
106 // Video input data avilable106 // Video input data available
107 AVFilterContext *ctx = inlink->dst;107 AVFilterContext *ctx = inlink->dst;
108 SiTiContext *s = ctx->priv;108 SiTiContext *s = ctx->priv;
109 int max_pixsteps[4];109 int max_pixsteps[4];
libavfilter/vf_ssim360.c+2−2
@@ -38,7 +38,7 @@ · 37 unmodified lines
38 38
39/*39/*
40 * @file40 * @file
41 * Caculate the SSIM between two input 360 videos.41 * Calculate the SSIM between two input 360 videos.
42 */42 */
43 43
44#include <math.h>44#include <math.h>
@@ -250,7 +250,7 @@ static const AVOption ssim360_options[] = { · 205 unmodified lines
250 OFFSET(ref_pad), AV_OPT_TYPE_FLOAT, {.dbl = .0f}, 0, 10, .flags = FLAGS },250 OFFSET(ref_pad), AV_OPT_TYPE_FLOAT, {.dbl = .0f}, 0, 10, .flags = FLAGS },
251 251
252 { "main_pad",252 { "main_pad",
253 "Expansion (padding) coeffiecient for each cube face of the main video",253 "Expansion (padding) coefficient for each cube face of the main video",
254 OFFSET(main_pad), AV_OPT_TYPE_FLOAT, {.dbl = .0f}, 0, 10, .flags = FLAGS },254 OFFSET(main_pad), AV_OPT_TYPE_FLOAT, {.dbl = .0f}, 0, 10, .flags = FLAGS },
255 255
256 { "use_tape",256 { "use_tape",
libavfilter/vf_tonemap_opencl.c+1−1
@@ -158,7 +158,7 @@ static int tonemap_opencl_init(AVFilterContext *avctx) · 157 unmodified lines
158 av_log(ctx, AV_LOG_DEBUG, "mapping range from %s to %s\n",158 av_log(ctx, AV_LOG_DEBUG, "mapping range from %s to %s\n",
159 av_color_range_name(ctx->range_in),159 av_color_range_name(ctx->range_in),
160 av_color_range_name(ctx->range_out));160 av_color_range_name(ctx->range_out));
161 // checking valid value just because of limited implementaion161 // checking valid value just because of limited implementation
162 // please remove when more functionalities are implemented162 // please remove when more functionalities are implemented
163 av_assert0(ctx->trc_out == AVCOL_TRC_BT709 ||163 av_assert0(ctx->trc_out == AVCOL_TRC_BT709 ||
164 ctx->trc_out == AVCOL_TRC_BT2020_10);164 ctx->trc_out == AVCOL_TRC_BT2020_10);
libavfilter/vf_uspp.c+1−1
@@ -410,7 +410,7 @@ static int config_input(AVFilterLink *inlink) · 409 unmodified lines
410 }410 }
411 avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;411 avctx_enc->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL;
412 avctx_enc->global_quality = 123;412 avctx_enc->global_quality = 123;
413 avctx_enc->thread_count = 1; // We do threading in the filter with muiltiple codecs413 avctx_enc->thread_count = 1; // We do threading in the filter with multiple codecs
414 ret = avcodec_open2(avctx_enc, enc, &opts);414 ret = avcodec_open2(avctx_enc, enc, &opts);
415 av_dict_free(&opts);415 av_dict_free(&opts);
416 if (ret < 0)416 if (ret < 0)
libavfilter/vf_zscale.c+1−1
@@ -648,7 +648,7 @@ static int graphs_build(AVFrame *in, AVFrame *out, const AVPixFmtDescriptor *des · 647 unmodified lines
648 alpha_src_format = s->alpha_src_format;648 alpha_src_format = s->alpha_src_format;
649 alpha_dst_format = s->alpha_dst_format;649 alpha_dst_format = s->alpha_dst_format;
650 /* The input slice is specified through the active_region field, unlike the output slice.650 /* The input slice is specified through the active_region field, unlike the output slice.
651 according to zimg requirements input and output slices should have even dimentions */651 according to zimg requirements input and output slices should have even dimensions */
652 alpha_src_format.active_region.width = in->width;652 alpha_src_format.active_region.width = in->width;
653 alpha_src_format.active_region.height = in_slice_end - in_slice_start;653 alpha_src_format.active_region.height = in_slice_end - in_slice_start;
654 alpha_src_format.active_region.left = 0;654 alpha_src_format.active_region.left = 0;
libavfilter/vsrc_ddagrab.c+1−1
@@ -716,7 +716,7 @@ static int next_frame_internal(AVFilterContext *avctx, ID3D11Texture2D **desktop · 715 unmodified lines
716 goto error;716 goto error;
717 }717 }
718 718
719 // Unforunately, we can't rely on the desktop_resource's format in this case.719 // Unfortunately, we can't rely on the desktop_resource's format in this case.
720 // The API might even return it in with a format that was not in the initial720 // The API might even return it in with a format that was not in the initial
721 // list of supported formats, and it can change/flicker randomly.721 // list of supported formats, and it can change/flicker randomly.
722 // To work around this, return an internal copy of the last valid texture we got.722 // To work around this, return an internal copy of the last valid texture we got.
libavfilter/x86/vf_hqdn3d.asm+1−1
@@ -87,7 +87,7 @@ ALIGN 16 · 86 unmodified lines
87 mov [frameantq+xq*2], t0w87 mov [frameantq+xq*2], t0w
88 movifnidn dstq, dstmp88 movifnidn dstq, dstmp
89%if %1 != 1689%if %1 != 16
90 shr t0d, 16-%1 ; could eliminate this by storing from t0h, but only with some contraints on register allocation90 shr t0d, 16-%1 ; could eliminate this by storing from t0h, but only with some constraints on register allocation
91%endif91%endif
92%if %1 == 892%if %1 == 8
93 mov [dstq+xq], t0b93 mov [dstq+xq], t0b
libavformat/amvenc.c+1−1
@@ -68,7 +68,7 @@ typedef struct AMVContext · 67 unmodified lines
68 68
69 /*69 /*
70 * Cumulative PTS values for each stream, used for the final70 * Cumulative PTS values for each stream, used for the final
71 * duration calculcation.71 * duration calculation.
72 */72 */
73 int64_t lastpts[AMV_STREAM_COUNT];73 int64_t lastpts[AMV_STREAM_COUNT];
74} AMVContext;74} AMVContext;
libavformat/apm.c+1−1
@@ -252,7 +252,7 @@ static int apm_write_header(AVFormatContext *s) · 251 unmodified lines
252 avio_wl16(s->pb, APM_TAG_CODEC);252 avio_wl16(s->pb, APM_TAG_CODEC);
253 avio_wl16(s->pb, par->ch_layout.nb_channels);253 avio_wl16(s->pb, par->ch_layout.nb_channels);
254 avio_wl32(s->pb, par->sample_rate);254 avio_wl32(s->pb, par->sample_rate);
255 /* This is the wrong calculation, but it's what the orginal files have. */255 /* This is the wrong calculation, but it's what the original files have. */
256 avio_wl32(s->pb, par->sample_rate * par->ch_layout.nb_channels * 2);256 avio_wl32(s->pb, par->sample_rate * par->ch_layout.nb_channels * 2);
257 avio_wl16(s->pb, par->block_align);257 avio_wl16(s->pb, par->block_align);
258 avio_wl16(s->pb, par->bits_per_coded_sample);258 avio_wl16(s->pb, par->bits_per_coded_sample);
libavformat/av1.h+1−1
@@ -72,7 +72,7 @@ int ff_av1_filter_obus(AVIOContext *pb, const uint8_t *buf, int size); · 71 unmodified lines
72 *72 *
73 * @return 0 in case of success, a negative AVERROR code in case of failure.73 * @return 0 in case of success, a negative AVERROR code in case of failure.
74 * On failure, *out and *size are unchanged74 * On failure, *out and *size are unchanged
75 * @note *out will be treated as unintialized on input and will not be freed.75 * @note *out will be treated as uninitialized on input and will not be freed.
76 */76 */
77int ff_av1_filter_obus_buf(const uint8_t *in, uint8_t **out,77int ff_av1_filter_obus_buf(const uint8_t *in, uint8_t **out,
78 int *size, int *offset);78 int *size, int *offset);
libavformat/avformat.h+4−4
@@ -926,7 +926,7 @@ typedef struct AVStream { · 925 unmodified lines
926 * the sixth @ref AVStreamGroup.streams "stream" in the group is "512,512",926 * the sixth @ref AVStreamGroup.streams "stream" in the group is "512,512",
927 * etc.927 * etc.
928 *928 *
929 * The following is an example of a canvas with overlaping tiles:929 * The following is an example of a canvas with overlapping tiles:
930 *930 *
931 * +-----------+931 * +-----------+
932 * | %%%%% |932 * | %%%%% |
@@ -1420,7 +1420,7 @@ typedef struct AVFormatContext { · 487 unmodified lines
1420#define AVFMT_FLAG_NONBLOCK 0x0004 ///< Do not block when reading packets from input.1420#define AVFMT_FLAG_NONBLOCK 0x0004 ///< Do not block when reading packets from input.
1421#define AVFMT_FLAG_IGNDTS 0x0008 ///< Ignore DTS on frames that contain both DTS & PTS1421#define AVFMT_FLAG_IGNDTS 0x0008 ///< Ignore DTS on frames that contain both DTS & PTS
1422#define AVFMT_FLAG_NOFILLIN 0x0010 ///< Do not infer any values from other values, just return what is stored in the container1422#define AVFMT_FLAG_NOFILLIN 0x0010 ///< Do not infer any values from other values, just return what is stored in the container
1423#define AVFMT_FLAG_NOPARSE 0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled1423#define AVFMT_FLAG_NOPARSE 0x0020 ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the filling code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
1424#define AVFMT_FLAG_NOBUFFER 0x0040 ///< Do not buffer frames when possible1424#define AVFMT_FLAG_NOBUFFER 0x0040 ///< Do not buffer frames when possible
1425#define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.1425#define AVFMT_FLAG_CUSTOM_IO 0x0080 ///< The caller has supplied a custom AVIOContext, don't avio_close() it.
1426#define AVFMT_FLAG_DISCARD_CORRUPT 0x0100 ///< Discard frames marked corrupted1426#define AVFMT_FLAG_DISCARD_CORRUPT 0x0100 ///< Discard frames marked corrupted
@@ -1670,7 +1670,7 @@ typedef struct AVFormatContext { · 243 unmodified lines
1670 int use_wallclock_as_timestamps;1670 int use_wallclock_as_timestamps;
1671 1671
1672 /**1672 /**
1673 * Skip duration calcuation in estimate_timings_from_pts.1673 * Skip duration calculation in estimate_timings_from_pts.
1674 * - encoding: unused1674 * - encoding: unused
1675 * - decoding: set by user1675 * - decoding: set by user
1676 *1676 *
@@ -1773,7 +1773,7 @@ typedef struct AVFormatContext { · 96 unmodified lines
1773 1773
1774 /**1774 /**
1775 * IO repositioned flag.1775 * IO repositioned flag.
1776 * This is set by avformat when the underlaying IO context read pointer1776 * This is set by avformat when the underlying IO context read pointer
1777 * is repositioned, for example when doing byte based seeking.1777 * is repositioned, for example when doing byte based seeking.
1778 * Demuxers can use the flag to detect such changes.1778 * Demuxers can use the flag to detect such changes.
1779 */1779 */
libavformat/cache.c+1−1
@@ -154,7 +154,7 @@ static int add_entry(URLContext *h, const unsigned char *buf, int size) · 153 unmodified lines
154 return 0;154 return 0;
155fail:155fail:
156 //we could truncate the file to pos here if pos >=0 but ftruncate isn't available in VS so156 //we could truncate the file to pos here if pos >=0 but ftruncate isn't available in VS so
157 //for simplicty we just leave the file a bit larger157 //for simplicity we just leave the file a bit larger
158 av_free(entry);158 av_free(entry);
159 av_free(node);159 av_free(node);
160 return ret;160 return ret;
libavformat/crypto.c+2−2
@@ -156,7 +156,7 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary · 155 unmodified lines
156 if (ret < 0)156 if (ret < 0)
157 goto err;157 goto err;
158 158
159 // pass back information about the context we openned159 // pass back information about the context we opened
160 if (c->hd->is_streamed)160 if (c->hd->is_streamed)
161 h->is_streamed = c->hd->is_streamed;161 h->is_streamed = c->hd->is_streamed;
162 }162 }
@@ -171,7 +171,7 @@ static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary · 8 unmodified lines
171 if (ret < 0)171 if (ret < 0)
172 goto err;172 goto err;
173 // for write, we must be streamed173 // for write, we must be streamed
174 // - linear write only for crytpo aes-128-cbc174 // - linear write only for crypto aes-128-cbc
175 h->is_streamed = 1;175 h->is_streamed = 1;
176 }176 }
177 177
libavformat/dashdec.c+1−1
@@ -871,7 +871,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, · 870 unmodified lines
871 type = get_content_type(adaptionset_node);871 type = get_content_type(adaptionset_node);
872 if (type != AVMEDIA_TYPE_VIDEO && type != AVMEDIA_TYPE_AUDIO &&872 if (type != AVMEDIA_TYPE_VIDEO && type != AVMEDIA_TYPE_AUDIO &&
873 type != AVMEDIA_TYPE_SUBTITLE) {873 type != AVMEDIA_TYPE_SUBTITLE) {
874 av_log(s, AV_LOG_VERBOSE, "Parsing '%s' - skipp not supported representation type\n", url);874 av_log(s, AV_LOG_VERBOSE, "Parsing '%s' - skip not supported representation type\n", url);
875 return 0;875 return 0;
876 }876 }
877 877
libavformat/demux.h+1−1
@@ -260,7 +260,7 @@ void ff_rfps_calculate(AVFormatContext *ic); · 259 unmodified lines
260 * belongs, from a timebase `tb_in` to a timebase `tb_out`.260 * belongs, from a timebase `tb_in` to a timebase `tb_out`.
261 *261 *
262 * The upper (lower) bound of the output interval is rounded up (down) such that262 * The upper (lower) bound of the output interval is rounded up (down) such that
263 * the output interval always falls within the intput interval. The timestamp is263 * the output interval always falls within the input interval. The timestamp is
264 * rounded to the nearest integer and halfway cases away from zero, and can264 * rounded to the nearest integer and halfway cases away from zero, and can
265 * therefore fall outside of the output interval.265 * therefore fall outside of the output interval.
266 *266 *
libavformat/flvenc.c+1−1
@@ -160,7 +160,7 @@ static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par) · 159 unmodified lines
160 } else {160 } else {
161 switch (par->sample_rate) {161 switch (par->sample_rate) {
162 case 48000:162 case 48000:
163 // 48khz mp3 is stored with 44k1 samplerate identifer163 // 48khz mp3 is stored with 44k1 samplerate identifier
164 if (par->codec_id == AV_CODEC_ID_MP3) {164 if (par->codec_id == AV_CODEC_ID_MP3) {
165 flags |= FLV_SAMPLERATE_44100HZ;165 flags |= FLV_SAMPLERATE_44100HZ;
166 break;166 break;
libavformat/ftp.c+1−1
@@ -805,7 +805,7 @@ static int64_t ftp_seek(URLContext *h, int64_t pos, int whence) · 804 unmodified lines
805 return AVERROR(EIO);805 return AVERROR(EIO);
806 806
807 if (new_pos < 0) {807 if (new_pos < 0) {
808 av_log(h, AV_LOG_ERROR, "Seeking to nagative position.\n");808 av_log(h, AV_LOG_ERROR, "Seeking to negative position.\n");
809 return AVERROR(EINVAL);809 return AVERROR(EINVAL);
810 }810 }
811 811
libavformat/hevc.h+1−1
@@ -103,7 +103,7 @@ int ff_isom_write_hvcc(AVIOContext *pb, const uint8_t *data, · 102 unmodified lines
103 * LHEVCDecoderConfigurationRecord) to the provided AVIOContext.103 * LHEVCDecoderConfigurationRecord) to the provided AVIOContext.
104 *104 *
105 * If the extradata is Annex B format, it gets converted to lhvC format before105 * If the extradata is Annex B format, it gets converted to lhvC format before
106 * writing. Otherwise, hvcC formated extradata is expected, not lhvC.106 * writing. Otherwise, hvcC formatted extradata is expected, not lhvC.
107 *107 *
108 * @param pb address of the AVIOContext where the lhvC shall be written108 * @param pb address of the AVIOContext where the lhvC shall be written
109 * @param data address of the buffer holding the data needed to write the lhvC109 * @param data address of the buffer holding the data needed to write the lhvC
libavformat/hls.c+1−1
@@ -2726,7 +2726,7 @@ static int hls_read_seek(AVFormatContext *s, int stream_index, · 2725 unmodified lines
2726 if (pls->is_subtitle)2726 if (pls->is_subtitle)
2727 avformat_close_input(&pls->ctx);2727 avformat_close_input(&pls->ctx);
2728 2728
2729 /* Reset the init segment so it's re-fetched and served appropiately */2729 /* Reset the init segment so it's re-fetched and served appropriately */
2730 pls->cur_init_section = NULL;2730 pls->cur_init_section = NULL;
2731 2731
2732 pls->seek_timestamp = seek_timestamp;2732 pls->seek_timestamp = seek_timestamp;
libavformat/http.c+1−1
@@ -1338,7 +1338,7 @@ static int get_cookies(HTTPContext *s, char **cookies, const char *path, · 1337 unmodified lines
1338 }1338 }
1339 }1339 }
1340 1340
1341 // if no domain in the cookie assume it appied to this request1341 // if no domain in the cookie assume it applied to this request
1342 if ((e = av_dict_get(cookie_params, "domain", NULL, 0)) && e->value) {1342 if ((e = av_dict_get(cookie_params, "domain", NULL, 0)) && e->value) {
1343 // find the offset comparison is on the min domain (b.com, not a.b.com)1343 // find the offset comparison is on the min domain (b.com, not a.b.com)
1344 int domain_offset = strlen(domain) - strlen(e->value);1344 int domain_offset = strlen(domain) - strlen(e->value);
libavformat/iamf_parse.c+2−2
@@ -657,7 +657,7 @@ static int param_parse(void *s, IAMFContext *c, AVIOContext *pb, · 656 unmodified lines
657 657
658 if (param_definition) {658 if (param_definition) {
659 if (param_definition->param_size != param_size || memcmp(param_definition->param, param, param_size)) {659 if (param_definition->param_size != param_size || memcmp(param_definition->param, param, param_size)) {
660 av_log(s, AV_LOG_ERROR, "Incosistent parameters for parameter_id %u\n", parameter_id);660 av_log(s, AV_LOG_ERROR, "Inconsistent parameters for parameter_id %u\n", parameter_id);
661 av_free(param);661 av_free(param);
662 return AVERROR_INVALIDDATA;662 return AVERROR_INVALIDDATA;
663 }663 }
@@ -731,7 +731,7 @@ static int audio_element_obu(void *s, IAMFContext *c, AVIOContext *pb, int len) · 67 unmodified lines
731 731
732 codec_config = ff_iamf_get_codec_config(c, codec_config_id);732 codec_config = ff_iamf_get_codec_config(c, codec_config_id);
733 if (!codec_config) {733 if (!codec_config) {
734 av_log(s, AV_LOG_ERROR, "Non existant codec config id %d referenced in an audio element\n", codec_config_id);734 av_log(s, AV_LOG_ERROR, "Non existent codec config id %d referenced in an audio element\n", codec_config_id);
735 ret = AVERROR_INVALIDDATA;735 ret = AVERROR_INVALIDDATA;
736 goto fail;736 goto fail;
737 }737 }
libavformat/iamf_reader.c+1−1
@@ -132,7 +132,7 @@ static int parameter_block_obu(AVFormatContext *s, IAMFDemuxContext *c, · 131 unmodified lines
132 parameter_id = ffio_read_leb(pb);132 parameter_id = ffio_read_leb(pb);
133 param_definition = ff_iamf_get_param_definition(&c->iamf, parameter_id);133 param_definition = ff_iamf_get_param_definition(&c->iamf, parameter_id);
134 if (!param_definition) {134 if (!param_definition) {
135 av_log(s, AV_LOG_VERBOSE, "Non existant parameter_id %d referenced in a parameter block. Ignoring\n",135 av_log(s, AV_LOG_VERBOSE, "Non existent parameter_id %d referenced in a parameter block. Ignoring\n",
136 parameter_id);136 parameter_id);
137 ret = 0;137 ret = 0;
138 goto fail;138 goto fail;
libavformat/iamf_writer.c+1−1
@@ -236,7 +236,7 @@ int ff_iamf_add_audio_element(IAMFContext *iamf, const AVStreamGroup *stg, void · 235 unmodified lines
236 return AVERROR(EINVAL);236 return AVERROR(EINVAL);
237 }237 }
238 if (layer->ambisonics_mode >= AV_IAMF_AMBISONICS_MODE_PROJECTION) {238 if (layer->ambisonics_mode >= AV_IAMF_AMBISONICS_MODE_PROJECTION) {
239 av_log(log_ctx, AV_LOG_ERROR, "Unsuported ambisonics mode %d\n", layer->ambisonics_mode);239 av_log(log_ctx, AV_LOG_ERROR, "Unsupported ambisonics mode %d\n", layer->ambisonics_mode);
240 return AVERROR_PATCHWELCOME;240 return AVERROR_PATCHWELCOME;
241 }241 }
242 for (int i = 0; i < stg->nb_streams; i++) {242 for (int i = 0; i < stg->nb_streams; i++) {
libavformat/id3v2.c+1−1
@@ -1012,7 +1012,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, · 1011 unmodified lines
1012 if (tcomp) {1012 if (tcomp) {
1013 int err;1013 int err;
1014 1014
1015 av_log(s, AV_LOG_DEBUG, "Compresssed frame %s tlen=%d dlen=%ld\n", tag, tlen, dlen);1015 av_log(s, AV_LOG_DEBUG, "Compressed frame %s tlen=%d dlen=%ld\n", tag, tlen, dlen);
1016 1016
1017 if (tlen <= 0)1017 if (tlen <= 0)
1018 goto seek;1018 goto seek;
libavformat/imfdec.c+3−3
@@ -139,15 +139,15 @@ static int imf_uri_is_unix_abs_path(const char *string) · 138 unmodified lines
139 139
140static int imf_uri_is_dos_abs_path(const char *string)140static int imf_uri_is_dos_abs_path(const char *string)
141{141{
142 /* Absolute path case: `C:\path\to\somwhere` */142 /* Absolute path case: `C:\path\to\somewhere` */
143 if (string[1] == ':' && string[2] == '\\')143 if (string[1] == ':' && string[2] == '\\')
144 return 1;144 return 1;
145 145
146 /* Absolute path case: `C:/path/to/somwhere` */146 /* Absolute path case: `C:/path/to/somewhere` */
147 if (string[1] == ':' && string[2] == '/')147 if (string[1] == ':' && string[2] == '/')
148 return 1;148 return 1;
149 149
150 /* Network path case: `\\path\to\somwhere` */150 /* Network path case: `\\path\to\somewhere` */
151 if (string[0] == '\\' && string[1] == '\\')151 if (string[0] == '\\' && string[1] == '\\')
152 return 1;152 return 1;
153 153
libavformat/img2dec.c+1−1
@@ -374,7 +374,7 @@ int ff_img_read_header(AVFormatContext *s1) · 373 unmodified lines
374 st->codecpar->codec_id = ff_guess_image2_codec(s->path);374 st->codecpar->codec_id = ff_guess_image2_codec(s->path);
375 if (st->codecpar->codec_id == AV_CODEC_ID_LJPEG)375 if (st->codecpar->codec_id == AV_CODEC_ID_LJPEG)
376 st->codecpar->codec_id = AV_CODEC_ID_MJPEG;376 st->codecpar->codec_id = AV_CODEC_ID_MJPEG;
377 if (st->codecpar->codec_id == AV_CODEC_ID_ALIAS_PIX) // we cannot distingiush this from BRENDER_PIX377 if (st->codecpar->codec_id == AV_CODEC_ID_ALIAS_PIX) // we cannot distinguish this from BRENDER_PIX
378 st->codecpar->codec_id = AV_CODEC_ID_NONE;378 st->codecpar->codec_id = AV_CODEC_ID_NONE;
379 }379 }
380 if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&380 if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
libavformat/ipfsgateway.c+2−2
@@ -46,7 +46,7 @@ typedef struct IPFSGatewayContext { · 45 unmodified lines
46} IPFSGatewayContext;46} IPFSGatewayContext;
47 47
48// A best-effort way to find the IPFS gateway.48// A best-effort way to find the IPFS gateway.
49// Only the most appropiate gateway is set. It's not actually requested49// Only the most appropriate gateway is set. It's not actually requested
50// (http call) to prevent a potential slowdown in startup. A potential timeout50// (http call) to prevent a potential slowdown in startup. A potential timeout
51// is handled by the HTTP protocol.51// is handled by the HTTP protocol.
52static int populate_ipfs_gateway(URLContext *h)52static int populate_ipfs_gateway(URLContext *h)
@@ -171,7 +171,7 @@ static int populate_ipfs_gateway(URLContext *h) · 118 unmodified lines
171 goto err;171 goto err;
172 }172 }
173 173
174 // Replace first occurence of end of line with \0174 // Replace first occurrence of end of line with \0
175 c->gateway_buffer[strcspn(c->gateway_buffer, "\r\n")] = 0;175 c->gateway_buffer[strcspn(c->gateway_buffer, "\r\n")] = 0;
176 176
177 // If strlen finds anything longer then 0 characters then we have a177 // If strlen finds anything longer then 0 characters then we have a
libavformat/ircamdec.c+1−1
@@ -39,7 +39,7 @@ static int ircam_probe(const AVProbeData *p) · 38 unmodified lines
39 return 0;39 return 0;
40}40}
41 41
42static const struct endianess {42static const struct endianness {
43 uint32_t magic;43 uint32_t magic;
44 int is_le;44 int is_le;
45} table[] = {45} table[] = {
libavformat/libssh.c+1−1
@@ -272,7 +272,7 @@ static int64_t libssh_seek(URLContext *h, int64_t pos, int whence) · 271 unmodified lines
272 }272 }
273 273
274 if (newpos < 0) {274 if (newpos < 0) {
275 av_log(h, AV_LOG_ERROR, "Seeking to nagative position.\n");275 av_log(h, AV_LOG_ERROR, "Seeking to negative position.\n");
276 return AVERROR(EINVAL);276 return AVERROR(EINVAL);
277 }277 }
278 278
libavformat/m4vdec.c+1−1
@@ -59,7 +59,7 @@ static int mpeg4video_probe(const AVProbeData *probe_packet) · 58 unmodified lines
59 res++;59 res++;
60 }60 }
61 61
62 // res_main repesents the reserved codes within the "main" profile, they are62 // res_main represents the reserved codes within the "main" profile, they are
63 // added to the reserved ones if it appears that this is a "main" profile63 // added to the reserved ones if it appears that this is a "main" profile
64 // stream64 // stream
65 if (res_main && 2*res_main < VOP)65 if (res_main && 2*res_main < VOP)
libavformat/matroskadec.c+3−3
@@ -85,7 +85,7 @@ · 84 unmodified lines
85#define LEVEL_ENDED 3 /* return value of ebml_parse when the85#define LEVEL_ENDED 3 /* return value of ebml_parse when the
86 * syntax level used for parsing ended. */86 * syntax level used for parsing ended. */
87#define SKIP_THRESHOLD 1024 * 1024 /* In non-seekable mode, if more than SKIP_THRESHOLD87#define SKIP_THRESHOLD 1024 * 1024 /* In non-seekable mode, if more than SKIP_THRESHOLD
88 * of unkown, potentially damaged data is encountered,88 * of unknown, potentially damaged data is encountered,
89 * it is considered an error. */89 * it is considered an error. */
90#define UNKNOWN_EQUIV 50 * 1024 /* An unknown element is considered equivalent90#define UNKNOWN_EQUIV 50 * 1024 /* An unknown element is considered equivalent
91 * to this many bytes of unknown data for the91 * to this many bytes of unknown data for the
@@ -1418,7 +1418,7 @@ static int ebml_parse(MatroskaDemuxContext *matroska, · 1326 unmodified lines
1418 }1418 }
1419 1419
1420 if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) {1420 if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) {
1421 // Loosing sync will likely manifest itself as encountering unknown1421 // Losing sync will likely manifest itself as encountering unknown
1422 // elements which are not reliably distinguishable from elements1422 // elements which are not reliably distinguishable from elements
1423 // belonging to future extensions of the format.1423 // belonging to future extensions of the format.
1424 // We use a heuristic to detect such situations: If the current1424 // We use a heuristic to detect such situations: If the current
@@ -1436,7 +1436,7 @@ static int ebml_parse(MatroskaDemuxContext *matroska, · 11 unmodified lines
1436 // UNKNOWN_EQUIV of skipped bytes for the check.1436 // UNKNOWN_EQUIV of skipped bytes for the check.
1437 // The whole check is only done for non-seekable output, because1437 // The whole check is only done for non-seekable output, because
1438 // in this situation skipped data can't simply be rechecked later.1438 // in this situation skipped data can't simply be rechecked later.
1439 // This is especially important when using unkown length elements1439 // This is especially important when using unknown length elements
1440 // as the check for whether a child exceeds its containing master1440 // as the check for whether a child exceeds its containing master
1441 // element is not effective in this situation.1441 // element is not effective in this situation.
1442 if (update_pos) {1442 if (update_pos) {
libavformat/mov.c+4−4
@@ -3950,7 +3950,7 @@ static int find_prev_closest_index(AVStream *st, · 3949 unmodified lines
3950 3950
3951 while (*index >= 0 && (*tts_index) >= 0 && (*tts_index) < tts_count) {3951 while (*index >= 0 && (*tts_index) >= 0 && (*tts_index) < tts_count) {
3952 // Find a "key frame" with PTS <= timestamp_pts (So that we can decode B-frames correctly).3952 // Find a "key frame" with PTS <= timestamp_pts (So that we can decode B-frames correctly).
3953 // No need to add dts_shift to the timestamp here becase timestamp_pts has already been3953 // No need to add dts_shift to the timestamp here because timestamp_pts has already been
3954 // compensated by dts_shift above.3954 // compensated by dts_shift above.
3955 if ((e_old[*index].timestamp + tts_data[*tts_index].offset) <= timestamp_pts &&3955 if ((e_old[*index].timestamp + tts_data[*tts_index].offset) <= timestamp_pts &&
3956 (e_old[*index].flags & AVINDEX_KEYFRAME)) {3956 (e_old[*index].flags & AVINDEX_KEYFRAME)) {
@@ -4448,7 +4448,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) · 491 unmodified lines
4448 }4448 }
4449 }4449 }
4450 // If there are empty edits, then msc->min_corrected_pts might be positive4450 // If there are empty edits, then msc->min_corrected_pts might be positive
4451 // intentionally. So we subtract the sum duration of emtpy edits here.4451 // intentionally. So we subtract the sum duration of empty edits here.
4452 msc->min_corrected_pts -= empty_edits_sum_duration;4452 msc->min_corrected_pts -= empty_edits_sum_duration;
4453 4453
4454 // If the minimum pts turns out to be greater than zero after fixing the index, then we subtract the4454 // If the minimum pts turns out to be greater than zero after fixing the index, then we subtract the
@@ -8429,7 +8429,7 @@ static int mov_read_dops(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 3974 unmodified lines
8429 avio_read(pb, st->codecpar->extradata + 9, size - 9);8429 avio_read(pb, st->codecpar->extradata + 9, size - 9);
8430 8430
8431 /* OpusSpecificBox is stored in big-endian, but OpusHead is8431 /* OpusSpecificBox is stored in big-endian, but OpusHead is
8432 little-endian; aside from the preceeding magic and version they're8432 little-endian; aside from the preceding magic and version they're
8433 otherwise currently identical. Data after output gain at offset 168433 otherwise currently identical. Data after output gain at offset 16
8434 doesn't need to be bytewapped. */8434 doesn't need to be bytewapped. */
8435 pre_skip = AV_RB16A(st->codecpar->extradata + 10);8435 pre_skip = AV_RB16A(st->codecpar->extradata + 10);
@@ -8531,7 +8531,7 @@ static int mov_read_lhvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) · 95 unmodified lines
8531 8531
8532 num_arrays = buf[5];8532 num_arrays = buf[5];
8533 old_size = st->codecpar->extradata_size;8533 old_size = st->codecpar->extradata_size;
8534 atom.size -= 8 /* account for mov_realloc_extradata offseting */8534 atom.size -= 8 /* account for mov_realloc_extradata offsetting */
8535 + 6 /* lhvC bytes before the arrays*/;8535 + 6 /* lhvC bytes before the arrays*/;
8536 8536
8537 ret = mov_realloc_extradata(st->codecpar, atom);8537 ret = mov_realloc_extradata(st->codecpar, atom);
libavformat/movenc.c+3−3
@@ -871,7 +871,7 @@ static int mov_write_dops_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra · 870 unmodified lines
871 return AVERROR_INVALIDDATA;871 return AVERROR_INVALIDDATA;
872 }872 }
873 /* extradata contains an Ogg OpusHead, other than byte-ordering and873 /* extradata contains an Ogg OpusHead, other than byte-ordering and
874 OpusHead's preceeding magic/version, OpusSpecificBox is currently874 OpusHead's preceding magic/version, OpusSpecificBox is currently
875 identical. */875 identical. */
876 channels = AV_RB8(track->extradata[track->last_stsd_index] + 9);876 channels = AV_RB8(track->extradata[track->last_stsd_index] + 9);
877 channel_map = AV_RB8(track->extradata[track->last_stsd_index] + 18);877 channel_map = AV_RB8(track->extradata[track->last_stsd_index] + 18);
@@ -3229,7 +3229,7 @@ static int mov_preroll_write_stbl_atoms(AVIOContext *pb, MOVTrack *track) · 2351 unmodified lines
3229 if (roll_samples_remaining <= 0)3229 if (roll_samples_remaining <= 0)
3230 break;3230 break;
3231 }3231 }
3232 /* We don't have enough preceeding samples to compute a valid3232 /* We don't have enough preceding samples to compute a valid
3233 roll_distance here, so this sample can't be independently3233 roll_distance here, so this sample can't be independently
3234 decoded. */3234 decoded. */
3235 if (roll_samples_remaining > 0)3235 if (roll_samples_remaining > 0)
@@ -7324,7 +7324,7 @@ static int mov_write_packet(AVFormatContext *s, AVPacket *pkt) · 4088 unmodified lines
7324 /*7324 /*
7325 * Subtitles require special handling.7325 * Subtitles require special handling.
7326 *7326 *
7327 * 1) For full complaince, every track must have a sample at7327 * 1) For full compliance, every track must have a sample at
7328 * dts == 0, which is rarely true for subtitles. So, as soon7328 * dts == 0, which is rarely true for subtitles. So, as soon
7329 * as we see any packet with dts > 0, write an empty subtitle7329 * as we see any packet with dts > 0, write an empty subtitle
7330 * at dts == 0 for any subtitle track with no samples in it.7330 * at dts == 0 for any subtitle track with no samples in it.
libavformat/mpegts.c+2−2
@@ -203,7 +203,7 @@ static const AVOption options[] = { · 202 unmodified lines
203 {.i64 = -1}, -1, 1, AV_OPT_FLAG_DECODING_PARAM },203 {.i64 = -1}, -1, 1, AV_OPT_FLAG_DECODING_PARAM },
204 {"skip_unknown_pmt", "skip PMTs for programs not advertised in the PAT", offsetof(MpegTSContext, skip_unknown_pmt), AV_OPT_TYPE_BOOL,204 {"skip_unknown_pmt", "skip PMTs for programs not advertised in the PAT", offsetof(MpegTSContext, skip_unknown_pmt), AV_OPT_TYPE_BOOL,
205 {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },205 {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
206 {"merge_pmt_versions", "re-use streams when PMT's version/pids change", offsetof(MpegTSContext, merge_pmt_versions), AV_OPT_TYPE_BOOL,206 {"merge_pmt_versions", "reuse streams when PMT's version/pids change", offsetof(MpegTSContext, merge_pmt_versions), AV_OPT_TYPE_BOOL,
207 {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },207 {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
208 {"skip_changes", "skip changing / adding streams / programs", offsetof(MpegTSContext, skip_changes), AV_OPT_TYPE_BOOL,208 {"skip_changes", "skip changing / adding streams / programs", offsetof(MpegTSContext, skip_changes), AV_OPT_TYPE_BOOL,
209 {.i64 = 0}, 0, 1, 0 },209 {.i64 = 0}, 0, 1, 0 },
@@ -2273,7 +2273,7 @@ static AVStream *find_matching_stream(MpegTSContext *ts, int pid, unsigned int p · 2063 unmodified lines
2273 2273
2274 if (found) {2274 if (found) {
2275 av_log(ts->stream, AV_LOG_VERBOSE,2275 av_log(ts->stream, AV_LOG_VERBOSE,
2276 "re-using existing %s stream %d (pid=0x%x) for new pid=0x%x\n",2276 "reusing existing %s stream %d (pid=0x%x) for new pid=0x%x\n",
2277 av_get_media_type_string(found->codecpar->codec_type),2277 av_get_media_type_string(found->codecpar->codec_type),
2278 found->index, found->id, pid);2278 found->index, found->id, pid);
2279 }2279 }
libavformat/mpegts.h+2−2
@@ -90,7 +90,7 @@ · 89 unmodified lines
90#define ONIT_TID 0x41 /* Network Information section - other network */90#define ONIT_TID 0x41 /* Network Information section - other network */
91#define SDT_TID 0x42 /* Service Description section - actual TS */91#define SDT_TID 0x42 /* Service Description section - actual TS */
92/* TID from 0x43 to 0x45 are reserved for future use */92/* TID from 0x43 to 0x45 are reserved for future use */
93#define OSDT_TID 0x46 /* Service Descrition section - other TS */93#define OSDT_TID 0x46 /* Service Description section - other TS */
94/* TID from 0x47 to 0x49 are reserved for future use */94/* TID from 0x47 to 0x49 are reserved for future use */
95#define BAT_TID 0x4A /* Bouquet Association section */95#define BAT_TID 0x4A /* Bouquet Association section */
96#define UNT_TID 0x4B /* Update Notification Table section */96#define UNT_TID 0x4B /* Update Notification Table section */
@@ -106,7 +106,7 @@ · 9 unmodified lines
106#define RST_TID 0x71 /* Running Status section */106#define RST_TID 0x71 /* Running Status section */
107#define ST_TID 0x72 /* Stuffing section */107#define ST_TID 0x72 /* Stuffing section */
108#define TOT_TID 0x73 /* Time Offset section */108#define TOT_TID 0x73 /* Time Offset section */
109#define AIT_TID 0x74 /* Application Inforamtion section */109#define AIT_TID 0x74 /* Application Information section */
110#define CT_TID 0x75 /* Container section */110#define CT_TID 0x75 /* Container section */
111#define RCT_TID 0x76 /* Related Content section */111#define RCT_TID 0x76 /* Related Content section */
112#define CIT_TID 0x77 /* Content Identifier section */112#define CIT_TID 0x77 /* Content Identifier section */
libavformat/mvdec.c+1−1
@@ -47,7 +47,7 @@ typedef struct MvContext { · 46 unmodified lines
47 int aformat; ///< audio format47 int aformat; ///< audio format
48} MvContext;48} MvContext;
49 49
50/* these magic numbers are defined in moviefile.h on Silicon Grahpics IRIX */50/* these magic numbers are defined in moviefile.h on Silicon Graphics IRIX */
51#define MOVIE_SOUND 151#define MOVIE_SOUND 1
52#define MOVIE_SILENT 252#define MOVIE_SILENT 2
53 53
libavformat/mxfdec.c+1−1
@@ -955,7 +955,7 @@ static int mxf_add_metadata_set(MXFContext *mxf, MXFMetadataSet **metadata_set, · 954 unmodified lines
955 int ret;955 int ret;
956 956
957 // Index Table is special because it might be added manually without957 // Index Table is special because it might be added manually without
958 // partition and we iterate thorugh all instances of them. Also some files958 // partition and we iterate through all instances of them. Also some files
959 // use the same Instance UID for different index tables...959 // use the same Instance UID for different index tables...
960 if (type != IndexTableSegment) {960 if (type != IndexTableSegment) {
961 for (int i = 0; i < mg->metadata_sets_count; i++) {961 for (int i = 0; i < mg->metadata_sets_count; i++) {
libavformat/mxfenc.c+1−1
@@ -1062,7 +1062,7 @@ static void mxf_write_structural_component(AVFormatContext *s, AVStream *st, MXF · 1061 unmodified lines
1062 AVIOContext *pb = s->pb;1062 AVIOContext *pb = s->pb;
1063 1063
1064 mxf_write_metadata_key(pb, 0x011100);1064 mxf_write_metadata_key(pb, 0x011100);
1065 PRINT_KEY(s, "sturctural component key", pb->buf_ptr - 16);1065 PRINT_KEY(s, "structural component key", pb->buf_ptr - 16);
1066 klv_encode_ber_length(pb, 108);1066 klv_encode_ber_length(pb, 108);
1067 1067
1068 // write uid1068 // write uid
libavformat/nsvdec.c+1−1
@@ -72,7 +72,7 @@ · 71 unmodified lines
72 * so the header seems to not be mandatory. (for streaming).72 * so the header seems to not be mandatory. (for streaming).
73 *73 *
74 * index slice duration check (excepts nsvtrailer.nsv):74 * index slice duration check (excepts nsvtrailer.nsv):
75 * for f in [^n]*.nsv; do DUR="$(ffmpeg -i "$f" 2>/dev/null | grep 'NSVf duration' | cut -d ' ' -f 4)"; IC="$(ffmpeg -i "$f" 2>/dev/null | grep 'INDEX ENTRIES' | cut -d ' ' -f 2)"; echo "duration $DUR, slite time $(($DUR/$IC))"; done75 * for f in [^n]*.nsv; do DUR="$(ffmpeg -i "$f" 2>/dev/null | grep 'NSVf duration' | cut -d ' ' -f 4)"; IC="$(ffmpeg -i "$f" 2>/dev/null | grep 'INDEX ENTRIES' | cut -d ' ' -f 2)"; echo "duration $DUR, slice time $(($DUR/$IC))"; done
76 */76 */
77 77
78/*78/*
libavformat/oggdec.h+3−3
@@ -43,7 +43,7 @@ struct ogg_codec { · 42 unmodified lines
43 * @return < 0 (AVERROR) code or -1 on error43 * @return < 0 (AVERROR) code or -1 on error
44 * == 0 if the packet was a regular data packet.44 * == 0 if the packet was a regular data packet.
45 * == 1 if the packet was a header from a chained bitstream.45 * == 1 if the packet was a header from a chained bitstream.
46 * This will cause the packet to be skiped in calling code (ogg_packet()46 * This will cause the packet to be skipped in calling code (ogg_packet()
47 */47 */
48 int (*packet)(AVFormatContext *, int);48 int (*packet)(AVFormatContext *, int);
49 /**49 /**
@@ -141,7 +141,7 @@ extern const struct ogg_codec ff_vp8_codec; · 91 unmodified lines
141/**141/**
142 * Parse Vorbis comments142 * Parse Vorbis comments
143 *143 *
144 * @note The buffer will be temporarily modifed by this function,144 * @note The buffer will be temporarily modified by this function,
145 * so it needs to be writable. Furthermore it must be padded145 * so it needs to be writable. Furthermore it must be padded
146 * by a single byte (not counted in size).146 * by a single byte (not counted in size).
147 * All changes will have been reverted upon return.147 * All changes will have been reverted upon return.
@@ -152,7 +152,7 @@ int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, · 4 unmodified lines
152/**152/**
153 * Parse Vorbis comments and add metadata to an AVStream153 * Parse Vorbis comments and add metadata to an AVStream
154 *154 *
155 * @note The buffer will be temporarily modifed by this function,155 * @note The buffer will be temporarily modified by this function,
156 * so it needs to be writable. Furthermore it must be padded156 * so it needs to be writable. Furthermore it must be padded
157 * by a single byte (not counted in size).157 * by a single byte (not counted in size).
158 * All changes will have been reverted upon return.158 * All changes will have been reverted upon return.
libavformat/scd.c+1−1
@@ -52,7 +52,7 @@ typedef struct SCDOffsetTable { · 51 unmodified lines
52 52
53typedef struct SCDHeader {53typedef struct SCDHeader {
54 uint64_t magic; /* SEDBSSCF */54 uint64_t magic; /* SEDBSSCF */
55 uint32_t version; /* Verison number. We only know about 3. */55 uint32_t version; /* Version number. We only know about 3. */
56 uint16_t unk1; /* Unknown, 260 in Drakengard 3, 1024 in FFXIV. */56 uint16_t unk1; /* Unknown, 260 in Drakengard 3, 1024 in FFXIV. */
57 uint16_t header_size; /* Total size of this header. */57 uint16_t header_size; /* Total size of this header. */
58 uint32_t file_size; /* Is often 0, just ignore it. */58 uint32_t file_size; /* Is often 0, just ignore it. */
libavformat/segment.c+3−3
@@ -72,7 +72,7 @@ typedef struct SegmentContext { · 71 unmodified lines
72 const AVClass *class; /**< Class for private options. */72 const AVClass *class; /**< Class for private options. */
73 int segment_idx; ///< index of the segment file to write, starting from 073 int segment_idx; ///< index of the segment file to write, starting from 0
74 int segment_idx_wrap; ///< number after which the index wraps74 int segment_idx_wrap; ///< number after which the index wraps
75 int segment_idx_wrap_nb; ///< number of time the index has wraped75 int segment_idx_wrap_nb; ///< number of time the index has wrapped
76 int segment_count; ///< number of segment files already written76 int segment_count; ///< number of segment files already written
77 const AVOutputFormat *oformat;77 const AVOutputFormat *oformat;
78 AVFormatContext *avf;78 AVFormatContext *avf;
@@ -100,11 +100,11 @@ typedef struct SegmentContext { · 21 unmodified lines
100 100
101 char *times_str; ///< segment times specification string101 char *times_str; ///< segment times specification string
102 int64_t *times; ///< list of segment interval specification102 int64_t *times; ///< list of segment interval specification
103 int nb_times; ///< number of elments in the times array103 int nb_times; ///< number of elements in the times array
104 104
105 char *frames_str; ///< segment frame numbers specification string105 char *frames_str; ///< segment frame numbers specification string
106 int *frames; ///< list of frame number specification106 int *frames; ///< list of frame number specification
107 int nb_frames; ///< number of elments in the frames array107 int nb_frames; ///< number of elements in the frames array
108 int frame_count; ///< total number of reference frames108 int frame_count; ///< total number of reference frames
109 int segment_frame_count; ///< number of reference frames in the segment109 int segment_frame_count; ///< number of reference frames in the segment
110 110
libavformat/srtdec.c+2−2
@@ -199,8 +199,8 @@ static int srt_read_header(AVFormatContext *s) · 198 unmodified lines
199 }199 }
200 200
201 /* Append the last event. Here we force the cache to be flushed, because a201 /* Append the last event. Here we force the cache to be flushed, because a
202 * trailing number is more likely to be geniune (for example a copyright202 * trailing number is more likely to be genuine (for example a copyright
203 * date) and not the event index of an inexistant event */203 * date) and not the event index of an inexistent event */
204 if (has_event_info) {204 if (has_event_info) {
205 res = add_event(&srt->q, &buf, line_cache, &ei, 1);205 res = add_event(&srt->q, &buf, line_cache, &ei, 1);
206 if (res < 0)206 if (res < 0)
libavformat/tls_openssl.c+1−1
@@ -878,7 +878,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary ** · 877 unmodified lines
878 }878 }
879 }879 }
880 880
881 /* This seems to be neccesary despite explicitly setting client/server method above. */881 /* This seems to be necessary despite explicitly setting client/server method above. */
882 if (c->listen)882 if (c->listen)
883 SSL_set_accept_state(p->ssl);883 SSL_set_accept_state(p->ssl);
884 else884 else
libavformat/tls_schannel.c+1−1
@@ -1429,7 +1429,7 @@ static int tls_write(URLContext *h, const uint8_t *buf, int len) · 1428 unmodified lines
1429 1429
1430 ret = tls_process_send_buffer(h);1430 ret = tls_process_send_buffer(h);
1431 if (ret == AVERROR(EAGAIN)) {1431 if (ret == AVERROR(EAGAIN)) {
1432 /* We always need to signal that we consumed all (encryped) data since schannel must not1432 /* We always need to signal that we consumed all (encrypted) data since schannel must not
1433 be fed the same data again. Sending will then be completed next call to this function,1433 be fed the same data again. Sending will then be completed next call to this function,
1434 and EAGAIN returned until all remaining buffer is sent. */1434 and EAGAIN returned until all remaining buffer is sent. */
1435 return outbuf[1].cbBuffer;1435 return outbuf[1].cbBuffer;
libavformat/ttaenc.c+1−1
@@ -71,7 +71,7 @@ static int tta_write_header(AVFormatContext *s) · 70 unmodified lines
71 if ((ret = avio_open_dyn_buf(&tta->seek_table)) < 0)71 if ((ret = avio_open_dyn_buf(&tta->seek_table)) < 0)
72 return ret;72 return ret;
73 73
74 /* Ignore most extradata information if present. It can be innacurate74 /* Ignore most extradata information if present. It can be inaccurate
75 if for example remuxing from Matroska */75 if for example remuxing from Matroska */
76 ffio_init_checksum(s->pb, ff_crcEDB88320_update, UINT32_MAX);76 ffio_init_checksum(s->pb, ff_crcEDB88320_update, UINT32_MAX);
77 ffio_init_checksum(tta->seek_table, ff_crcEDB88320_update, UINT32_MAX);77 ffio_init_checksum(tta->seek_table, ff_crcEDB88320_update, UINT32_MAX);
libavformat/udp.c+1−1
@@ -545,7 +545,7 @@ static void *circular_buffer_task_rx( void *_URLContext) · 544 unmodified lines
545 545
546 pthread_mutex_unlock(&s->mutex);546 pthread_mutex_unlock(&s->mutex);
547 /* Blocking operations are always cancellation points;547 /* Blocking operations are always cancellation points;
548 see "General Information" / "Thread Cancelation Overview"548 see "General Information" / "Thread Cancellation Overview"
549 in Single Unix. */549 in Single Unix. */
550 pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelstate);550 pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old_cancelstate);
551 pkt_header.pkt_size = recvfrom(s->udp_fd, s->tmp + sizeof(pkt_header), sizeof(s->tmp) - sizeof(pkt_header), 0, (struct sockaddr *)&pkt_header.addr, &pkt_header.addr_len);551 pkt_header.pkt_size = recvfrom(s->udp_fd, s->tmp + sizeof(pkt_header), sizeof(s->tmp) - sizeof(pkt_header), 0, (struct sockaddr *)&pkt_header.addr, &pkt_header.addr_len);
libavformat/wavenc.c+1−1
@@ -252,7 +252,7 @@ static int peak_write_chunk(AVFormatContext *s) · 251 unmodified lines
252 WAVMuxContext *wav = s->priv_data;252 WAVMuxContext *wav = s->priv_data;
253 AVIOContext *pb = s->pb;253 AVIOContext *pb = s->pb;
254 AVCodecParameters *par = s->streams[0]->codecpar;254 AVCodecParameters *par = s->streams[0]->codecpar;
255 int64_t peak = ff_start_tag(s->pb, "levl");255 int64_t peak = ff_start_tag(s->pb, "levl"); // codespell:ignore
256 int64_t now0;256 int64_t now0;
257 time_t now_secs;257 time_t now_secs;
258 char timestamp[28];258 char timestamp[28];
libavformat/whip.c+1−1
@@ -258,7 +258,7 @@ typedef struct WHIPContext { · 257 unmodified lines
258 int64_t whip_dtls_time;258 int64_t whip_dtls_time;
259 int64_t whip_srtp_time;259 int64_t whip_srtp_time;
260 260
261 /* The certificate and private key content used for DTLS hanshake */261 /* The certificate and private key content used for DTLS handshake */
262 char cert_buf[MAX_CERTIFICATE_SIZE];262 char cert_buf[MAX_CERTIFICATE_SIZE];
263 char key_buf[MAX_CERTIFICATE_SIZE];263 char key_buf[MAX_CERTIFICATE_SIZE];
264 /* The fingerprint of certificate, used in SDP offer. */264 /* The fingerprint of certificate, used in SDP offer. */
libavformat/wtvenc.c+1−1
@@ -575,7 +575,7 @@ static int write_root_table(AVFormatContext *s, int64_t sector_pos) · 574 unmodified lines
575 }575 }
576 }576 }
577 577
578 // caculate root table size578 // calculate root table size
579 size = avio_tell(pb) - sector_pos;579 size = avio_tell(pb) - sector_pos;
580 pad = WTV_SECTOR_SIZE- size;580 pad = WTV_SECTOR_SIZE- size;
581 write_pad(pb, pad);581 write_pad(pb, pad);
libavutil/channel_layout.h+2−2
@@ -307,7 +307,7 @@ typedef struct AVChannelCustom { · 306 unmodified lines
307 * - with a constructor function, such as av_channel_layout_default(),307 * - with a constructor function, such as av_channel_layout_default(),
308 * av_channel_layout_from_mask() or av_channel_layout_from_string().308 * av_channel_layout_from_mask() or av_channel_layout_from_string().
309 *309 *
310 * The channel layout must be unitialized with av_channel_layout_uninit()310 * The channel layout must be uninitialized with av_channel_layout_uninit()
311 *311 *
312 * Copying an AVChannelLayout via assigning is forbidden,312 * Copying an AVChannelLayout via assigning is forbidden,
313 * av_channel_layout_copy() must be used instead (and its return value should313 * av_channel_layout_copy() must be used instead (and its return value should
@@ -365,7 +365,7 @@ typedef struct AVChannelLayout { · 51 unmodified lines
365 *365 *
366 * map[i].name may be filled with a 0-terminated string, in which case366 * map[i].name may be filled with a 0-terminated string, in which case
367 * it will be used for the purpose of identifying the channel with the367 * it will be used for the purpose of identifying the channel with the
368 * convenience functions below. Otherise it must be zeroed.368 * convenience functions below. Otherwise it must be zeroed.
369 */369 */
370 AVChannelCustom *map;370 AVChannelCustom *map;
371 } u;371 } u;
libavutil/csp.h+1−1
@@ -114,7 +114,7 @@ const AVColorPrimariesDesc *av_csp_primaries_desc_from_id(enum AVColorPrimaries · 113 unmodified lines
114 * @see enum AVColorPrimaries114 * @see enum AVColorPrimaries
115 * @param prm A description of the colorspace gamut115 * @param prm A description of the colorspace gamut
116 * @return The enum constant associated with this gamut, or116 * @return The enum constant associated with this gamut, or
117 * AVCOL_PRI_UNSPECIFIED if no clear match can be idenitified.117 * AVCOL_PRI_UNSPECIFIED if no clear match can be identified.
118 */118 */
119enum AVColorPrimaries av_csp_primaries_id_from_desc(const AVColorPrimariesDesc *prm);119enum AVColorPrimaries av_csp_primaries_id_from_desc(const AVColorPrimariesDesc *prm);
120 120
libavutil/dict.h+1−1
@@ -225,7 +225,7 @@ void av_dict_free(AVDictionary **m); · 224 unmodified lines
225 * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same.225 * @warning Separators cannot be neither '\\' nor '\0'. They also cannot be the same.
226 *226 *
227 * @param[in] m The dictionary227 * @param[in] m The dictionary
228 * @param[out] buffer Pointer to buffer that will be allocated with string containg entries.228 * @param[out] buffer Pointer to buffer that will be allocated with string containing entries.
229 * Buffer must be freed by the caller when is no longer needed.229 * Buffer must be freed by the caller when is no longer needed.
230 * @param[in] key_val_sep Character used to separate key from value230 * @param[in] key_val_sep Character used to separate key from value
231 * @param[in] pairs_sep Character used to separate two pairs from each other231 * @param[in] pairs_sep Character used to separate two pairs from each other
libavutil/film_grain_params.h+1−1
@@ -124,7 +124,7 @@ typedef struct AVFilmGrainAOMParams { · 123 unmodified lines
124 124
125/**125/**
126 * This structure describes how to handle film grain synthesis for codecs using126 * This structure describes how to handle film grain synthesis for codecs using
127 * the ITU-T H.274 Versatile suplemental enhancement information message.127 * the ITU-T H.274 Versatile supplemental enhancement information message.
128 *128 *
129 * @note The struct must be allocated as part of AVFilmGrainParams using129 * @note The struct must be allocated as part of AVFilmGrainParams using
130 * av_film_grain_params_alloc(). Its size is not a part of the public ABI.130 * av_film_grain_params_alloc(). Its size is not a part of the public ABI.
libavutil/frame.h+1−1
@@ -96,7 +96,7 @@ enum AVFrameSideDataType { · 95 unmodified lines
96 */96 */
97 AV_FRAME_DATA_MOTION_VECTORS,97 AV_FRAME_DATA_MOTION_VECTORS,
98 /**98 /**
99 * Recommmends skipping the specified number of samples. This is exported99 * Recommends skipping the specified number of samples. This is exported
100 * only if the "skip_manual" AVOption is set in libavcodec.100 * only if the "skip_manual" AVOption is set in libavcodec.
101 * This has the same format as AV_PKT_DATA_SKIP_SAMPLES.101 * This has the same format as AV_PKT_DATA_SKIP_SAMPLES.
102 * @code102 * @code
libavutil/hdr_dynamic_vivid_metadata.h+3−3
@@ -83,7 +83,7 @@ typedef struct AVHDRVividColorToneMappingParams { · 82 unmodified lines
83 AVRational targeted_system_display_maximum_luminance;83 AVRational targeted_system_display_maximum_luminance;
84 84
85 /**85 /**
86 * This flag indicates that transfer the base paramter(for value of 1)86 * This flag indicates that transfer the base parameter(for value of 1)
87 */87 */
88 int base_enable_flag;88 int base_enable_flag;
89 89
@@ -145,7 +145,7 @@ typedef struct AVHDRVividColorToneMappingParams { · 55 unmodified lines
145 int base_param_k3;145 int base_param_k3;
146 146
147 /**147 /**
148 * This flag indicates that delta mode of base paramter(for value of 1)148 * This flag indicates that delta mode of base parameter(for value of 1)
149 */149 */
150 int base_param_Delta_enable_mode;150 int base_param_Delta_enable_mode;
151 151
@@ -158,7 +158,7 @@ typedef struct AVHDRVividColorToneMappingParams { · 6 unmodified lines
158 158
159 /**159 /**
160 * indicates 3Spline_enable_flag in the base parameter,160 * indicates 3Spline_enable_flag in the base parameter,
161 * This flag indicates that transfer three Spline of base paramter(for value of 1)161 * This flag indicates that transfer three Spline of base parameter(for value of 1)
162 */162 */
163 int three_Spline_enable_flag;163 int three_Spline_enable_flag;
164 164
libavutil/hwcontext.h+1−1
@@ -563,7 +563,7 @@ enum { · 562 unmodified lines
563 * values indicate that it failed somehow.563 * values indicate that it failed somehow.
564 *564 *
565 * On failure, the destination frame will be left blank, except for the565 * On failure, the destination frame will be left blank, except for the
566 * hw_frames_ctx/format fields thay may have been set by the caller - those will566 * hw_frames_ctx/format fields they may have been set by the caller - those will
567 * be preserved as they were.567 * be preserved as they were.
568 *568 *
569 * @param dst Destination frame, to contain the mapping.569 * @param dst Destination frame, to contain the mapping.
libavutil/hwcontext_opencl.h+1−1
@@ -75,7 +75,7 @@ typedef struct AVOpenCLDeviceContext { · 74 unmodified lines
75 /**75 /**
76 * The default command queue for this device, which will be used by all76 * The default command queue for this device, which will be used by all
77 * frames contexts which do not have their own command queue. If not77 * frames contexts which do not have their own command queue. If not
78 * intialised by the user, a default queue will be created on the78 * initialised by the user, a default queue will be created on the
79 * primary device.79 * primary device.
80 */80 */
81 cl_command_queue command_queue;81 cl_command_queue command_queue;
libavutil/hwcontext_qsv.c+7−7
@@ -146,24 +146,24 @@ static const struct { · 145 unmodified lines
146 { AV_PIX_FMT_Y210,146 { AV_PIX_FMT_Y210,
147 MFX_FOURCC_Y210, 1 },147 MFX_FOURCC_Y210, 1 },
148 // VUYX is used for VAAPI child device,148 // VUYX is used for VAAPI child device,
149 // the SDK only delares support for AYUV149 // the SDK only declares support for AYUV
150 { AV_PIX_FMT_VUYX,150 { AV_PIX_FMT_VUYX,
151 MFX_FOURCC_AYUV, 0 },151 MFX_FOURCC_AYUV, 0 },
152 // XV30 is used for VAAPI child device,152 // XV30 is used for VAAPI child device,
153 // the SDK only delares support for Y410153 // the SDK only declares support for Y410
154 { AV_PIX_FMT_XV30,154 { AV_PIX_FMT_XV30,
155 MFX_FOURCC_Y410, 0 },155 MFX_FOURCC_Y410, 0 },
156#if QSV_VERSION_ATLEAST(1, 31)156#if QSV_VERSION_ATLEAST(1, 31)
157 // P012 is used for VAAPI child device,157 // P012 is used for VAAPI child device,
158 // the SDK only delares support for P016158 // the SDK only declares support for P016
159 { AV_PIX_FMT_P012,159 { AV_PIX_FMT_P012,
160 MFX_FOURCC_P016, 1 },160 MFX_FOURCC_P016, 1 },
161 // Y212 is used for VAAPI child device,161 // Y212 is used for VAAPI child device,
162 // the SDK only delares support for Y216162 // the SDK only declares support for Y216
163 { AV_PIX_FMT_Y212,163 { AV_PIX_FMT_Y212,
164 MFX_FOURCC_Y216, 1 },164 MFX_FOURCC_Y216, 1 },
165 // XV36 is used for VAAPI child device,165 // XV36 is used for VAAPI child device,
166 // the SDK only delares support for Y416166 // the SDK only declares support for Y416
167 { AV_PIX_FMT_XV36,167 { AV_PIX_FMT_XV36,
168 MFX_FOURCC_Y416, 1 },168 MFX_FOURCC_Y416, 1 },
169#endif169#endif
@@ -1837,7 +1837,7 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, · 1667 unmodified lines
1837 1837
1838 /* According to MSDK spec for mfxframeinfo, "Width must be a multiple of 16.1838 /* According to MSDK spec for mfxframeinfo, "Width must be a multiple of 16.
1839 * Height must be a multiple of 16 for progressive frame sequence and a1839 * Height must be a multiple of 16 for progressive frame sequence and a
1840 * multiple of 32 otherwise.", so allign all frames to 16 before downloading. */1840 * multiple of 32 otherwise.", so align all frames to 16 before downloading. */
1841 if (dst->height & 15 || dst->linesize[0] & 15) {1841 if (dst->height & 15 || dst->linesize[0] & 15) {
1842 realigned = 1;1842 realigned = 1;
1843 if (tmp_frame->format != dst->format ||1843 if (tmp_frame->format != dst->format ||
@@ -1921,7 +1921,7 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, · 77 unmodified lines
1921 1921
1922 /* According to MSDK spec for mfxframeinfo, "Width must be a multiple of 16.1922 /* According to MSDK spec for mfxframeinfo, "Width must be a multiple of 16.
1923 * Height must be a multiple of 16 for progressive frame sequence and a1923 * Height must be a multiple of 16 for progressive frame sequence and a
1924 * multiple of 32 otherwise.", so allign all frames to 16 before uploading. */1924 * multiple of 32 otherwise.", so align all frames to 16 before uploading. */
1925 if (src->height & 15 || src->linesize[0] & 15) {1925 if (src->height & 15 || src->linesize[0] & 15) {
1926 realigned = 1;1926 realigned = 1;
1927 if (tmp_frame->format != src->format ||1927 if (tmp_frame->format != src->format ||
libavutil/hwcontext_vulkan.c+1−1
@@ -2568,7 +2568,7 @@ static int create_frame(AVHWFramesContext *hwfc, AVVkFrame **frame, · 2567 unmodified lines
2568 return AVERROR(ENOMEM);2568 return AVERROR(ENOMEM);
2569 }2569 }
2570 2570
2571 // TODO: check witdh and height for alignment in case of multiplanar (must be mod-2 if subsampled)2571 // TODO: check width and height for alignment in case of multiplanar (must be mod-2 if subsampled)
2572 2572
2573 /* Create the images */2573 /* Create the images */
2574 for (int i = 0; (hwfc_vk->format[i] != VK_FORMAT_UNDEFINED); i++) {2574 for (int i = 0; (hwfc_vk->format[i] != VK_FORMAT_UNDEFINED); i++) {
libavutil/hwcontext_vulkan.h+1−1
@@ -115,7 +115,7 @@ typedef struct AVVulkanDeviceContext { · 114 unmodified lines
115#if FF_API_VULKAN_FIXED_QUEUES115#if FF_API_VULKAN_FIXED_QUEUES
116 /**116 /**
117 * Queue family index for graphics operations, and the number of queues117 * Queue family index for graphics operations, and the number of queues
118 * enabled for it. If unavaiable, will be set to -1. Not required.118 * enabled for it. If unavailable, will be set to -1. Not required.
119 * av_hwdevice_create() will attempt to find a dedicated queue for each119 * av_hwdevice_create() will attempt to find a dedicated queue for each
120 * queue family, or pick the one with the least unrelated flags set.120 * queue family, or pick the one with the least unrelated flags set.
121 * Queue indices here may overlap if a queue has to share capabilities.121 * Queue indices here may overlap if a queue has to share capabilities.
libavutil/iamf.h+2−2
@@ -213,11 +213,11 @@ typedef struct AVIAMFParamDefinition { · 212 unmodified lines
213 enum AVIAMFParamDefinitionType type;213 enum AVIAMFParamDefinitionType type;
214 214
215 /**215 /**
216 * Identifier for the paremeter substream.216 * Identifier for the parameter substream.
217 */217 */
218 unsigned int parameter_id;218 unsigned int parameter_id;
219 /**219 /**
220 * Sample rate for the paremeter substream. It must not be 0.220 * Sample rate for the parameter substream. It must not be 0.
221 */221 */
222 unsigned int parameter_rate;222 unsigned int parameter_rate;
223 223
libavutil/internal.h+1−1
@@ -141,7 +141,7 @@ void avpriv_request_sample(void *avc, · 140 unmodified lines
141# define ff_tlog(ctx, ...) do { } while(0)141# define ff_tlog(ctx, ...) do { } while(0)
142#endif142#endif
143 143
144// For debuging we use signed operations so overflows can be detected (by ubsan)144// For debugging we use signed operations so overflows can be detected (by ubsan)
145// For production we use unsigned so there are no undefined operations145// For production we use unsigned so there are no undefined operations
146#ifdef CHECKED146#ifdef CHECKED
147#define SUINT int147#define SUINT int
libavutil/lfg.h+2−2
@@ -28,7 +28,7 @@ · 27 unmodified lines
28 * Context structure for the Lagged Fibonacci PRNG.28 * Context structure for the Lagged Fibonacci PRNG.
29 * The exact layout, types and content of this struct may change and should29 * The exact layout, types and content of this struct may change and should
30 * not be accessed directly. Only its `sizeof()` is guaranteed to stay the same30 * not be accessed directly. Only its `sizeof()` is guaranteed to stay the same
31 * to allow easy instanciation.31 * to allow easy instantiation.
32 */32 */
33typedef struct AVLFG {33typedef struct AVLFG {
34 unsigned int state[64];34 unsigned int state[64];
@@ -73,7 +73,7 @@ static inline unsigned int av_mlfg_get(AVLFG *c){ · 38 unmodified lines
73 * Get the next two numbers generated by a Box-Muller Gaussian73 * Get the next two numbers generated by a Box-Muller Gaussian
74 * generator using the random numbers issued by lfg.74 * generator using the random numbers issued by lfg.
75 *75 *
76 * @param lfg pointer to the contex structure76 * @param lfg pointer to the context structure
77 * @param out array where the two generated numbers are placed77 * @param out array where the two generated numbers are placed
78 */78 */
79void av_bmg_get(AVLFG *lfg, double out[2]);79void av_bmg_get(AVLFG *lfg, double out[2]);
libavutil/log.h+2−2
@@ -277,9 +277,9 @@ void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4); · 276 unmodified lines
277 * @param avcl A pointer to an arbitrary struct of which the first field is a277 * @param avcl A pointer to an arbitrary struct of which the first field is a
278 * pointer to an AVClass struct or NULL if general log.278 * pointer to an AVClass struct or NULL if general log.
279 * @param initial_level importance level of the message expressed using a @ref279 * @param initial_level importance level of the message expressed using a @ref
280 * lavu_log_constants "Logging Constant" for the first occurance.280 * lavu_log_constants "Logging Constant" for the first occurrence.
281 * @param subsequent_level importance level of the message expressed using a @ref281 * @param subsequent_level importance level of the message expressed using a @ref
282 * lavu_log_constants "Logging Constant" after the first occurance.282 * lavu_log_constants "Logging Constant" after the first occurrence.
283 * @param fmt The format string (printf-compatible) that specifies how283 * @param fmt The format string (printf-compatible) that specifies how
284 * subsequent arguments are converted to output.284 * subsequent arguments are converted to output.
285 * @param state a variable to keep trak of if a message has already been printed285 * @param state a variable to keep trak of if a message has already been printed
libavutil/mathematics.h+1−1
@@ -278,7 +278,7 @@ int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts, AVRational fs_tb, int · 277 unmodified lines
278/**278/**
279 * Add a value to a timestamp.279 * Add a value to a timestamp.
280 *280 *
281 * This function guarantees that when the same value is repeatly added that281 * This function guarantees that when the same value is repeatedly added that
282 * no accumulation of rounding errors occurs.282 * no accumulation of rounding errors occurs.
283 *283 *
284 * @param[in] ts Input timestamp284 * @param[in] ts Input timestamp
libavutil/opt.h+4−4
@@ -542,7 +542,7 @@ typedef struct AVOptionRanges { · 541 unmodified lines
542 */542 */
543 int nb_ranges;543 int nb_ranges;
544 /**544 /**
545 * Number of componentes.545 * Number of components.
546 */546 */
547 int nb_components;547 int nb_components;
548} AVOptionRanges;548} AVOptionRanges;
@@ -1137,7 +1137,7 @@ int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name) · 588 unmodified lines
1137 * @param[in] obj AVClass object to serialize1137 * @param[in] obj AVClass object to serialize
1138 * @param[in] opt_flags serialize options with all the specified flags set (AV_OPT_FLAG)1138 * @param[in] opt_flags serialize options with all the specified flags set (AV_OPT_FLAG)
1139 * @param[in] flags combination of AV_OPT_SERIALIZE_* flags1139 * @param[in] flags combination of AV_OPT_SERIALIZE_* flags
1140 * @param[out] buffer Pointer to buffer that will be allocated with string containg serialized options.1140 * @param[out] buffer Pointer to buffer that will be allocated with string containing serialized options.
1141 * Buffer must be freed by the caller when is no longer needed.1141 * Buffer must be freed by the caller when is no longer needed.
1142 * @param[in] key_val_sep character used to separate key from value1142 * @param[in] key_val_sep character used to separate key from value
1143 * @param[in] pairs_sep character used to separate two pairs from each other1143 * @param[in] pairs_sep character used to separate two pairs from each other
@@ -1167,7 +1167,7 @@ void av_opt_freep_ranges(AVOptionRanges **ranges); · 23 unmodified lines
1167 *1167 *
1168 * The result must be freed with av_opt_freep_ranges.1168 * The result must be freed with av_opt_freep_ranges.
1169 *1169 *
1170 * @return number of compontents returned on success, a negative errro code otherwise1170 * @return number of components returned on success, a negative error code otherwise
1171 */1171 */
1172int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags);1172int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags);
1173 1173
@@ -1183,7 +1183,7 @@ int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags · 9 unmodified lines
1183 *1183 *
1184 * The result must be freed with av_opt_free_ranges.1184 * The result must be freed with av_opt_free_ranges.
1185 *1185 *
1186 * @return number of compontents returned on success, a negative errro code otherwise1186 * @return number of components returned on success, a negative error code otherwise
1187 */1187 */
1188int av_opt_query_ranges_default(AVOptionRanges **, void *obj, const char *key, int flags);1188int av_opt_query_ranges_default(AVOptionRanges **, void *obj, const char *key, int flags);
1189 1189
libavutil/rational.h+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
22/**22/**
23 * @file23 * @file
24 * @ingroup lavu_math_rational24 * @ingroup lavu_math_rational
25 * Utilties for rational number calculation.25 * Utilities for rational number calculation.
26 * @author Michael Niedermayer <michaelni@gmx.at>26 * @author Michael Niedermayer <michaelni@gmx.at>
27 */27 */
28 28
libavutil/rc4.h+1−1
@@ -43,7 +43,7 @@ AVRC4 *av_rc4_alloc(void); · 42 unmodified lines
43 * @brief Initializes an AVRC4 context.43 * @brief Initializes an AVRC4 context.
44 *44 *
45 * @param d pointer to the AVRC4 context45 * @param d pointer to the AVRC4 context
46 * @param key buffer containig the key46 * @param key buffer containing the key
47 * @param key_bits must be a multiple of 847 * @param key_bits must be a multiple of 8
48 * @param decrypt 0 for encryption, 1 for decryption, currently has no effect48 * @param decrypt 0 for encryption, 1 for decryption, currently has no effect
49 * @return zero on success, negative value otherwise49 * @return zero on success, negative value otherwise
libavutil/refstruct.h+1−1
@@ -161,7 +161,7 @@ int av_refstruct_exclusive(const void *obj); · 160 unmodified lines
161 *161 *
162 * Frequently allocating and freeing large or complicated objects may be slow162 * Frequently allocating and freeing large or complicated objects may be slow
163 * and wasteful. This API is meant to solve this in cases when the caller163 * and wasteful. This API is meant to solve this in cases when the caller
164 * needs a set of interchangable objects.164 * needs a set of interchangeable objects.
165 *165 *
166 * At the beginning, the user must call allocate the pool via166 * At the beginning, the user must call allocate the pool via
167 * av_refstruct_pool_alloc() or its analogue av_refstruct_pool_alloc_ext().167 * av_refstruct_pool_alloc() or its analogue av_refstruct_pool_alloc_ext().
libavutil/tdrdi.h+1−1
@@ -119,7 +119,7 @@ typedef struct AV3DReferenceDisplay { · 118 unmodified lines
119 uint8_t mantissa_ref_display_width;119 uint8_t mantissa_ref_display_width;
120 120
121 /**121 /**
122 * Tthe exponent part of the reference viewing distance of the n-th reference display.122 * The exponent part of the reference viewing distance of the n-th reference display.
123 */123 */
124 uint8_t exponent_ref_viewing_distance;124 uint8_t exponent_ref_viewing_distance;
125 125
libavutil/tests/opt.c+1−1
@@ -491,7 +491,7 @@ int main(void) · 490 unmodified lines
491 av_log_set_level(AV_LOG_QUIET);491 av_log_set_level(AV_LOG_QUIET);
492 492
493 for (i=0; i < FF_ARRAY_ELEMS(options); i++) {493 for (i=0; i < FF_ARRAY_ELEMS(options); i++) {
494 int silence_log = !strcmp(options[i], "rational=-1/0"); // inf formating differs between platforms494 int silence_log = !strcmp(options[i], "rational=-1/0"); // inf formatting differs between platforms
495 av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]);495 av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]);
496 if (silence_log)496 if (silence_log)
497 av_log_set_callback(NULL);497 av_log_set_callback(NULL);
libavutil/tests/sha512.c+1−1
@@ -55,7 +55,7 @@ int main(void) · 54 unmodified lines
55 printf("%02X", digest[i]);55 printf("%02X", digest[i]);
56 putchar('\n');56 putchar('\n');
57 }57 }
58 switch (j) { //test vectors (from FIPS PUB 180-4 Apendix A)58 switch (j) { //test vectors (from FIPS PUB 180-4 Appendix A)
59 case 0:59 case 0:
60 printf("4634270f 707b6a54 daae7530 460842e2 0e37ed26 5ceee9a4 3e8924aa\n"60 printf("4634270f 707b6a54 daae7530 460842e2 0e37ed26 5ceee9a4 3e8924aa\n"
61 "23fec5bb 94d60b23 30819264 0b0c4533 35d66473 4fe40e72 68674af9\n"61 "23fec5bb 94d60b23 30819264 0b0c4533 35d66473 4fe40e72 68674af9\n"
libavutil/tx.h+1−1
@@ -50,7 +50,7 @@ enum AVTXType { · 49 unmodified lines
50 50
51 /**51 /**
52 * Standard MDCT with a sample data type of float, double or int32_t,52 * Standard MDCT with a sample data type of float, double or int32_t,
53 * respecively. For the float and int32 variants, the scale type is53 * respectively. For the float and int32 variants, the scale type is
54 * 'float', while for the double variant, it's 'double'.54 * 'float', while for the double variant, it's 'double'.
55 * If scale is NULL, 1.0 will be used as a default.55 * If scale is NULL, 1.0 will be used as a default.
56 *56 *
libavutil/tx_template.c+1−1
@@ -1031,7 +1031,7 @@ retry: · 1030 unmodified lines
1031 break;1031 break;
1032 }1032 }
1033 1033
1034 /* If nothing was sucessful, error out */1034 /* If nothing was successful, error out */
1035 if (ret < 0)1035 if (ret < 0)
1036 return ret;1036 return ret;
1037 1037
libavutil/version.h+2−2
@@ -35,7 +35,7 @@ · 34 unmodified lines
35 * Useful to check and match library version in order to maintain35 * Useful to check and match library version in order to maintain
36 * backward compatibility.36 * backward compatibility.
37 *37 *
38 * The FFmpeg libraries follow a versioning sheme very similar to38 * The FFmpeg libraries follow a versioning scheme very similar to
39 * Semantic Versioning (http://semver.org/)39 * Semantic Versioning (http://semver.org/)
40 * The difference is that the component called PATCH is called MICRO in FFmpeg40 * The difference is that the component called PATCH is called MICRO in FFmpeg
41 * and its value is reset to 100 instead of 0 to keep it above or equal to 100.41 * and its value is reset to 100 instead of 0 to keep it above or equal to 100.
@@ -72,7 +72,7 @@ · 30 unmodified lines
72/**72/**
73 * @defgroup lavu_ver Version and Build diagnostics73 * @defgroup lavu_ver Version and Build diagnostics
74 *74 *
75 * Macros and function useful to check at compiletime and at runtime75 * Macros and function useful to check at compile time and at runtime
76 * which version of libavutil is in use.76 * which version of libavutil is in use.
77 *77 *
78 * @{78 * @{
libavutil/video_hint.h+1−1
@@ -80,7 +80,7 @@ av_video_hint_get_rect(const AVVideoHint *hints, size_t idx) { · 79 unmodified lines
80 * The side data contains a list of rectangles for the portions of the frame80 * The side data contains a list of rectangles for the portions of the frame
81 * which changed from the last encoded one (and the remainder are assumed to be81 * which changed from the last encoded one (and the remainder are assumed to be
82 * changed), or, alternately (depending on the type parameter) the unchanged82 * changed), or, alternately (depending on the type parameter) the unchanged
83 * ones (and the remanining ones are those which changed).83 * ones (and the remaining ones are those which changed).
84 * Macroblocks will thus be hinted either to be P_SKIP-ped or go through the84 * Macroblocks will thus be hinted either to be P_SKIP-ped or go through the
85 * regular encoding procedure.85 * regular encoding procedure.
86 *86 *
libavutil/vulkan.c+1−1
@@ -447,7 +447,7 @@ int ff_vk_exec_pool_init(FFVulkanContext *s, AVVulkanDeviceQueueFamily *qf, · 446 unmodified lines
447 pool->query_results = nb_queries;447 pool->query_results = nb_queries;
448 pool->query_statuses = nb_queries;448 pool->query_statuses = nb_queries;
449 449
450 /* Video encode quieries produce two results per query */450 /* Video encode queries produce two results per query */
451 if (query_type == VK_QUERY_TYPE_VIDEO_ENCODE_FEEDBACK_KHR) {451 if (query_type == VK_QUERY_TYPE_VIDEO_ENCODE_FEEDBACK_KHR) {
452 int nb_results = av_popcount(ef->encodeFeedbackFlags);452 int nb_results = av_popcount(ef->encodeFeedbackFlags);
453 pool->query_status_stride = nb_results + 1;453 pool->query_status_stride = nb_results + 1;
libswresample/rematrix.c+2−2
@@ -115,9 +115,9 @@ static int sane_layout(AVChannelLayout *ch_layout) { · 114 unmodified lines
115 return 0;115 return 0;
116 if(!av_channel_layout_subset(ch_layout, AV_CH_LAYOUT_SURROUND)) // at least 1 front speaker116 if(!av_channel_layout_subset(ch_layout, AV_CH_LAYOUT_SURROUND)) // at least 1 front speaker
117 return 0;117 return 0;
118 if(!even(av_channel_layout_subset(ch_layout, (AV_CH_FRONT_LEFT | AV_CH_FRONT_RIGHT)))) // no asymetric front118 if(!even(av_channel_layout_subset(ch_layout, (AV_CH_FRONT_LEFT | AV_CH_FRONT_RIGHT)))) // no asymmetric front
119 return 0;119 return 0;
120 if(!even(av_channel_layout_subset(ch_layout, (AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT)))) // no asymetric side120 if(!even(av_channel_layout_subset(ch_layout, (AV_CH_SIDE_LEFT | AV_CH_SIDE_RIGHT)))) // no asymmetric side
121 return 0;121 return 0;
122 if(!even(av_channel_layout_subset(ch_layout, (AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT))))122 if(!even(av_channel_layout_subset(ch_layout, (AV_CH_BACK_LEFT | AV_CH_BACK_RIGHT))))
123 return 0;123 return 0;
libswresample/swresample.h+1−1
@@ -337,7 +337,7 @@ int64_t swr_next_pts(struct SwrContext *s, int64_t pts); · 336 unmodified lines
337 * @}337 * @}
338 *338 *
339 * @name Low-level option setting functions339 * @name Low-level option setting functions
340 * These functons provide a means to set low-level options that is not possible340 * These functions provide a means to set low-level options that is not possible
341 * with the AVOption API.341 * with the AVOption API.
342 * @{342 * @{
343 */343 */
libswscale/aarch64/hscale.S+13−13
@@ -261,12 +261,12 @@ function ff_hscale8to15_4_neon, export=1 · 260 unmodified lines
261 add x5, x5, #32 // advance filterPos261 add x5, x5, #32 // advance filterPos
262 262
263 // interleaved SIMD and prefetching intended to keep ld/st and vector pipelines busy263 // interleaved SIMD and prefetching intended to keep ld/st and vector pipelines busy
264 uxtl v16.8h, v16.8b // unsigned extend long, covert src data to 16-bit264 uxtl v16.8h, v16.8b // unsigned extend long, convert src data to 16-bit
265 uxtl v17.8h, v17.8b // unsigned extend long, covert src data to 16-bit265 uxtl v17.8h, v17.8b // unsigned extend long, convert src data to 16-bit
266 ldr w8, [x3, w8, uxtw] // src[filterPos[idx + 0]], next iteration266 ldr w8, [x3, w8, uxtw] // src[filterPos[idx + 0]], next iteration
267 ldr w9, [x3, w9, uxtw] // src[filterPos[idx + 1]], next iteration267 ldr w9, [x3, w9, uxtw] // src[filterPos[idx + 1]], next iteration
268 uxtl v18.8h, v18.8b // unsigned extend long, covert src data to 16-bit268 uxtl v18.8h, v18.8b // unsigned extend long, convert src data to 16-bit
269 uxtl v19.8h, v19.8b // unsigned extend long, covert src data to 16-bit269 uxtl v19.8h, v19.8b // unsigned extend long, convert src data to 16-bit
270 ldr w10, [x3, w10, uxtw] // src[filterPos[idx + 2]], next iteration270 ldr w10, [x3, w10, uxtw] // src[filterPos[idx + 2]], next iteration
271 ldr w11, [x3, w11, uxtw] // src[filterPos[idx + 3]], next iteration271 ldr w11, [x3, w11, uxtw] // src[filterPos[idx + 3]], next iteration
272 272
@@ -302,10 +302,10 @@ function ff_hscale8to15_4_neon, export=1 · 29 unmodified lines
302 movi v0.16b, #0 // Clear madd accumulator for idx 0..3302 movi v0.16b, #0 // Clear madd accumulator for idx 0..3
303 movi v5.16b, #0 // Clear madd accumulator for idx 4..7303 movi v5.16b, #0 // Clear madd accumulator for idx 4..7
304 304
305 uxtl v16.8h, v16.8b // unsigned extend long, covert src data to 16-bit305 uxtl v16.8h, v16.8b // unsigned extend long, convert src data to 16-bit
306 uxtl v17.8h, v17.8b // unsigned extend long, covert src data to 16-bit306 uxtl v17.8h, v17.8b // unsigned extend long, convert src data to 16-bit
307 uxtl v18.8h, v18.8b // unsigned extend long, covert src data to 16-bit307 uxtl v18.8h, v18.8b // unsigned extend long, convert src data to 16-bit
308 uxtl v19.8h, v19.8b // unsigned extend long, covert src data to 16-bit308 uxtl v19.8h, v19.8b // unsigned extend long, convert src data to 16-bit
309 309
310 smlal v0.4s, v1.4h, v16.4h // multiply accumulate inner loop j = 0, idx = 0..3310 smlal v0.4s, v1.4h, v16.4h // multiply accumulate inner loop j = 0, idx = 0..3
311 smlal v0.4s, v2.4h, v17.4h // multiply accumulate inner loop j = 1, idx = 0..3311 smlal v0.4s, v2.4h, v17.4h // multiply accumulate inner loop j = 1, idx = 0..3
@@ -336,7 +336,7 @@ function ff_hscale8to15_4_neon, export=1 · 24 unmodified lines
336 // load filter336 // load filter
337 ld1 {v6.4h}, [x4], #8 // filter[filterSize * i + 0..3]337 ld1 {v6.4h}, [x4], #8 // filter[filterSize * i + 0..3]
338 338
339 uxtl v5.8h, v5.8b // unsigned exten long, convert src data to 16-bit339 uxtl v5.8h, v5.8b // unsigned extend long, convert src data to 16-bit
340 smull v0.4s, v5.4h, v6.4h // 4 iterations of src[...] * filter[...]340 smull v0.4s, v5.4h, v6.4h // 4 iterations of src[...] * filter[...]
341 addv s0, v0.4s // add up products of src and filter values341 addv s0, v0.4s // add up products of src and filter values
342 sqshrn h0, s0, #7 // shift and clip the 2x16-bit final value342 sqshrn h0, s0, #7 // shift and clip the 2x16-bit final value
@@ -842,7 +842,7 @@ function ff_hscale16to15_X8_neon_asm, export=1 · 499 unmodified lines
842 sxtl2 v5.4s, v5.8h // extend filter upper half to 32 bits842 sxtl2 v5.4s, v5.8h // extend filter upper half to 32 bits
843 uxtl v26.4s, v6.4h // extend srcp lower half to 32 bits843 uxtl v26.4s, v6.4h // extend srcp lower half to 32 bits
844 mla v0.4s, v4.4s, v5.4s // multiply accumulate upper half of v4 * v5844 mla v0.4s, v4.4s, v5.4s // multiply accumulate upper half of v4 * v5
845 sxtl v27.4s, v7.4h // exted filter lower half845 sxtl v27.4s, v7.4h // extend filter lower half
846 uxtl2 v6.4s, v6.8h // extend srcp upper half846 uxtl2 v6.4s, v6.8h // extend srcp upper half
847 sxtl2 v7.4s, v7.8h // extend filter upper half847 sxtl2 v7.4s, v7.8h // extend filter upper half
848 ld1 {v16.8h}, [x10], #16 // srcp[filterPos[2] + {0..7}]848 ld1 {v16.8h}, [x10], #16 // srcp[filterPos[2] + {0..7}]
@@ -869,7 +869,7 @@ function ff_hscale16to15_X8_neon_asm, export=1 · 20 unmodified lines
869 addp v2.4s, v2.4s, v3.4s // part23 horizontal pair adding869 addp v2.4s, v2.4s, v3.4s // part23 horizontal pair adding
870 addp v0.4s, v0.4s, v2.4s // part0123 horizontal pair adding870 addp v0.4s, v0.4s, v2.4s // part0123 horizontal pair adding
871 subs w2, w2, #4 // dstW -= 4871 subs w2, w2, #4 // dstW -= 4
872 sshl v0.4s, v0.4s, v21.4s // shift right (effectively rigth, as shift is negative); overflow expected872 sshl v0.4s, v0.4s, v21.4s // shift right (effectively right, as shift is negative); overflow expected
873 smin v0.4s, v0.4s, v20.4s // apply min (do not use sqshl)873 smin v0.4s, v0.4s, v20.4s // apply min (do not use sqshl)
874 xtn v0.4h, v0.4s // narrow down to 16 bits874 xtn v0.4h, v0.4s // narrow down to 16 bits
875 875
@@ -1247,7 +1247,7 @@ function ff_hscale16to19_X8_neon_asm, export=1 · 371 unmodified lines
1247 sxtl2 v5.4s, v5.8h // extend filter upper half to 32 bits1247 sxtl2 v5.4s, v5.8h // extend filter upper half to 32 bits
1248 uxtl v26.4s, v6.4h // extend srcp lower half to 32 bits1248 uxtl v26.4s, v6.4h // extend srcp lower half to 32 bits
1249 mla v0.4s, v4.4s, v5.4s // multiply accumulate upper half of v4 * v51249 mla v0.4s, v4.4s, v5.4s // multiply accumulate upper half of v4 * v5
1250 sxtl v27.4s, v7.4h // exted filter lower half1250 sxtl v27.4s, v7.4h // extend filter lower half
1251 uxtl2 v6.4s, v6.8h // extend srcp upper half1251 uxtl2 v6.4s, v6.8h // extend srcp upper half
1252 sxtl2 v7.4s, v7.8h // extend filter upper half1252 sxtl2 v7.4s, v7.8h // extend filter upper half
1253 ld1 {v16.8h}, [x10], #16 // srcp[filterPos[2] + {0..7}]1253 ld1 {v16.8h}, [x10], #16 // srcp[filterPos[2] + {0..7}]
@@ -1274,7 +1274,7 @@ function ff_hscale16to19_X8_neon_asm, export=1 · 20 unmodified lines
1274 addp v2.4s, v2.4s, v3.4s // part23 horizontal pair adding1274 addp v2.4s, v2.4s, v3.4s // part23 horizontal pair adding
1275 addp v0.4s, v0.4s, v2.4s // part0123 horizontal pair adding1275 addp v0.4s, v0.4s, v2.4s // part0123 horizontal pair adding
1276 subs w2, w2, #4 // dstW -= 41276 subs w2, w2, #4 // dstW -= 4
1277 sshl v0.4s, v0.4s, v21.4s // shift right (effectively rigth, as shift is negative); overflow expected1277 sshl v0.4s, v0.4s, v21.4s // shift right (effectively right, as shift is negative); overflow expected
1278 smin v0.4s, v0.4s, v20.4s // apply min (do not use sqshl)1278 smin v0.4s, v0.4s, v20.4s // apply min (do not use sqshl)
1279 st1 {v0.4s}, [x1], #16 // write to destination part01231279 st1 {v0.4s}, [x1], #16 // write to destination part0123
1280 b.gt 1b // loop until end of line1280 b.gt 1b // loop until end of line
libswscale/arm/output.S+1−1
@@ -30,7 +30,7 @@ function ff_yuv2planeX_8_neon, export=1 · 29 unmodified lines
30 vld1.8 {d0}, [r5] @ load 8x8-bit dither values30 vld1.8 {d0}, [r5] @ load 8x8-bit dither values
31 cmp r6, #0 @ check offsetting which can be 0 or 3 only31 cmp r6, #0 @ check offsetting which can be 0 or 3 only
32 beq 1f32 beq 1f
33 vext.u8 d0, d0, d0, #3 @ honor offseting which can be 3 only33 vext.u8 d0, d0, d0, #3 @ honor offsetting which can be 3 only
341: vmovl.u8 q0, d0 @ extend dither to 16-bit341: vmovl.u8 q0, d0 @ extend dither to 16-bit
35 vshll.u16 q1, d0, #12 @ extend dither to 32-bit with left shift by 12 (part 1)35 vshll.u16 q1, d0, #12 @ extend dither to 32-bit with left shift by 12 (part 1)
36 vshll.u16 q2, d1, #12 @ extend dither to 32-bit with left shift by 12 (part 2)36 vshll.u16 q2, d1, #12 @ extend dither to 32-bit with left shift by 12 (part 2)
libswscale/arm/rgb2yuv_neon_common.S+1−1
@@ -158,7 +158,7 @@ endfunc · 157 unmodified lines
158.endm158.endm
159 159
160 160
161/* acculumate and right shift by 2 */161/* accumulate and right shift by 2 */
162.macro downsample_ars2162.macro downsample_ars2
163 vpadal.u8 r16x8, r8x16163 vpadal.u8 r16x8, r8x16
164 vpadal.u8 g16x8, g8x16164 vpadal.u8 g16x8, g8x16
libswscale/cms.c+1−1
@@ -400,7 +400,7 @@ static void st2094_pick_knee(float src_max, float src_min, float src_avg, · 399 unmodified lines
400 adapted = fmixf(dst_min, dst_max, target);400 adapted = fmixf(dst_min, dst_max, target);
401 401
402 /**402 /**
403 * Choose the destnation knee by picking the perceptual adaptation point403 * Choose the destination knee by picking the perceptual adaptation point
404 * between the source knee and the desired target. This moves the knee404 * between the source knee and the desired target. This moves the knee
405 * point, on the vertical axis, closer to the 1:1 (neutral) line.405 * point, on the vertical axis, closer to the 1:1 (neutral) line.
406 *406 *
libswscale/format.c+1−1
@@ -447,7 +447,7 @@ static int infer_prim_ref(SwsColor *csp, const SwsColor *ref) · 446 unmodified lines
447 if (csp->prim != AVCOL_PRI_UNSPECIFIED)447 if (csp->prim != AVCOL_PRI_UNSPECIFIED)
448 return 0;448 return 0;
449 449
450 /* Re-use the reference gamut only for "safe", similar primaries */450 /* Reuse the reference gamut only for "safe", similar primaries */
451 switch (ref->prim) {451 switch (ref->prim) {
452 case AVCOL_PRI_BT709:452 case AVCOL_PRI_BT709:
453 case AVCOL_PRI_BT470M:453 case AVCOL_PRI_BT470M:
libswscale/graph.c+1−1
@@ -155,7 +155,7 @@ static void run_rgb2xyz(const SwsImg *out, const SwsImg *in, int y, int h, · 154 unmodified lines
155}155}
156 156
157/***********************************************************************157/***********************************************************************
158 * Internal ff_swscale() wrapper. This re-uses the legacy scaling API. *158 * Internal ff_swscale() wrapper. This reuses the legacy scaling API. *
159 * This is considered fully deprecated, and will be replaced by a full *159 * This is considered fully deprecated, and will be replaced by a full *
160 * reimplementation ASAP. *160 * reimplementation ASAP. *
161 ***********************************************************************/161 ***********************************************************************/
libswscale/ppc/yuv2rgb_altivec.c+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
41 * MODIFIED to calculate coeffs from currently selected color space.41 * MODIFIED to calculate coeffs from currently selected color space.
42 * MODIFIED core to be a macro where you specify the output format.42 * MODIFIED core to be a macro where you specify the output format.
43 * ADDED UYVY conversion which is never called due to some thing in swscale.43 * ADDED UYVY conversion which is never called due to some thing in swscale.
44 * CORRECTED algorithim selection to be strict on input formats.44 * CORRECTED algorithm selection to be strict on input formats.
45 * ADDED runtime detection of AltiVec.45 * ADDED runtime detection of AltiVec.
46 *46 *
47 * ADDED altivec_yuv2packedX vertical scl + RGB converter47 * ADDED altivec_yuv2packedX vertical scl + RGB converter
libswscale/swscale.h+1−1
@@ -126,7 +126,7 @@ typedef enum SwsFlags { · 125 unmodified lines
126 * the 100x100 yuv444p image to rgba in the final output step.126 * the 100x100 yuv444p image to rgba in the final output step.
127 *127 *
128 * Without this flag, the chroma plane is instead scaled to 50x100 (4:2:2),128 * Without this flag, the chroma plane is instead scaled to 50x100 (4:2:2),
129 * with a single chroma sample being re-used for both of the horizontally129 * with a single chroma sample being reused for both of the horizontally
130 * adjacent RGBA output pixels.130 * adjacent RGBA output pixels.
131 */131 */
132 SWS_FULL_CHR_H_INT = 1 << 13,132 SWS_FULL_CHR_H_INT = 1 << 13,
libswscale/swscale_internal.h+1−1
@@ -359,7 +359,7 @@ struct SwsInternal { · 358 unmodified lines
359 359
360 RangeList src_ranges;360 RangeList src_ranges;
361 361
362 /* The cascaded_* fields allow spliting a scaler task into multiple362 /* The cascaded_* fields allow splitting a scaler task into multiple
363 * sequential steps, this is for example used to limit the maximum363 * sequential steps, this is for example used to limit the maximum
364 * downscaling factor that needs to be supported in one scaler.364 * downscaling factor that needs to be supported in one scaler.
365 */365 */
libswscale/x86/input.asm+1−1
@@ -886,7 +886,7 @@ NVXX_TO_UV_FN 5, nv21 · 885 unmodified lines
886 pmovzxbd G, [srcGq + xq]886 pmovzxbd G, [srcGq + xq]
887 pmovzxbd B, [srcBq + xq]887 pmovzxbd B, [srcBq + xq]
888 %else888 %else
889 ; thought this would be faster but from my measurments its not889 ; thought this would be faster but from my measurements its not
890 ; movd m0, [srcRq + xq + 0]; overeads by 2 bytes890 ; movd m0, [srcRq + xq + 0]; overeads by 2 bytes
891 ; punpcklbw m0, m9 ; interleave bytes with zero891 ; punpcklbw m0, m9 ; interleave bytes with zero
892 ; punpcklwd m0, m9 ; interleave words with zero892 ; punpcklwd m0, m9 ; interleave words with zero
tests/checkasm/aacencdsp.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
tests/checkasm/ac3dsp.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 * Copyright (c) 2024 Geoff Hill <geoff@geoffhill.org>3 * Copyright (c) 2024 Geoff Hill <geoff@geoffhill.org>
4 *4 *
5 * This file is part of FFmpeg.5 * This file is part of FFmpeg.
tests/checkasm/hevc_deblock.c+1−1
@@ -167,7 +167,7 @@ static void randomize_luma_buffers(int type, int *beta, int32_t tc[2], · 166 unmodified lines
167 tc25diff = FFMAX(tc25 - 1, 0);167 tc25diff = FFMAX(tc25 - 1, 0);
168 // 4 lines per tc168 // 4 lines per tc
169 for (i = 0; i < 4; i++) {169 for (i = 0; i < 4; i++) {
170 // Weak filtering is signficantly simpler to activate as170 // Weak filtering is significantly simpler to activate as
171 // we only need to satisfy d0 + d3 < beta, which171 // we only need to satisfy d0 + d3 < beta, which
172 // can be simplified to d0 + d0 < beta. Using the above172 // can be simplified to d0 + d0 < beta. Using the above
173 // derivations but substiuting b3 for b1 and ensuring173 // derivations but substiuting b3 for b1 and ensuring
tests/checkasm/opusdsp.c+1−1
@@ -47,7 +47,7 @@ static void test_postfilter(int period) · 46 unmodified lines
47 float gains[3] = { 0.3066406250f, 0.2170410156f, 0.1296386719f };47 float gains[3] = { 0.3066406250f, 0.2170410156f, 0.1296386719f };
48 48
49 /* The codec will always call with an offset which is aligned once49 /* The codec will always call with an offset which is aligned once
50 * (period + 2) is subtracted, but here we have to align it outselves. */50 * (period + 2) is subtracted, but here we have to align it ourselves. */
51 int offset = FFALIGN(period + 2, 4);51 int offset = FFALIGN(period + 2, 4);
52 52
53 declare_func(void, float *data, int period, float *gains, int len);53 declare_func(void, float *data, int period, float *gains, int len);
tests/checkasm/rv34dsp.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
tests/checkasm/rv40dsp.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2024 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2024 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
tests/checkasm/svq1enc.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
tests/checkasm/sw_scale.c+1−1
@@ -386,7 +386,7 @@ static void check_hscale(void) · 385 unmodified lines
386 filterPos[i] = i;386 filterPos[i] = i;
387 filterPosAvx[i] = i;387 filterPosAvx[i] = i;
388 388
389 // These filter cofficients are chosen to try break two corner389 // These filter coefficients are chosen to try break two corner
390 // cases, namely:390 // cases, namely:
391 //391 //
392 // - Negative filter coefficients. The filters output signed392 // - Negative filter coefficients. The filters output signed
tests/checkasm/takdsp.c+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS).2 * Copyright (c) 2023 Institute of Software Chinese Academy of Sciences (ISCAS).
3 *3 *
4 * This file is part of FFmpeg.4 * This file is part of FFmpeg.
5 *5 *
tests/checkasm/vp9dsp.c+1−1
@@ -256,7 +256,7 @@ static int copy_subcoefs(int16_t *out, const int16_t *in, enum TxfmMode tx, · 255 unmodified lines
256 // copy the topleft coefficients such that the return value (being the256 // copy the topleft coefficients such that the return value (being the
257 // coefficient scantable index for the eob token) guarantees that only257 // coefficient scantable index for the eob token) guarantees that only
258 // the topleft $sub out of $sz (where $sz >= $sub) coefficients in both258 // the topleft $sub out of $sz (where $sz >= $sub) coefficients in both
259 // dimensions are non-zero. This leads to braching to specific optimized259 // dimensions are non-zero. This leads to branching to specific optimized
260 // simd versions (e.g. dc-only) so that we get full asm coverage in this260 // simd versions (e.g. dc-only) so that we get full asm coverage in this
261 // test261 // test
262 262
tests/fate/h264.mak+1−1
@@ -250,7 +250,7 @@ fate-h264: $(FATE_H264-yes) $(FATE_H264_FFPROBE-yes) · 249 unmodified lines
250 250
251fate-h264-conformance-aud_mw_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264251fate-h264-conformance-aud_mw_e: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264
252 252
253#force framerate so that the option is tested, theres no other case that tests it, its not needed at all otherwise here253#force framerate so that the option is tested, there's no other case that tests it, its not needed at all otherwise here
254fate-h264-conformance-ba1_ft_c: CMD = framecrc -framerate 19 -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264254fate-h264-conformance-ba1_ft_c: CMD = framecrc -framerate 19 -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264
255 255
256fate-h264-conformance-ba1_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv256fate-h264-conformance-ba1_sony_d: CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv
tests/fate/lavf-audio.mak+1−1
@@ -28,7 +28,7 @@ $(FATE_LAVF_AUDIO): CMD = lavf_audio · 27 unmodified lines
28$(FATE_LAVF_AUDIO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)28$(FATE_LAVF_AUDIO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
29$(FATE_LAVF_AUDIO): $(AREF)29$(FATE_LAVF_AUDIO): $(AREF)
30 30
31fate-lavf-aiff: CMD = lavf_audio "" "-metadata copyright=noone"31fate-lavf-aiff: CMD = lavf_audio "" "-metadata copyright=noone" # codespell:ignore
32fate-lavf-al fate-lavf-ul: CMD = lavf_audio "" "" "-ar 44100"32fate-lavf-al fate-lavf-ul: CMD = lavf_audio "" "" "-ar 44100"
33fate-lavf-dfpwm: CMD = lavf_audio "" "" "-sample_rate 44100"33fate-lavf-dfpwm: CMD = lavf_audio "" "" "-sample_rate 44100"
34fate-lavf-ogg: CMD = lavf_audio "" "-c:a flac"34fate-lavf-ogg: CMD = lavf_audio "" "-c:a flac"
tests/fate/spdif.mak+1−1
@@ -1,4 +1,4 @@
1# This padds the AAC frames to 16 bit words (the actual size is1# This pads the AAC frames to 16 bit words (the actual size is
2# still available in the ADTS headers).2# still available in the ADTS headers).
3FATE_SPDIF_REMUX-$(call ALLYES, AAC_DEMUXER AAC_DECODER) += fate-spdif-aac-remux3FATE_SPDIF_REMUX-$(call ALLYES, AAC_DEMUXER AAC_DECODER) += fate-spdif-aac-remux
4fate-spdif-aac-remux: CMD = transcode aac $(TARGET_SAMPLES)/aac/foo.aac spdif "-c copy" "-c copy"4fate-spdif-aac-remux: CMD = transcode aac $(TARGET_SAMPLES)/aac/foo.aac spdif "-c copy" "-c copy"
tools/enc_recon_frame_test.c+2−2
@@ -114,7 +114,7 @@ static int recon_frame_process(PrivData *pd, const AVPacket *pkt) · 113 unmodified lines
114 return ret;114 return ret;
115 }115 }
116 116
117 // the encoder's internal format (in which the reconsturcted frames are117 // the encoder's internal format (in which the reconstructed frames are
118 // exported) may be different from the user-facing pixel format118 // exported) may be different from the user-facing pixel format
119 if (f->format != pd->enc->pix_fmt) {119 if (f->format != pd->enc->pix_fmt) {
120 if (!pd->scaler) {120 if (!pd->scaler) {
@@ -242,7 +242,7 @@ static int process_frame(DecodeContext *dc, AVFrame *frame) · 121 unmodified lines
242 else if (ret == AVERROR_EOF)242 else if (ret == AVERROR_EOF)
243 return 0;243 return 0;
244 else if (ret < 0) {244 else if (ret < 0) {
245 fprintf(stderr, "Error receving a frame from decoder\n");245 fprintf(stderr, "Error receiving a frame from decoder\n");
246 return ret;246 return ret;
247 }247 }
248 248
tools/ffeval.c+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
41 41
42static void usage(void)42static void usage(void)
43{43{
44 printf("Simple expression evalutor, please *don't* turn me to a feature-complete language interpreter\n");44 printf("Simple expression evaluator, please *don't* turn me to a feature-complete language interpreter\n");
45 printf("usage: ffeval [OPTIONS]\n");45 printf("usage: ffeval [OPTIONS]\n");
46 printf("\n"46 printf("\n"
47 "Options:\n"47 "Options:\n"
tools/merge-all-source-plugins+3−3
@@ -6,7 +6,7 @@ merge_internal(){ # $1=repository, $2=refspec · 5 unmodified lines
6 [ -z "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$26 [ -z "$version" ] && git pull --no-rebase --log --stat --commit --no-edit $1 sourceplugin-$2
7}7}
8 8
9unset suceeded failed version9unset succeeded failed version
10 10
11merge(){ # $1=repository, $2=refspec11merge(){ # $1=repository, $2=refspec
12 merge_internal "$1" "$2" || {12 merge_internal "$1" "$2" || {
@@ -15,7 +15,7 @@ merge(){ # $1=repository, $2=refspec · 2 unmodified lines
15 failed="$failed $2"15 failed="$failed $2"
16 return 016 return 0
17 }17 }
18 suceeded="$suceeded $2"18 succeeded="$succeeded $2"
19}19}
20 20
21error(){21error(){
@@ -34,5 +34,5 @@ git diff --cached --exit-code >/dev/null ||\ · 12 unmodified lines
34merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"34merge "https://github.com/michaelni/FFmpeg.git" "libpostproc"
35 35
36[ -n "$version" ] && echo version: $version36[ -n "$version" ] && echo version: $version
37[ -n "$suceeded" ] && echo Succeeded merging: $suceeded37[ -n "$succeeded" ] && echo Succeeded merging: $succeeded
38[ -n "$failed" ] && echo Failed merging: $failed38[ -n "$failed" ] && echo Failed merging: $failed
tools/target_dec_fate.sh+1−1
@@ -39,7 +39,7 @@ EOF · 38 unmodified lines
39}39}
40 40
41test -z "$1" && show_help41test -z "$1" && show_help
42test ! -d "$1" && echo $1 is not an accessable directory && show_help42test ! -d "$1" && echo $1 is not an accessible directory && show_help
43test ! -f target_dec_fate.sh && echo $0 Must be run from its location && show_help43test ! -f target_dec_fate.sh && echo $0 Must be run from its location && show_help
44grep 'CONFIG_OSSFUZZ 0' ../config.h && echo not configured for ossfuzz && show_help44grep 'CONFIG_OSSFUZZ 0' ../config.h && echo not configured for ossfuzz && show_help
45 45
tools/zmqshell.py+1−1
@@ -12,7 +12,7 @@ Provide a shell used to send interactive commands to a zmq filter. · 11 unmodified lines
12The command assumes there is a running zmq or azmq filter acting as a12The command assumes there is a running zmq or azmq filter acting as a
13ZMQ server.13ZMQ server.
14 14
15You can send a command to it, follwing the syntax:15You can send a command to it, following the syntax:
16TARGET COMMAND [COMMAND_ARGS]16TARGET COMMAND [COMMAND_ARGS]
17 17
18* TARGET is the target filter identifier to send the command to18* TARGET is the target filter identifier to send the command to

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t