October 2025 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg] branch master updated. 15a9c8dea3 avcodec/liblc3enc: Avoid allocating buffer to send a zero frame
by ffmpeg-git＠ffmpeg.org 04 Oct '25

04 Oct '25

The branch, master has been updated via 15a9c8dea32048d9746329430313f5700ba74ff3 (commit) from ab7d1c64c9aa9186acb1d988d020e59f2d3defce (commit) - Log ----------------------------------------------------------------- commit 15a9c8dea32048d9746329430313f5700ba74ff3 Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Tue Sep 30 18:53:08 2025 +0200 Commit: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> CommitDate: Sat Oct 4 06:07:37 2025 +0200 avcodec/liblc3enc: Avoid allocating buffer to send a zero frame liblc3 supports arbitrary strides, so one can simply use a stride of zero to make it read the same zero value again and again. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/liblc3enc.c b/libavcodec/liblc3enc.c index 66007a90f3..72c117b993 100644 --- a/libavcodec/liblc3enc.c +++ b/libavcodec/liblc3enc.c @@ -137,7 +137,6 @@ static int liblc3_encode(AVCodecContext *avctx, AVPacket *pkt, LibLC3EncContext *liblc3 = avctx->priv_data; int block_bytes = liblc3->block_bytes; int channels = avctx->ch_layout.nb_channels; - void *zero_frame = NULL; uint8_t *data_ptr; int ret; @@ -152,25 +151,20 @@ static int liblc3_encode(AVCodecContext *avctx, AVPacket *pkt, return 0; liblc3->remaining_samples = 0; - zero_frame = av_mallocz(avctx->frame_size * sizeof(float)); - if (!zero_frame) - return AVERROR(ENOMEM); } data_ptr = pkt->data; for (int ch = 0; ch < channels; ch++) { - const float *pcm = zero_frame ? zero_frame : frame->data[ch]; + const float *pcm = frame ? (const float*)frame->data[ch] : (const float[]){ 0 }; + int stride = !!frame; // use a stride of zero to send a zero frame int nbytes = block_bytes / channels + (ch < block_bytes % channels); lc3_encode(liblc3->encoder[ch], - LC3_PCM_FORMAT_FLOAT, pcm, 1, nbytes, data_ptr); + LC3_PCM_FORMAT_FLOAT, pcm, stride, nbytes, data_ptr); data_ptr += nbytes; } - if (zero_frame) - av_free(zero_frame); - *got_packet_ptr = 1; return 0; ----------------------------------------------------------------------- Summary of changes: libavcodec/liblc3enc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. ab7d1c64c9 avcodec/x86/h263_loopfilter: Port loop filter to SSE2
by ffmpeg-git＠ffmpeg.org 03 Oct '25

03 Oct '25

The branch, master has been updated via ab7d1c64c9aa9186acb1d988d020e59f2d3defce (commit) via a8a16c15c8dbf2231d439fa46587d0a15c1778ce (commit) from df4587789f1f4337ed778752010d7176a9e90241 (commit) - Log ----------------------------------------------------------------- commit ab7d1c64c9aa9186acb1d988d020e59f2d3defce Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Oct 1 10:46:39 2025 +0200 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Fri Oct 3 17:05:46 2025 +0000 avcodec/x86/h263_loopfilter: Port loop filter to SSE2 Old benchmarks: h263dsp.h_loop_filter_c: 41.2 ( 1.00x) h263dsp.h_loop_filter_mmx: 39.5 ( 1.04x) h263dsp.v_loop_filter_c: 43.5 ( 1.00x) h263dsp.v_loop_filter_mmx: 16.9 ( 2.57x) New benchmarks: h263dsp.h_loop_filter_c: 41.6 ( 1.00x) h263dsp.h_loop_filter_sse2: 28.2 ( 1.48x) h263dsp.v_loop_filter_c: 42.4 ( 1.00x) h263dsp.v_loop_filter_sse2: 15.1 ( 2.81x) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/libavcodec/x86/constants.c b/libavcodec/x86/constants.c index c5f3c6428e..1e2f5990e4 100644 --- a/libavcodec/x86/constants.c +++ b/libavcodec/x86/constants.c @@ -75,7 +75,7 @@ DECLARE_ALIGNED(32, const ymm_reg, ff_pb_80) = { 0x8080808080808080ULL, 0x808 0x8080808080808080ULL, 0x8080808080808080ULL }; DECLARE_ALIGNED(32, const ymm_reg, ff_pb_FE) = { 0xFEFEFEFEFEFEFEFEULL, 0xFEFEFEFEFEFEFEFEULL, 0xFEFEFEFEFEFEFEFEULL, 0xFEFEFEFEFEFEFEFEULL }; -DECLARE_ALIGNED(8, const uint64_t, ff_pb_FC) = 0xFCFCFCFCFCFCFCFCULL; +DECLARE_ALIGNED(16, const xmm_reg, ff_pb_FC) = { 0xFCFCFCFCFCFCFCFCULL, 0xFCFCFCFCFCFCFCFCULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_ps_neg) = { 0x8000000080000000ULL, 0x8000000080000000ULL }; diff --git a/libavcodec/x86/constants.h b/libavcodec/x86/constants.h index 4a55adb5b3..7d0bd975b9 100644 --- a/libavcodec/x86/constants.h +++ b/libavcodec/x86/constants.h @@ -56,8 +56,8 @@ extern const ymm_reg ff_pb_1; extern const ymm_reg ff_pb_2; extern const ymm_reg ff_pb_3; extern const ymm_reg ff_pb_80; +extern const xmm_reg ff_pb_FC; extern const ymm_reg ff_pb_FE; -extern const uint64_t ff_pb_FC; extern const xmm_reg ff_ps_neg; diff --git a/libavcodec/x86/h263_loopfilter.asm b/libavcodec/x86/h263_loopfilter.asm index 77c8cf154d..ebe76f01af 100644 --- a/libavcodec/x86/h263_loopfilter.asm +++ b/libavcodec/x86/h263_loopfilter.asm @@ -1,5 +1,5 @@ ;****************************************************************************** -;* MMX-optimized H.263 loop filter +;* SSE2-optimized H.263 loop filter ;* Copyright (c) 2003-2013 Michael Niedermayer ;* Copyright (c) 2013 Daniel Kang ;* @@ -22,7 +22,6 @@ %include "libavutil/x86/x86util.asm" -SECTION_RODATA cextern pb_FC cextern h263_loop_filter_strength @@ -30,60 +29,45 @@ SECTION .text %macro H263_LOOP_FILTER 5 pxor m7, m7 - mova m0, [%1] - mova m1, [%1] - mova m2, [%4] - mova m3, [%4] + movq m0, [%1] + movq m6, [%4] + mova m5, m0 punpcklbw m0, m7 - punpckhbw m1, m7 - punpcklbw m2, m7 - punpckhbw m3, m7 - psubw m0, m2 - psubw m1, m3 - mova m2, [%2] - mova m3, [%2] - mova m4, [%3] - mova m5, [%3] + punpcklbw m6, m7 + psubw m0, m6 + movq m2, [%2] + movq m1, [%3] + mova m3, m2 + mova m4, m1 punpcklbw m2, m7 - punpckhbw m3, m7 - punpcklbw m4, m7 - punpckhbw m5, m7 - psubw m4, m2 - psubw m5, m3 - psllw m4, 2 - psllw m5, 2 - paddw m4, m0 - paddw m5, m1 + punpcklbw m1, m7 + psubw m1, m2 + psllw m1, 2 + paddw m1, m0 pxor m6, m6 - pcmpgtw m6, m4 - pcmpgtw m7, m5 - pxor m4, m6 - pxor m5, m7 - psubw m4, m6 - psubw m5, m7 - psrlw m4, 3 - psrlw m5, 3 - packuswb m4, m5 + pcmpgtw m6, m1 + pxor m1, m6 + psubw m1, m6 + psrlw m1, 3 + packuswb m1, m7 packsswb m6, m7 - pxor m7, m7 movd m2, %5 punpcklbw m2, m2 punpcklbw m2, m2 punpcklbw m2, m2 - psubusb m2, m4 - mova m3, m2 - psubusb m3, m4 - psubb m2, m3 - mova m3, [%2] - mova m4, [%3] + psubusb m2, m1 + mova m7, m2 + psubusb m7, m1 + psubb m2, m7 pxor m3, m6 pxor m4, m6 paddusb m3, m2 psubusb m4, m2 + pxor m7, m7 pxor m3, m6 pxor m4, m6 paddusb m2, m2 - packsswb m0, m1 + packsswb m0, m7 pcmpgtb m7, m0 pxor m0, m7 psubb m0, m7 @@ -94,22 +78,20 @@ SECTION .text psrlw m1, 2 pxor m1, m7 psubb m1, m7 - mova m5, [%1] - mova m6, [%4] + movq m6, [%4] psubb m5, m1 paddb m6, m1 %endmacro -INIT_MMX mmx -; void ff_h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale) -cglobal h263_v_loop_filter, 3,5 +INIT_XMM sse2 +; void ff_h263_v_loop_filter_sse2(uint8_t *src, int stride, int qscale) +cglobal h263_v_loop_filter, 3,5,8 movsxdifnidn r1, r1d movsxdifnidn r2, r2d - lea r4, [h263_loop_filter_strength] - movzx r3d, BYTE [r4+r2] - movsx r2, r3b - shl r2, 1 + lea r3, [h263_loop_filter_strength] + movzx r2d, BYTE [r3+r2] + shl r2d, 1 mov r3, r0 sub r3, r1 @@ -117,73 +99,64 @@ cglobal h263_v_loop_filter, 3,5 sub r4, r1 H263_LOOP_FILTER r4, r3, r0, r0+r1, r2d - mova [r3], m3 - mova [r0], m4 - mova [r4], m5 - mova [r0+r1], m6 + movq [r3], m3 + movq [r0], m4 + movq [r4], m5 + movq [r0+r1], m6 RET %macro TRANSPOSE4X4 2 - movd m0, [%1] - movd m1, [%1+r1] - movd m2, [%1+r1*2] - movd m3, [%1+r3] - punpcklbw m0, m1 - punpcklbw m2, m3 - mova m1, m0 - punpcklwd m0, m2 - punpckhwd m1, m2 - movd [%2+ 0], m0 - punpckhdq m0, m0 - movd [%2+ 8], m0 - movd [%2+16], m1 - punpckhdq m1, m1 - movd [%2+24], m1 + movd %1, [%2] + movd m2, [%2+r1] + movd m3, [%2+r1*2] + movd m4, [%2+r3] + punpcklbw %1, m2 + punpcklbw m3, m4 + punpcklwd %1, m3 %endmacro -; void ff_h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale) -INIT_MMX mmx -cglobal h263_h_loop_filter, 3,5,0,32 +; void ff_h263_h_loop_filter_sse2(uint8_t *src, int stride, int qscale) +INIT_XMM sse2 +cglobal h263_h_loop_filter, 3,5,8,32 movsxdifnidn r1, r1d movsxdifnidn r2, r2d lea r4, [h263_loop_filter_strength] - movzx r3d, BYTE [r4+r2] - movsx r2, r3b - shl r2, 1 + movzx r2d, BYTE [r4+r2] + shl r2d, 1 sub r0, 2 lea r3, [r1*3] - - TRANSPOSE4X4 r0, rsp lea r4, [r0+r1*4] - TRANSPOSE4X4 r4, rsp+4 + + TRANSPOSE4X4 m0, r0 + TRANSPOSE4X4 m1, r4 + mova m2, m0 + punpckldq m0, m1 + mova [rsp], m0 + punpckhdq m2, m1 + mova [rsp+16], m2 H263_LOOP_FILTER rsp, rsp+8, rsp+16, rsp+24, r2d - mova m1, m5 - mova m0, m4 punpcklbw m5, m3 punpcklbw m4, m6 - punpckhbw m1, m3 - punpckhbw m0, m6 - mova m3, m5 - mova m6, m1 + mova m0, m5 punpcklwd m5, m4 - punpcklwd m1, m0 - punpckhwd m3, m4 - punpckhwd m6, m0 + punpckhwd m0, m4 movd [r0], m5 + movd [r4], m0 + pshufd m1, m5, 0x1 + pshufd m2, m0, 0x1 + movd [r0+r1*1], m1 + movd [r4+r1*1], m2 + punpckhdq m5, m5 + punpckhdq m0, m0 + movd [r0+r1*2], m5 + movd [r4+r1*2], m0 punpckhdq m5, m5 - movd [r0+r1*1], m5 - movd [r0+r1*2], m3 - punpckhdq m3, m3 - movd [r0+r3], m3 - movd [r4], m1 - punpckhdq m1, m1 - movd [r4+r1*1], m1 - movd [r4+r1*2], m6 - punpckhdq m6, m6 - movd [r4+r3], m6 + punpckhdq m0, m0 + movd [r0+r3], m5 + movd [r4+r3], m0 RET diff --git a/libavcodec/x86/h263dsp_init.c b/libavcodec/x86/h263dsp_init.c index ab81063233..3dd5d132e5 100644 --- a/libavcodec/x86/h263dsp_init.c +++ b/libavcodec/x86/h263dsp_init.c @@ -25,15 +25,15 @@ #include "libavutil/x86/cpu.h" #include "libavcodec/h263dsp.h" -void ff_h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale); -void ff_h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale); +void ff_h263_h_loop_filter_sse2(uint8_t *src, int stride, int qscale); +void ff_h263_v_loop_filter_sse2(uint8_t *src, int stride, int qscale); av_cold void ff_h263dsp_init_x86(H263DSPContext *c) { int cpu_flags = av_get_cpu_flags(); - if (EXTERNAL_MMX(cpu_flags)) { - c->h263_h_loop_filter = ff_h263_h_loop_filter_mmx; - c->h263_v_loop_filter = ff_h263_v_loop_filter_mmx; + if (EXTERNAL_SSE2(cpu_flags)) { + c->h263_h_loop_filter = ff_h263_h_loop_filter_sse2; + c->h263_v_loop_filter = ff_h263_v_loop_filter_sse2; } } diff --git a/tests/checkasm/h263dsp.c b/tests/checkasm/h263dsp.c index 2d0957a90b..f99d376adc 100644 --- a/tests/checkasm/h263dsp.c +++ b/tests/checkasm/h263dsp.c @@ -34,7 +34,7 @@ static void check_loop_filter(char dim, filter func) LOCAL_ALIGNED_16(uint8_t, buf1, [32 * 32]); int qscale = rnd() % 32; - declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *, int, int); + declare_func(void, uint8_t *, int, int); for (size_t y = 0; y < 32; y++) for (size_t x = 0; x < 32; x++) commit a8a16c15c8dbf2231d439fa46587d0a15c1778ce Author: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> AuthorDate: Wed Oct 1 13:42:09 2025 +0200 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Fri Oct 3 17:05:46 2025 +0000 tests/checkasm/llviddsp: Use the same width for each cpuflag Otherwise the benchmark numbers would be incomparable nonsense. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> diff --git a/tests/checkasm/llviddsp.c b/tests/checkasm/llviddsp.c index 9f8de65df4..0552e98106 100644 --- a/tests/checkasm/llviddsp.c +++ b/tests/checkasm/llviddsp.c @@ -195,9 +195,13 @@ static void check_add_gradient_pred(LLVidDSPContext *c, int w) { void checkasm_check_llviddsp(void) { LLVidDSPContext c; - int width = 16 * av_clip(rnd(), 16, 128); + static int saved_width = 0; + int width = saved_width; int accRnd = rnd() & 0xFF; + if (!width) + saved_width = width = 16 * av_clip(rnd(), 16, 128); + ff_llviddsp_init(&c); check_add_bytes(&c, width); ----------------------------------------------------------------------- Summary of changes: libavcodec/x86/constants.c | 2 +- libavcodec/x86/constants.h | 2 +- libavcodec/x86/h263_loopfilter.asm | 167 ++++++++++++++++--------------------- libavcodec/x86/h263dsp_init.c | 10 +-- tests/checkasm/h263dsp.c | 2 +- tests/checkasm/llviddsp.c | 6 +- 6 files changed, 83 insertions(+), 106 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. df4587789f avcodec/amfenc: avoid unnecessary output delay in low delay mode
by ffmpeg-git＠ffmpeg.org 03 Oct '25

03 Oct '25

The branch, master has been updated via df4587789f1f4337ed778752010d7176a9e90241 (commit) from f1d5114103a8164869a279326043645e7bacdc86 (commit) - Log ----------------------------------------------------------------- commit df4587789f1f4337ed778752010d7176a9e90241 Author: Cameron Gutman <aicommander(a)gmail.com> AuthorDate: Mon Sep 8 23:41:43 2025 -0500 Commit: Dmitrii Ovchinnikov <ovchinnikov.dmitrii(a)gmail.com> CommitDate: Fri Oct 3 11:05:03 2025 +0000 avcodec/amfenc: avoid unnecessary output delay in low delay mode The code optimizes throughput by letting the encoder work on frame N until frame N+1 is ready for submission, but this hurts low-delay uses by delaying output by one frame. Don't delay output beyond what is necessary when AV_CODEC_FLAG_LOW_DELAY is used. Signed-off-by: Cameron Gutman <aicommander(a)gmail.com> diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index b16b642e4c..f363192000 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -497,7 +497,7 @@ static int amf_submit_frame(AVCodecContext *avctx, AVFrame *frame, AMFSurface AMF_RESULT res; int ret; int hw_surface = 0; - int max_b_frames = ctx->max_b_frames < 0 ? 0 : ctx->max_b_frames; + int output_delay = FFMAX(ctx->max_b_frames, 0) + ((avctx->flags & AV_CODEC_FLAG_LOW_DELAY) ? 0 : 1); // prepare surface from frame switch (frame->format) { @@ -634,8 +634,8 @@ static int amf_submit_frame(AVCodecContext *avctx, AVFrame *frame, AMFSurface ret = av_fifo_write(ctx->timestamp_list, &frame->pts, 1); if (ret < 0) return ret; - if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames + 1) - return AVERROR(EAGAIN); // if frame just submiited - don't poll or wait + if(ctx->submitted_frame <= ctx->encoded_frame + output_delay) + return AVERROR(EAGAIN); // too soon to poll or wait } return 0; } @@ -681,7 +681,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) AVFrame *frame = av_frame_alloc(); int block_and_wait; int64_t pts = 0; - int max_b_frames = ctx->max_b_frames < 0 ? 0 : ctx->max_b_frames; + int output_delay = FFMAX(ctx->max_b_frames, 0) + ((avctx->flags & AV_CODEC_FLAG_LOW_DELAY) ? 0 : 1); if (!ctx->encoder){ av_frame_free(&frame); @@ -700,7 +700,7 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) if(ret != AVERROR_EOF){ av_frame_free(&frame); if(ret == AVERROR(EAGAIN)){ - if(ctx->submitted_frame <= ctx->encoded_frame + max_b_frames + 1) // too soon to poll + if(ctx->submitted_frame <= ctx->encoded_frame + output_delay) // too soon to poll return ret; } } ----------------------------------------------------------------------- Summary of changes: libavcodec/amfenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. f1d5114103 avformat/tls_openssl: do not cleanup tls after a successful dtls_start()
by ffmpeg-git＠ffmpeg.org 02 Oct '25

02 Oct '25

The branch, master has been updated via f1d5114103a8164869a279326043645e7bacdc86 (commit) from 61b6877637041a1f817ad9811c839b0feae2b8af (commit) - Log ----------------------------------------------------------------- commit f1d5114103a8164869a279326043645e7bacdc86 Author: Marton Balint <cus(a)passwd.hu> AuthorDate: Thu Oct 2 00:27:29 2025 +0200 Commit: Marton Balint <cus(a)passwd.hu> CommitDate: Thu Oct 2 18:41:47 2025 +0200 avformat/tls_openssl: do not cleanup tls after a successful dtls_start() Regression since 8e11e2cdb82299e7f0b6d8884bf2bc65c1c3f5e8. Signed-off-by: Marton Balint <cus(a)passwd.hu> diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index c2adaa38d1..c7d6ff6cf4 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -834,7 +834,7 @@ static int dtls_start(URLContext *h, const char *url, int flags, AVDictionary ** av_log(c, AV_LOG_VERBOSE, "Setup ok, MTU=%d\n", c->tls_shared.mtu); - ret = 0; + return 0; fail: tls_close(h); return ret; ----------------------------------------------------------------------- Summary of changes: libavformat/tls_openssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 61b6877637 avcodec/mjpegdec: Explain buf_size/width/height check
by ffmpeg-git＠ffmpeg.org 02 Oct '25

02 Oct '25

The branch, master has been updated via 61b6877637041a1f817ad9811c839b0feae2b8af (commit) from 1a02412170144f07711428ddc2d1051c4284ee0a (commit) - Log ----------------------------------------------------------------- commit 61b6877637041a1f817ad9811c839b0feae2b8af Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Thu Sep 11 20:12:55 2025 +0200 Commit: michaelni <michael(a)niedermayer.cc> CommitDate: Thu Oct 2 12:52:43 2025 +0000 avcodec/mjpegdec: Explain buf_size/width/height check Suggested-by: Ramiro Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b829ab682b..69bc003490 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -340,6 +340,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) av_log(s->avctx, AV_LOG_DEBUG, "sof0: picture: %dx%d\n", width, height); if (av_image_check_size(width, height, 0, s->avctx) < 0) return AVERROR_INVALIDDATA; + + // A valid frame requires at least 1 bit for DC + 1 bit for AC for each 8x8 block. if (s->buf_size && (width + 7) / 8 * ((height + 7) / 8) > s->buf_size * 4LL) return AVERROR_INVALIDDATA; ----------------------------------------------------------------------- Summary of changes: libavcodec/mjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 1a02412170 avformat/movenc_ttml: fix memleaks
by ffmpeg-git＠ffmpeg.org 01 Oct '25

01 Oct '25

The branch, master has been updated via 1a02412170144f07711428ddc2d1051c4284ee0a (commit) from cb4052beae1e347e0c357a5b7ab860328aa01dd4 (commit) - Log ----------------------------------------------------------------- commit 1a02412170144f07711428ddc2d1051c4284ee0a Author: Zhao Zhili <quinkblack(a)foxmail.com> AuthorDate: Tue Sep 23 22:08:02 2025 +0800 Commit: Zhao Zhili <quinkblack(a)foxmail.com> CommitDate: Wed Oct 1 22:31:03 2025 +0800 avformat/movenc_ttml: fix memleaks Memory leaks can happen on normal case when break from while loop early, and it can happen on error path with goto cleanup. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> diff --git a/libavformat/movenc_ttml.c b/libavformat/movenc_ttml.c index c5232e589c..ff09c14fa2 100644 --- a/libavformat/movenc_ttml.c +++ b/libavformat/movenc_ttml.c @@ -140,7 +140,7 @@ static int mov_write_ttml_document_from_queue(AVFormatContext *s, } else if (pkt->pts >= end_ts) { // starts after this fragment, put back to original queue ret = avpriv_packet_list_put(&track->squashed_packet_queue, - pkt, av_packet_ref, + pkt, NULL, FF_PACKETLIST_FLAG_PREPEND); if (ret < 0) goto cleanup; @@ -215,6 +215,7 @@ static int mov_write_ttml_document_from_queue(AVFormatContext *s, ret = 0; cleanup: + av_packet_unref(pkt); while (!avpriv_packet_list_get(&back_to_queue_list, pkt)) { ret = avpriv_packet_list_put(&track->squashed_packet_queue, pkt, av_packet_ref, ----------------------------------------------------------------------- Summary of changes: libavformat/movenc_ttml.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. cb4052beae libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet.
by ffmpeg-git＠ffmpeg.org 01 Oct '25

01 Oct '25

The branch, master has been updated via cb4052beae1e347e0c357a5b7ab860328aa01dd4 (commit) via 45d7d5d3e2aa260785432736bcc394e4f3eb2c82 (commit) via 7dbf7d2a4571c6f88c7ac441ec259609951c519e (commit) via cebbb6ae8a096d93dc6f09e3cbd1bde551a5291a (commit) via de8d57e4c576e7ef31c199caf12cbbe755634933 (commit) from 5511641365b83afa6449ae0b89d01b78556d941d (commit) - Log ----------------------------------------------------------------- commit cb4052beae1e347e0c357a5b7ab860328aa01dd4 Author: Romain Beauxis <romain.beauxis(a)gmail.com> AuthorDate: Mon Feb 10 11:48:03 2025 -0600 Commit: Yalda <yalda(a)noreply.code.ffmpeg.org> CommitDate: Wed Oct 1 14:20:55 2025 +0000 libavformat/oggparseopus.c: Parse comments from secondary chained streams header packet. diff --git a/libavformat/oggparseopus.c b/libavformat/oggparseopus.c index 65b93b4053..ae4ff22c53 100644 --- a/libavformat/oggparseopus.c +++ b/libavformat/oggparseopus.c @@ -154,6 +154,11 @@ static int opus_packet(AVFormatContext *avf, int idx) } if (os->psize > 8 && !memcmp(packet, "OpusTags", 8)) { + ret = ff_vorbis_update_metadata(avf, st, os->buf + os->pstart + 8, + os->psize - 8); + if (ret < 0) + return ret; + priv->need_comments = 0; return 1; } diff --git a/tests/ref/fate/ogg-opus-chained-meta.txt b/tests/ref/fate/ogg-opus-chained-meta.txt index addc41c1eb..aad9b83700 100644 --- a/tests/ref/fate/ogg-opus-chained-meta.txt +++ b/tests/ref/fate/ogg-opus-chained-meta.txt @@ -13,7 +13,8 @@ Stream ID: 0, frame PTS: 3528, metadata: N/A Stream ID: 0, packet PTS: 4488, packet DTS: 4488 Stream ID: 0, frame PTS: 4488, metadata: N/A Stream ID: 0, packet PTS: -312, packet DTS: -312 -Stream ID: 0, frame PTS: -312, metadata: N/A +Stream ID: 0, new metadata: encoder=Lavc61.19.100 libopus:title=Second Stream +Stream ID: 0, frame PTS: -312, metadata: encoder=Lavc61.19.100 libopus:title=Second Stream Stream ID: 0, packet PTS: 648, packet DTS: 648 Stream ID: 0, frame PTS: 648, metadata: N/A Stream ID: 0, packet PTS: 1608, packet DTS: 1608 commit 45d7d5d3e2aa260785432736bcc394e4f3eb2c82 Author: Romain Beauxis <romain.beauxis(a)gmail.com> AuthorDate: Tue Feb 4 07:03:49 2025 -0500 Commit: Yalda <yalda(a)noreply.code.ffmpeg.org> CommitDate: Wed Oct 1 14:20:55 2025 +0000 libavformat/oggparseflac.c: Parse ogg/flac comments in new ogg packets, add them to ogg stream new_metadata. diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index d66b85b09e..e81e4021a1 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -85,6 +85,8 @@ flac_packet (AVFormatContext * s, int idx) { struct ogg *ogg = s->priv_data; struct ogg_stream *os = ogg->streams + idx; + AVStream *st = s->streams[idx]; + int ret; if (os->psize > OGG_FLAC_MAGIC_SIZE && !memcmp( @@ -95,6 +97,11 @@ flac_packet (AVFormatContext * s, int idx) if (os->psize > 0 && ((os->buf[os->pstart] & 0x7F) == FLAC_METADATA_TYPE_VORBIS_COMMENT)) { + ret = ff_vorbis_update_metadata(s, st, os->buf + os->pstart + 4, + os->psize - 4); + if (ret < 0) + return ret; + return 1; } diff --git a/tests/ref/fate/ogg-flac-chained-meta.txt b/tests/ref/fate/ogg-flac-chained-meta.txt index 28e22aa29e..5abf37dcee 100644 --- a/tests/ref/fate/ogg-flac-chained-meta.txt +++ b/tests/ref/fate/ogg-flac-chained-meta.txt @@ -5,6 +5,7 @@ Stream ID: 0, frame PTS: 0, metadata: N/A Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: N/A Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, frame PTS: 0, metadata: N/A +Stream ID: 0, new metadata: encoder=Lavc61.19.100 flac:title=Second Stream +Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 flac:title=Second Stream Stream ID: 0, packet PTS: 4608, packet DTS: 4608 Stream ID: 0, frame PTS: 4608, metadata: N/A commit 7dbf7d2a4571c6f88c7ac441ec259609951c519e Author: Romain Beauxis <romain.beauxis(a)gmail.com> AuthorDate: Fri Feb 14 09:39:45 2025 -0600 Commit: Yalda <yalda(a)noreply.code.ffmpeg.org> CommitDate: Wed Oct 1 14:20:55 2025 +0000 libavformat/oggdec.c: Use AV_PKT_DATA_STRINGS_METADATA to pass metadata updates. diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 9dc2c62035..9f3a92a5ea 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -880,7 +880,7 @@ retry: } if (os->new_metadata) { - ret = av_packet_add_side_data(pkt, AV_PKT_DATA_METADATA_UPDATE, + ret = av_packet_add_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, os->new_metadata, os->new_metadata_size); if (ret < 0) return ret; diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 6776782ddf..b051b651e3 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -164,7 +164,7 @@ int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st, * Parse Vorbis comments, add metadata to an AVStream * * This function also attaches the metadata to the next decoded - * packet as AV_PKT_DATA_METADATA_UPDATE + * packet as AV_PKT_DATA_STRINGS_METADATA * * @note The buffer will be temporarily modified by this function, * so it needs to be writable. Furthermore it must be padded diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt index 1206f86c1f..60d9aeb9fa 100644 --- a/tests/ref/fate/ogg-vorbis-chained-meta.txt +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt @@ -7,7 +7,7 @@ Stream ID: 0, packet PTS: 704, packet DTS: 704 Stream ID: 0, frame PTS: 704, metadata: N/A Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream -Stream ID: 0, frame PTS: 0, metadata: N/A +Stream ID: 0, frame PTS: 0, metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream Stream ID: 0, packet PTS: 128, packet DTS: 128 Stream ID: 0, frame PTS: 128, metadata: N/A Stream ID: 0, packet PTS: 704, packet DTS: 704 commit cebbb6ae8a096d93dc6f09e3cbd1bde551a5291a Author: Romain Beauxis <romain.beauxis(a)gmail.com> AuthorDate: Tue Feb 18 22:32:03 2025 -0600 Commit: Yalda <yalda(a)noreply.code.ffmpeg.org> CommitDate: Wed Oct 1 14:20:55 2025 +0000 libavformat/oggdec.h, libavformat/oggparsevorbis.c: Factor out vorbis metadata update mechanism. diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 256a17c5e3..6776782ddf 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -160,6 +160,20 @@ int ff_vorbis_comment(AVFormatContext *ms, AVDictionary **m, int ff_vorbis_stream_comment(AVFormatContext *as, AVStream *st, const uint8_t *buf, int size); +/** + * Parse Vorbis comments, add metadata to an AVStream + * + * This function also attaches the metadata to the next decoded + * packet as AV_PKT_DATA_METADATA_UPDATE + * + * @note The buffer will be temporarily modified by this function, + * so it needs to be writable. Furthermore it must be padded + * by a single byte (not counted in size). + * All changes will have been reverted upon return. + */ +int ff_vorbis_update_metadata(AVFormatContext *s, AVStream *st, + const uint8_t *buf, int size); + static inline int ogg_find_stream (struct ogg * ogg, int serial) { diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 1af2f21a82..7c4f7624f8 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -273,20 +273,16 @@ static void vorbis_cleanup(AVFormatContext *s, int idx) } } -static int vorbis_update_metadata(AVFormatContext *s, int idx) +int ff_vorbis_update_metadata(AVFormatContext *s, AVStream *st, + const uint8_t *buf, int size) { struct ogg *ogg = s->priv_data; - struct ogg_stream *os = ogg->streams + idx; - AVStream *st = s->streams[idx]; + struct ogg_stream *os = ogg->streams + st->index; int ret; - if (os->psize <= 8) - return 0; - /* New metadata packet; release old data. */ av_dict_free(&st->metadata); - ret = ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 7, - os->psize - 8); + ret = ff_vorbis_stream_comment(s, st, buf, size); if (ret < 0) return ret; @@ -359,6 +355,19 @@ static int vorbis_parse_header(AVFormatContext *s, AVStream *st, return 1; } +static int vorbis_update_metadata(AVFormatContext *s, int idx) +{ + struct ogg *ogg = s->priv_data; + struct ogg_stream *os = ogg->streams + idx; + AVStream *st = s->streams[idx]; + + if (os->psize <= 8) + return 0; + + return ff_vorbis_update_metadata(s, st, os->buf + os->pstart + 7, + os->psize - 8); +} + static int vorbis_header(AVFormatContext *s, int idx) { struct ogg *ogg = s->priv_data; commit de8d57e4c576e7ef31c199caf12cbbe755634933 Author: Romain Beauxis <romain.beauxis(a)gmail.com> AuthorDate: Mon Aug 4 09:00:28 2025 -0500 Commit: Yalda <yalda(a)noreply.code.ffmpeg.org> CommitDate: Wed Oct 1 14:20:55 2025 +0000 ogg/vorbis: implement header packet skip in chained ogg bitstreams. diff --git a/doc/APIchanges b/doc/APIchanges index 9d629f766f..6e7f5d2037 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2025-03-28 API changes, most recent first: +2025-08-xx - xxxxxxxxxx - lavf 62.6.100 - oggparsevorbis.h oggparseopus.h oggparseflac.h + Drop header packets from secondary chained ogg/{flac, opus, vorbis} streams + from demuxer output. + 2025-09-xx - xxxxxxxxxx - lavu 60.13.100 - hwcontext_d3d12va.h Add resource_flags and heap_flags to AVD3D12VADeviceContext Add heap_flags to AVD3D12VAFramesContext diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index 62cc2da6de..1af2f21a82 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -215,6 +215,12 @@ struct oggvorbis_private { AVVorbisParseContext *vp; int64_t final_pts; int final_duration; + uint8_t *header; + int header_size; + uint8_t *comment; + int comment_size; + uint8_t *setup; + int setup_size; }; static int fixup_vorbis_headers(AVFormatContext *as, @@ -260,6 +266,10 @@ static void vorbis_cleanup(AVFormatContext *s, int idx) av_vorbis_parse_free(&priv->vp); for (i = 0; i < 3; i++) av_freep(&priv->packet[i]); + + av_freep(&priv->header); + av_freep(&priv->comment); + av_freep(&priv->setup); } } @@ -434,6 +444,9 @@ static int vorbis_packet(AVFormatContext *s, int idx) struct ogg_stream *os = ogg->streams + idx; struct oggvorbis_private *priv = os->private; int duration, flags = 0; + int skip_packet = 0; + int ret, new_extradata_size; + PutByteContext pb; if (!priv->vp) return AVERROR_INVALIDDATA; @@ -496,10 +509,50 @@ static int vorbis_packet(AVFormatContext *s, int idx) if (duration < 0) { os->pflags |= AV_PKT_FLAG_CORRUPT; return 0; - } else if (flags & VORBIS_FLAG_COMMENT) { - vorbis_update_metadata(s, idx); + } + + if (flags & VORBIS_FLAG_HEADER) { + ret = vorbis_parse_header(s, s->streams[idx], os->buf + os->pstart, os->psize); + if (ret < 0) + return ret; + + ret = av_reallocp(&priv->header, os->psize); + if (ret < 0) + return ret; + + memcpy(priv->header, os->buf + os->pstart, os->psize); + priv->header_size = os->psize; + + skip_packet = 1; + } + + if (flags & VORBIS_FLAG_COMMENT) { + ret = vorbis_update_metadata(s, idx); + if (ret < 0) + return ret; + + ret = av_reallocp(&priv->comment, os->psize); + if (ret < 0) + return ret; + + memcpy(priv->comment, os->buf + os->pstart, os->psize); + priv->comment_size = os->psize; + flags = 0; + skip_packet = 1; + } + + if (flags & VORBIS_FLAG_SETUP) { + ret = av_reallocp(&priv->setup, os->psize); + if (ret < 0) + return ret; + + memcpy(priv->setup, os->buf + os->pstart, os->psize); + priv->setup_size = os->psize; + + skip_packet = 1; } + os->pduration = duration; } @@ -521,7 +574,31 @@ static int vorbis_packet(AVFormatContext *s, int idx) priv->final_duration += os->pduration; } - return 0; + if (priv->header && priv->comment && priv->setup) { + new_extradata_size = priv->header_size + priv->comment_size + priv->setup_size + 6; + + ret = av_reallocp(&os->new_extradata, new_extradata_size); + if (ret < 0) + return ret; + + os->new_extradata_size = new_extradata_size; + bytestream2_init_writer(&pb, os->new_extradata, new_extradata_size); + bytestream2_put_be16(&pb, priv->header_size); + bytestream2_put_buffer(&pb, priv->header, priv->header_size); + bytestream2_put_be16(&pb, priv->comment_size); + bytestream2_put_buffer(&pb, priv->comment, priv->comment_size); + bytestream2_put_be16(&pb, priv->setup_size); + bytestream2_put_buffer(&pb, priv->setup, priv->setup_size); + + av_freep(&priv->header); + priv->header_size = 0; + av_freep(&priv->comment); + priv->comment_size = 0; + av_freep(&priv->setup); + priv->setup_size = 0; + } + + return skip_packet; } const struct ogg_codec ff_vorbis_codec = { diff --git a/tests/ref/fate/ogg-vorbis-chained-meta.txt b/tests/ref/fate/ogg-vorbis-chained-meta.txt index b7a97c90e2..1206f86c1f 100644 --- a/tests/ref/fate/ogg-vorbis-chained-meta.txt +++ b/tests/ref/fate/ogg-vorbis-chained-meta.txt @@ -6,10 +6,7 @@ Stream ID: 0, frame PTS: 128, metadata: N/A Stream ID: 0, packet PTS: 704, packet DTS: 704 Stream ID: 0, frame PTS: 704, metadata: N/A Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, new metadata: encoder=Lavc61.19.100 libvorbis:title=Second Stream -Stream ID: 0, packet PTS: 0, packet DTS: 0 -Stream ID: 0, packet PTS: 0, packet DTS: 0 Stream ID: 0, frame PTS: 0, metadata: N/A Stream ID: 0, packet PTS: 128, packet DTS: 128 Stream ID: 0, frame PTS: 128, metadata: N/A ----------------------------------------------------------------------- Summary of changes: doc/APIchanges | 4 ++ libavformat/oggdec.c | 2 +- libavformat/oggdec.h | 14 ++++ libavformat/oggparseflac.c | 7 ++ libavformat/oggparseopus.c | 5 ++ libavformat/oggparsevorbis.c | 108 ++++++++++++++++++++++++++--- tests/ref/fate/ogg-flac-chained-meta.txt | 3 +- tests/ref/fate/ogg-opus-chained-meta.txt | 3 +- tests/ref/fate/ogg-vorbis-chained-meta.txt | 5 +- 9 files changed, 133 insertions(+), 18 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 5511641365 avcodec/atrac9dec: use av_zero_extend()
by ffmpeg-git＠ffmpeg.org 01 Oct '25

01 Oct '25

The branch, master has been updated via 5511641365b83afa6449ae0b89d01b78556d941d (commit) via 7ce3a1449637fda17a2e3ce6623ea3b23b5127d8 (commit) via 776ee0799017e3c926cfbaa47aab6ba412babf48 (commit) from 8e11e2cdb82299e7f0b6d8884bf2bc65c1c3f5e8 (commit) - Log ----------------------------------------------------------------- commit 5511641365b83afa6449ae0b89d01b78556d941d Author: James Almer <jamrial(a)gmail.com> AuthorDate: Mon Sep 29 22:33:49 2025 -0300 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Wed Oct 1 01:26:19 2025 +0000 avcodec/atrac9dec: use av_zero_extend() Signed-off-by: James Almer <jamrial(a)gmail.com> diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index 0748d671f1..3c18ae8b42 100644 --- a/libavcodec/atrac9dec.c +++ b/libavcodec/atrac9dec.c @@ -285,7 +285,7 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, for (int i = 1; i < b->band_ext_q_unit; i++) { int val = c->scalefactors[i - 1] + get_vlc2(gb, tab, ATRAC9_SF_VLC_BITS, 1); - c->scalefactors[i] = val & ((1 << len) - 1); + c->scalefactors[i] = av_zero_extend(val, len); } for (int i = 0; i < b->band_ext_q_unit; i++) @@ -339,7 +339,7 @@ static inline int read_scalefactors(ATRAC9Context *s, ATRAC9BlockData *b, for (int i = 1; i < unit_cnt; i++) { int val = c->scalefactors[i - 1] + get_vlc2(gb, tab, ATRAC9_SF_VLC_BITS, 1); - c->scalefactors[i] = val & ((1 << len) - 1); + c->scalefactors[i] = av_zero_extend(val, len); } for (int i = 0; i < unit_cnt; i++) commit 7ce3a1449637fda17a2e3ce6623ea3b23b5127d8 Author: James Almer <jamrial(a)gmail.com> AuthorDate: Mon Sep 29 22:33:38 2025 -0300 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Wed Oct 1 01:26:19 2025 +0000 avcodec/apv_entropy: use av_zero_extend() Signed-off-by: James Almer <jamrial(a)gmail.com> diff --git a/libavcodec/apv_entropy.c b/libavcodec/apv_entropy.c index 1cab88d547..30f31a14ff 100644 --- a/libavcodec/apv_entropy.c +++ b/libavcodec/apv_entropy.c @@ -288,7 +288,7 @@ int ff_apv_entropy_decode_block(int16_t *restrict coeff, // Extract the low bits. low_bit_count = leading_zeroes; low_bit_shift = 16 - (1 + 2 * leading_zeroes); - low_bits = (bits >> low_bit_shift) & ((1 << low_bit_count) - 1); + low_bits = av_zero_extend(bits >> low_bit_shift, low_bit_count); // Construct run code. run = 2 + ((1 << leading_zeroes) - 1) + low_bits; // Skip over the bits just used. @@ -460,7 +460,7 @@ int ff_apv_entropy_decode_block(int16_t *restrict coeff, // Extract the low bits. low_bit_count = leading_zeroes + k_run; low_bit_shift = 16 - (1 + 2 * leading_zeroes + k_run); - low_bits = (bits >> low_bit_shift) & ((1 << low_bit_count) - 1); + low_bits = av_zero_extend(bits >> low_bit_shift, low_bit_count); // Construct run code. run = (2 << k_run) + ((1 << leading_zeroes) - 1) * (1 << k_run) + commit 776ee0799017e3c926cfbaa47aab6ba412babf48 Author: James Almer <jamrial(a)gmail.com> AuthorDate: Mon Sep 29 22:33:27 2025 -0300 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Wed Oct 1 01:26:19 2025 +0000 avcodec/aom_film_grain: use av_zero_extend() Signed-off-by: James Almer <jamrial(a)gmail.com> diff --git a/libavcodec/aom_film_grain.c b/libavcodec/aom_film_grain.c index bd9647afe9..a5b692562d 100644 --- a/libavcodec/aom_film_grain.c +++ b/libavcodec/aom_film_grain.c @@ -39,7 +39,7 @@ static inline int get_random_number(const int bits, unsigned *const state) { unsigned bit = ((r >> 0) ^ (r >> 1) ^ (r >> 3) ^ (r >> 12)) & 1; *state = (r >> 1) | (bit << 15); - return (*state >> (16 - bits)) & ((1 << bits) - 1); + return av_zero_extend(*state >> (16 - bits), bits); } static inline int round2(const int x, const uint64_t shift) { ----------------------------------------------------------------------- Summary of changes: libavcodec/aom_film_grain.c | 2 +- libavcodec/apv_entropy.c | 4 ++-- libavcodec/atrac9dec.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive --

1 0