April 2025 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/bsf/h264_mp4toannexb: Fix mixed bitstream format
by Zhao Zhili 29 Apr '25

29 Apr '25

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Fri Apr 25 01:08:36 2025 +0800| [25812d303398552a7768dac04f2992bcb09ea000] | committer: Zhao Zhili avcodec/bsf/h264_mp4toannexb: Fix mixed bitstream format This bsf converts AV_PKT_DATA_NEW_EXTRADATA side data in avcc format to in-band annexb format. However, the side data wasn't been removed and copied from input packet to output packet. So the output packet has mixed bitstream format. We don't support mixed bitstream format. For example, h264_metadata report error in the following case: ffmpeg -i foo.flv \ -bsf:v "h264_mp4toannexb,h264_metadata" \ -c copy -f null This patch removed NEW_EXTRADATA side data after process. This patch also add a check so only NEW_EXTRADATA in avcc format is processed. NEW_EXTRADATA in annexb format is copied to output as is. Reported-by: jiangjie <jiangjie618(a)gmail.com> Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25812d303398552a7… --- libavcodec/bsf/h264_mp4toannexb.c | 22 ++++++++++++---------- tests/fate/h264.mak | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libavcodec/bsf/h264_mp4toannexb.c b/libavcodec/bsf/h264_mp4toannexb.c index dda064287e..36b09b4dd6 100644 --- a/libavcodec/bsf/h264_mp4toannexb.c +++ b/libavcodec/bsf/h264_mp4toannexb.c @@ -93,6 +93,11 @@ static int h264_extradata_to_annexb(AVBSFContext *ctx, const int padding = AV_INPUT_BUFFER_PADDING_SIZE; int length_size, pps_offset = 0; + if (extradata_size < 7) { + av_log(ctx, AV_LOG_ERROR, "Invalid extradata size: %d\n", extradata_size); + return AVERROR_INVALIDDATA; + } + bytestream2_init(gb, extradata, extradata_size); bytestream2_skipu(gb, 4); @@ -262,16 +267,11 @@ static int h264_mp4toannexb_init(AVBSFContext *ctx) (extra_size >= 4 && AV_RB32(ctx->par_in->extradata) == 1)) { av_log(ctx, AV_LOG_VERBOSE, "The input looks like it is Annex B already\n"); - } else if (extra_size >= 7) { - return h264_extradata_to_annexb(ctx, - ctx->par_in->extradata, - ctx->par_in->extradata_size); - } else { - av_log(ctx, AV_LOG_ERROR, "Invalid extradata size: %d\n", extra_size); - return AVERROR_INVALIDDATA; + return 0; } - - return 0; + return h264_extradata_to_annexb(ctx, + ctx->par_in->extradata, + ctx->par_in->extradata_size); } static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) @@ -293,10 +293,12 @@ static int h264_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *opkt) extradata = av_packet_get_side_data(in, AV_PKT_DATA_NEW_EXTRADATA, &extradata_size); - if (extradata) { + if (extradata && extradata[0] == 1) { ret = h264_extradata_to_annexb(ctx, extradata, extradata_size); if (ret < 0) goto fail; + av_packet_side_data_remove(in->side_data, &in->side_data_elems, + AV_PKT_DATA_NEW_EXTRADATA); } /* nothing to filter */ diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak index 00b153cc93..8aa780ed4b 100644 --- a/tests/fate/h264.mak +++ b/tests/fate/h264.mak @@ -225,7 +225,7 @@ FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-unescaped-extradata # this sample contains field-coded frames, with both fields in a single packet FATE_H264-$(call FRAMECRC, MOV, H264) += fate-h264-twofields-packet -FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF SCALE_FILTER) += fate-h264-bsf-mp4toannexb-new-extradata +FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF H264_METADATA_BSF SCALE_FILTER) += fate-h264-bsf-mp4toannexb-new-extradata FATE_H264-$(call DEMMUX, MOV, H264, H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb \ fate-h264-bsf-mp4toannexb-2 \ @@ -440,7 +440,7 @@ fate-h264-bsf-mp4toannexb: CMD = md5 -i $(TARGET_SAMPLES) fate-h264-bsf-mp4toannexb-2: CMD = md5 -i $(TARGET_SAMPLES)/h264/ps_prefix_first_idr.mp4 -c:v copy -f h264 fate-h264-bsf-mp4toannexb-2: CMP = oneline fate-h264-bsf-mp4toannexb-2: REF = cffcfa6a2d0b58c9de1f5785f099f41d -fate-h264-bsf-mp4toannexb-new-extradata: CMD = stream_remux mov $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov "" h264 "-map 0:v" +fate-h264-bsf-mp4toannexb-new-extradata: CMD = stream_remux mov $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov "" h264 "-bsf h264_mp4toannexb,h264_metadata -map 0:v" fate-h264-bsf-dts2pts: CMD = transcode "h264" $(TARGET_SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264 \ mov "-c:v copy -bsf:v dts2pts -frames:v 50" "-c:v copy" fate-h264_mp4toannexb_ticket5927: CMD = transcode "mp4" $(TARGET_SAMPLES)/h264/thezerotheorem-cut.mp4 \

1 0

aarch64/h26x: Add put_hevc_pel_bi_w_pixels
by Zhao Zhili 29 Apr '25

29 Apr '25

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Wed Apr 23 00:31:11 2025 +0800| [26752368f04ab5582e20f279c8659e8ede719419] | committer: Zhao Zhili aarch64/h26x: Add put_hevc_pel_bi_w_pixels On rpi5 (A76): put_hevc_pel_bi_w_pixels4_8_c: 90.0 ( 1.00x) put_hevc_pel_bi_w_pixels4_8_neon: 34.1 ( 2.64x) put_hevc_pel_bi_w_pixels6_8_c: 188.3 ( 1.00x) put_hevc_pel_bi_w_pixels6_8_neon: 73.5 ( 2.56x) put_hevc_pel_bi_w_pixels8_8_c: 327.1 ( 1.00x) put_hevc_pel_bi_w_pixels8_8_neon: 75.8 ( 4.32x) put_hevc_pel_bi_w_pixels12_8_c: 728.8 ( 1.00x) put_hevc_pel_bi_w_pixels12_8_neon: 186.1 ( 3.92x) put_hevc_pel_bi_w_pixels16_8_c: 1288.1 ( 1.00x) put_hevc_pel_bi_w_pixels16_8_neon: 268.5 ( 4.80x) put_hevc_pel_bi_w_pixels24_8_c: 2855.5 ( 1.00x) put_hevc_pel_bi_w_pixels24_8_neon: 723.8 ( 3.95x) put_hevc_pel_bi_w_pixels32_8_c: 5095.3 ( 1.00x) put_hevc_pel_bi_w_pixels32_8_neon: 1165.0 ( 4.37x) put_hevc_pel_bi_w_pixels48_8_c: 11521.5 ( 1.00x) put_hevc_pel_bi_w_pixels48_8_neon: 2856.0 ( 4.03x) put_hevc_pel_bi_w_pixels64_8_c: 21020.5 ( 1.00x) put_hevc_pel_bi_w_pixels64_8_neon: 4699.1 ( 4.47x) Reviewed-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26752368f04ab5582… --- libavcodec/aarch64/h26x/dsp.h | 5 + libavcodec/aarch64/h26x/epel_neon.S | 373 ++++++++++++++++++++++++++++++ libavcodec/aarch64/hevcdsp_init_aarch64.c | 13 ++ 3 files changed, 391 insertions(+) diff --git a/libavcodec/aarch64/h26x/dsp.h b/libavcodec/aarch64/h26x/dsp.h index 6ea6a8d36a..6c91004301 100644 --- a/libavcodec/aarch64/h26x/dsp.h +++ b/libavcodec/aarch64/h26x/dsp.h @@ -92,6 +92,11 @@ NEON8_FNPROTO(pel_bi_pixels, (uint8_t *dst, ptrdiff_t dststride, const uint8_t *_src, ptrdiff_t _srcstride, const int16_t *src2, int height, intptr_t mx, intptr_t my, int width),); +NEON8_FNPROTO(pel_bi_w_pixels, (uint8_t *_dst, ptrdiff_t _dststride, + const uint8_t *_src, ptrdiff_t _srcstride, const int16_t *src2, + int height, int denom, int wx0, int wx1, + int ox0, int ox1, intptr_t mx, intptr_t my, int width),); + NEON8_FNPROTO(epel_bi_h, (uint8_t *dst, ptrdiff_t dststride, const uint8_t *src, ptrdiff_t srcstride, const int16_t *src2, int height, intptr_t mx, intptr_t my, int width),); diff --git a/libavcodec/aarch64/h26x/epel_neon.S b/libavcodec/aarch64/h26x/epel_neon.S index e44a448b1f..4cf6339171 100644 --- a/libavcodec/aarch64/h26x/epel_neon.S +++ b/libavcodec/aarch64/h26x/epel_neon.S @@ -473,6 +473,379 @@ function ff_hevc_put_hevc_pel_bi_pixels64_8_neon, export=1 ret endfunc +.macro load_bi_w_pixels_param + ldrsw x8, [sp] // wx1 +#if defined(__APPLE__) + ldpsw x9, x10, [sp, #4] // ox0, ox1 + ldrsw x11, [sp, #32] // width +#else + ldrsw x9, [sp, #8] // ox0 + ldrsw x10, [sp, #16] // ox1 + ldrsw x11, [sp, 40] // width +#endif +.endm + +function ff_hevc_put_hevc_pel_bi_w_pixels4_8_neon, export=1 + load_bi_w_pixels_param + add w6, w6, #6 // log2Wd + dup v0.8h, w7 // wx0 + dup v1.8h, w8 // wx1 + add w9, w9, w10 + add w9, w9, #1 // ox0 + ox1 + 1 + lsl w9, w9, w6 + add w7, w6, #1 // (log2Wd + 1) + mov x8, #(2 * HEVC_MAX_PB_SIZE) + neg w7, w7 + dup v2.4s, w9 // (ox0 + ox1 + 1) << logwWd + dup v6.4s, w7 // -(log2Wd + 1) +1: + ld1 {v4.8b}, [x2], x3 // load src + ld1 {v5.8b}, [x4], x8 // load src2 + subs w5, w5, #1 + mov v3.16b, v2.16b + ushll v4.8h, v4.8b, #6 + smlal v3.4s, v4.4h, v1.4h + smlal v3.4s, v5.4h, v0.4h + sshl v3.4s, v3.4s, v6.4s + sqxtn v3.4h, v3.4s + sqxtun v3.8b, v3.8h + st1 {v3.s}[0], [x0], x1 + b.ne 1b + ret +endfunc + +function ff_hevc_put_hevc_pel_bi_w_pixels6_8_neon, export=1 + load_bi_w_pixels_param + add w6, w6, #6 // log2Wd + dup v0.8h, w7 // wx0 + dup v1.8h, w8 // wx1 + add w9, w9, w10 + add w9, w9, #1 // ox0 + ox1 + 1 + lsl w9, w9, w6 + add w7, w6, #1 // (log2Wd + 1) + mov x8, #(2 * HEVC_MAX_PB_SIZE) + neg w7, w7 + dup v2.4s, w9 // (ox0 + ox1 + 1) << logwWd + dup v6.4s, w7 // -(log2Wd + 1) + sub x1, x1, #4 +1: + ld1 {v4.8b}, [x2], x3 // load src + ld1 {v5.8h}, [x4], x8 // load src2 + subs w5, w5, #1 + mov v3.16b, v2.16b + mov v7.16b, v2.16b + ushll v4.8h, v4.8b, #6 + smlal v3.4s, v4.4h, v1.4h + smlal v3.4s, v5.4h, v0.4h + smlal2 v7.4s, v4.8h, v1.8h + smlal2 v7.4s, v5.8h, v0.8h + sshl v3.4s, v3.4s, v6.4s + sshl v7.4s, v7.4s, v6.4s + sqxtn v3.4h, v3.4s + sqxtn2 v3.8h, v7.4s + sqxtun v3.8b, v3.8h + str s3, [x0], #4 + st1 {v3.h}[2], [x0], x1 + b.ne 1b + ret +endfunc + +function ff_hevc_put_hevc_pel_bi_w_pixels8_8_neon, export=1 + load_bi_w_pixels_param + add w6, w6, #6 // log2Wd + dup v0.8h, w7 // wx0 + dup v1.8h, w8 // wx1 + add w9, w9, w10 + add w9, w9, #1 // ox0 + ox1 + 1 + lsl w9, w9, w6 + add w7, w6, #1 // (log2Wd + 1) + mov x8, #(2 * HEVC_MAX_PB_SIZE) + neg w7, w7 + dup v2.4s, w9 // (ox0 + ox1 + 1) << logwWd + dup v6.4s, w7 // -(log2Wd + 1) +1: + ld1 {v4.8b}, [x2], x3 // load src + ld1 {v5.8h}, [x4], x8 // load src2 + subs w5, w5, #1 + mov v3.16b, v2.16b + mov v7.16b, v2.16b + ushll v4.8h, v4.8b, #6 + smlal v3.4s, v4.4h, v1.4h + smlal v3.4s, v5.4h, v0.4h + smlal2 v7.4s, v4.8h, v1.8h + smlal2 v7.4s, v5.8h, v0.8h + sshl v3.4s, v3.4s, v6.4s + sshl v7.4s, v7.4s, v6.4s + sqxtn v3.4h, v3.4s + sqxtn2 v3.8h, v7.4s + sqxtun v3.8b, v3.8h + st1 {v3.8b}, [x0], x1 + b.ne 1b + ret +endfunc + +function ff_hevc_put_hevc_pel_bi_w_pixels12_8_neon, export=1 + load_bi_w_pixels_param + add w6, w6, #6 // log2Wd + dup v0.8h, w7 // wx0 + dup v1.8h, w8 // wx1 + add w9, w9, w10 + add w9, w9, #1 // ox0 + ox1 + 1 + lsl w9, w9, w6 + add w7, w6, #1 // (log2Wd + 1) + mov x8, #(2 * HEVC_MAX_PB_SIZE) + neg w7, w7 + dup v2.4s, w9 // (ox0 + ox1 + 1) << logwWd + dup v6.4s, w7 // -(log2Wd + 1) + sub x1, x1, #8 +1: + ld1 {v24.16b}, [x2], x3 // load src + ld1 {v20.16b, v21.16b}, [x4], x8 // load src2 + subs w5, w5, #1 + + mov v16.16b, v2.16b + mov v17.16b, v2.16b + mov v18.16b, v2.16b + + ushll v4.8h, v24.8b, #6 + ushll2 v24.8h, v24.16b, #6 + + smlal v16.4s, v4.4h, v1.4h + smlal v16.4s, v20.4h, v0.4h + smlal2 v17.4s, v4.8h, v1.8h + smlal2 v17.4s, v20.8h, v0.8h + smlal v18.4s, v24.4h, v1.4h + smlal v18.4s, v21.4h, v0.4h + + sshl v16.4s, v16.4s, v6.4s + sshl v17.4s, v17.4s, v6.4s + sshl v18.4s, v18.4s, v6.4s + + sqxtn v16.4h, v16.4s + sqxtn2 v16.8h, v17.4s + sqxtn v18.4h, v18.4s + sqxtun v3.8b, v16.8h + sqxtun2 v3.16b, v18.8h + str d3, [x0], #8 + st1 {v3.s}[2], [x0], x1 + b.ne 1b + ret +endfunc + +function ff_hevc_put_hevc_pel_bi_w_pixels16_8_neon, export=1 + load_bi_w_pixels_param + add w6, w6, #6 // log2Wd + dup v0.8h, w7 // wx0 + dup v1.8h, w8 // wx1 + add w9, w9, w10 + add w9, w9, #1 // ox0 + ox1 + 1 + lsl w9, w9, w6 + add w7, w6, #1 // (log2Wd + 1) + mov x8, #(2 * HEVC_MAX_PB_SIZE) + neg w7, w7 + dup v2.4s, w9 // (ox0 + ox1 + 1) << logwWd + dup v6.4s, w7 // -(log2Wd + 1) +1: + ld1 {v24.16b}, [x2], x3 // load src + ld1 {v20.16b, v21.16b}, [x4], x8 // load src2 + subs w5, w5, #1 + + mov v16.16b, v2.16b + mov v17.16b, v2.16b + mov v18.16b, v2.16b + mov v19.16b, v2.16b + + ushll v4.8h, v24.8b, #6 + ushll2 v24.8h, v24.16b, #6 + + smlal v16.4s, v4.4h, v1.4h + smlal v16.4s, v20.4h, v0.4h + smlal2 v17.4s, v4.8h, v1.8h + smlal2 v17.4s, v20.8h, v0.8h + smlal v18.4s, v24.4h, v1.4h + smlal v18.4s, v21.4h, v0.4h + smlal2 v19.4s, v24.8h, v1.8h + smlal2 v19.4s, v21.8h, v0.8h + + sshl v16.4s, v16.4s, v6.4s + sshl v17.4s, v17.4s, v6.4s + sshl v18.4s, v18.4s, v6.4s + sshl v19.4s, v19.4s, v6.4s + + sqxtn v16.4h, v16.4s + sqxtn2 v16.8h, v17.4s + sqxtn v18.4h, v18.4s + sqxtn2 v18.8h, v19.4s + sqxtun v3.8b, v16.8h + sqxtun2 v3.16b, v18.8h + st1 {v3.16b}, [x0], x1 + b.ne 1b + ret +endfunc + +function ff_hevc_put_hevc_pel_bi_w_pixels24_8_neon, export=1 + load_bi_w_pixels_param + add w6, w6, #6 // log2Wd + dup v0.8h, w7 // wx0 + dup v1.8h, w8 // wx1 + add w9, w9, w10 + add w9, w9, #1 // ox0 + ox1 + 1 + lsl w9, w9, w6 + add w7, w6, #1 // (log2Wd + 1) + mov x8, #(2 * HEVC_MAX_PB_SIZE) + neg w7, w7 + dup v2.4s, w9 // (ox0 + ox1 + 1) << logwWd + dup v6.4s, w7 // -(log2Wd + 1) + mov x7, #24 + sub x3, x3, x11 + sub x8, x8, x11, lsl #1 + sub x1, x1, x11 +1: + mov w6, w11 +2: + ld1 {v24.16b, v25.16b}, [x2], x7 + ld1 {v20.8h, v21.8h, v22.8h}, [x4], #48 + + subs w6, w6, #24 + + mov v16.16b, v2.16b + mov v17.16b, v2.16b + mov v18.16b, v2.16b + mov v19.16b, v2.16b + mov v26.16b, v2.16b + mov v27.16b, v2.16b + + ushll v4.8h, v24.8b, #6 + ushll2 v24.8h, v24.16b, #6 + ushll v5.8h, v25.8b, #6 + + smlal v16.4s, v4.4h, v1.4h + smlal v16.4s, v20.4h, v0.4h + smlal2 v17.4s, v4.8h, v1.8h + smlal2 v17.4s, v20.8h, v0.8h + smlal v18.4s, v24.4h, v1.4h + smlal v18.4s, v21.4h, v0.4h + smlal2 v19.4s, v24.8h, v1.8h + smlal2 v19.4s, v21.8h, v0.8h + smlal v26.4s, v5.4h, v1.4h + smlal v26.4s, v22.4h, v0.4h + smlal2 v27.4s, v5.8h, v1.8h + smlal2 v27.4s, v22.8h, v0.8h + + sshl v16.4s, v16.4s, v6.4s + sshl v17.4s, v17.4s, v6.4s + sshl v18.4s, v18.4s, v6.4s + sshl v19.4s, v19.4s, v6.4s + sshl v26.4s, v26.4s, v6.4s + sshl v27.4s, v27.4s, v6.4s + + sqxtn v16.4h, v16.4s + sqxtn2 v16.8h, v17.4s + sqxtn v18.4h, v18.4s + sqxtn2 v18.8h, v19.4s + sqxtn v26.4h, v26.4s + sqxtn2 v26.8h, v27.4s + sqxtun v3.8b, v16.8h + sqxtun2 v3.16b, v18.8h + sqxtun v4.8b, v26.8h + str q3, [x0], #16 + str d4, [x0], #8 + b.ne 2b + + subs w5, w5, #1 + add x0, x0, x1 + add x2, x2, x3 + add x4, x4, x8 + b.ne 1b + ret +endfunc + +function ff_hevc_put_hevc_pel_bi_w_pixels32_8_neon, export=1 + load_bi_w_pixels_param + add w6, w6, #6 // log2Wd + dup v0.8h, w7 // wx0 + dup v1.8h, w8 // wx1 + add w9, w9, w10 + add w9, w9, #1 // ox0 + ox1 + 1 + lsl w9, w9, w6 + add w7, w6, #1 // (log2Wd + 1) + mov x8, #(2 * HEVC_MAX_PB_SIZE) + neg w7, w7 + dup v2.4s, w9 // (ox0 + ox1 + 1) << logwWd + dup v6.4s, w7 // -(log2Wd + 1) + sub x3, x3, x11 + sub x8, x8, x11, lsl #1 + sub x1, x1, x11 +1: + mov w6, w11 +2: + ld1 {v24.16b, v25.16b}, [x2], #32 // load src + ld1 {v20.8h, v21.8h, v22.8h, v23.8h}, [x4], #64 // load src2 + + subs w6, w6, #32 + + mov v16.16b, v2.16b + mov v17.16b, v2.16b + mov v18.16b, v2.16b + mov v19.16b, v2.16b + mov v26.16b, v2.16b + mov v27.16b, v2.16b + mov v28.16b, v2.16b + mov v29.16b, v2.16b + + ushll v4.8h, v24.8b, #6 + ushll2 v24.8h, v24.16b, #6 + ushll v5.8h, v25.8b, #6 + ushll2 v25.8h, v25.16b, #6 + + smlal v16.4s, v4.4h, v1.4h + smlal v16.4s, v20.4h, v0.4h + smlal2 v17.4s, v4.8h, v1.8h + smlal2 v17.4s, v20.8h, v0.8h + smlal v18.4s, v24.4h, v1.4h + smlal v18.4s, v21.4h, v0.4h + smlal2 v19.4s, v24.8h, v1.8h + smlal2 v19.4s, v21.8h, v0.8h + smlal v26.4s, v5.4h, v1.4h + smlal v26.4s, v22.4h, v0.4h + smlal2 v27.4s, v5.8h, v1.8h + smlal2 v27.4s, v22.8h, v0.8h + smlal v28.4s, v25.4h, v1.4h + smlal v28.4s, v23.4h, v0.4h + smlal2 v29.4s, v25.8h, v1.8h + smlal2 v29.4s, v23.8h, v0.8h + + sshl v16.4s, v16.4s, v6.4s + sshl v17.4s, v17.4s, v6.4s + sshl v18.4s, v18.4s, v6.4s + sshl v19.4s, v19.4s, v6.4s + sshl v26.4s, v26.4s, v6.4s + sshl v27.4s, v27.4s, v6.4s + sshl v28.4s, v28.4s, v6.4s + sshl v29.4s, v29.4s, v6.4s + + sqxtn v16.4h, v16.4s + sqxtn2 v16.8h, v17.4s + sqxtn v18.4h, v18.4s + sqxtn2 v18.8h, v19.4s + sqxtn v26.4h, v26.4s + sqxtn2 v26.8h, v27.4s + sqxtn v28.4h, v28.4s + sqxtn2 v28.8h, v29.4s + sqxtun v3.8b, v16.8h + sqxtun2 v3.16b, v18.8h + sqxtun v4.8b, v26.8h + sqxtun2 v4.16b, v28.8h + st1 {v3.16b, v4.16b}, [x0], #32 + b.ne 2b + + subs w5, w5, #1 + add x0, x0, x1 + add x2, x2, x3 + add x4, x4, x8 + b.ne 1b + ret +endfunc function ff_hevc_put_hevc_epel_bi_h4_8_neon, export=1 load_epel_filterb x6, x7 diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index 0b159d1886..8dec58bc7f 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -134,6 +134,17 @@ void ff_hevc_transform_luma_4x4_neon_8(int16_t *coeffs); member[7][v][h] = ff_hevc_put_hevc_##fn##32_8_neon##ext; \ member[9][v][h] = ff_hevc_put_hevc_##fn##64_8_neon##ext; +#define NEON8_FNASSIGN_PARTIAL_6(member, v, h, fn, ext) \ + member[1][v][h] = ff_hevc_put_hevc_##fn##4_8_neon##ext; \ + member[2][v][h] = ff_hevc_put_hevc_##fn##6_8_neon##ext; \ + member[3][v][h] = ff_hevc_put_hevc_##fn##8_8_neon##ext; \ + member[4][v][h] = ff_hevc_put_hevc_##fn##12_8_neon##ext; \ + member[5][v][h] = ff_hevc_put_hevc_##fn##16_8_neon##ext; \ + member[6][v][h] = ff_hevc_put_hevc_##fn##24_8_neon##ext; \ + member[7][v][h] = ff_hevc_put_hevc_##fn##32_8_neon##ext; \ + member[8][v][h] = ff_hevc_put_hevc_##fn##24_8_neon##ext; \ + member[9][v][h] = ff_hevc_put_hevc_##fn##32_8_neon##ext; + av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) { int cpu_flags = av_get_cpu_flags(); @@ -204,6 +215,8 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) NEON8_FNASSIGN(c->put_hevc_epel_bi, 1, 0, epel_bi_v,); NEON8_FNASSIGN(c->put_hevc_qpel_bi, 0, 0, pel_bi_pixels,); NEON8_FNASSIGN(c->put_hevc_qpel_bi, 1, 0, qpel_bi_v,); + NEON8_FNASSIGN_PARTIAL_6(c->put_hevc_qpel_bi_w, 0, 0, pel_bi_w_pixels,); + NEON8_FNASSIGN_PARTIAL_6(c->put_hevc_epel_bi_w, 0, 0, pel_bi_w_pixels,); NEON8_FNASSIGN(c->put_hevc_epel_uni, 0, 0, pel_uni_pixels,); NEON8_FNASSIGN(c->put_hevc_epel_uni, 1, 0, epel_uni_v,); NEON8_FNASSIGN(c->put_hevc_qpel_uni, 0, 0, pel_uni_pixels,);

1 0

aarch64/h26x: optimize sao_band_filter
by Zhao Zhili 29 Apr '25

29 Apr '25

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Tue Apr 15 18:01:42 2025 +0800| [39786f8cd5c945954ed1a35a90287d38b2ca1bd9] | committer: Zhao Zhili aarch64/h26x: optimize sao_band_filter int8_t[] is enough for offset_table of 8 bit streams. On rpi5: Before After hevc_sao_band_8_8_c: 252.3 ( 1.00x) 252.3 ( 1.00x) hevc_sao_band_8_8_neon: 95.8 ( 2.63x) 61.0 ( 4.57x) hevc_sao_band_16_8_c: 875.2 ( 1.00x) 864.9 ( 1.00x) hevc_sao_band_16_8_neon: 317.5 ( 2.76x) 150.0 ( 6.26x) hevc_sao_band_32_8_c: 3853.5 ( 1.00x) 3871.6 ( 1.00x) hevc_sao_band_32_8_neon: 1222.3 ( 3.15x) 550.6 ( 7.39) hevc_sao_band_48_8_c: 8203.6 ( 1.00x) 8182.6 ( 1.00x) hevc_sao_band_48_8_neon: 2685.7 ( 3.05x) 1185.8 ( 7.36x) hevc_sao_band_64_8_c: 14023.0 ( 1.00x) 14038.9 ( 1.00x) hevc_sao_band_64_8_neon: 4783.2 ( 2.93x) 2078.4 ( 7.15x) Reviewed-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39786f8cd5c945954… --- libavcodec/aarch64/h26x/dsp.h | 4 ++ libavcodec/aarch64/h26x/sao_neon.S | 93 +++++++++++++++++++------------ libavcodec/aarch64/hevcdsp_init_aarch64.c | 4 +- libavcodec/aarch64/vvc/dsp_init.c | 5 +- 4 files changed, 65 insertions(+), 41 deletions(-) diff --git a/libavcodec/aarch64/h26x/dsp.h b/libavcodec/aarch64/h26x/dsp.h index 0fefb4d70f..6ea6a8d36a 100644 --- a/libavcodec/aarch64/h26x/dsp.h +++ b/libavcodec/aarch64/h26x/dsp.h @@ -28,6 +28,10 @@ void ff_h26x_sao_band_filter_8x8_8_neon(uint8_t *_dst, const uint8_t *_src, ptrdiff_t stride_dst, ptrdiff_t stride_src, const int16_t *sao_offset_val, int sao_left_class, int width, int height); +void ff_h26x_sao_band_filter_16x16_8_neon(uint8_t *_dst, const uint8_t *_src, + ptrdiff_t stride_dst, ptrdiff_t stride_src, + const int16_t *sao_offset_val, int sao_left_class, + int width, int height); void ff_hevc_sao_edge_filter_16x16_8_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t stride_dst, const int16_t *sao_offset_val, int eo, int width, int height); void ff_hevc_sao_edge_filter_8x8_8_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t stride_dst, diff --git a/libavcodec/aarch64/h26x/sao_neon.S b/libavcodec/aarch64/h26x/sao_neon.S index c43820135e..354614ecab 100644 --- a/libavcodec/aarch64/h26x/sao_neon.S +++ b/libavcodec/aarch64/h26x/sao_neon.S @@ -35,48 +35,67 @@ // int16_t *sao_offset_val, int sao_left_class, // int width, int height) function ff_h26x_sao_band_filter_8x8_8_neon, export=1 - stp xzr, xzr, [sp, #-64]! + stp xzr, xzr, [sp, #-32]! stp xzr, xzr, [sp, #16] - stp xzr, xzr, [sp, #32] - stp xzr, xzr, [sp, #48] mov w8, #4 -0: ldrsh x9, [x4, x8, lsl #1] // sao_offset_val[k+1] - subs w8, w8, #1 - add w10, w8, w5 // k + sao_left_class +0: + ldrsh x9, [x4, x8, lsl #1] // sao_offset_val[k+1] + subs w8, w8, #1 + add w10, w8, w5 // k + sao_left_class and w10, w10, #0x1F - strh w9, [sp, x10, lsl #1] + strb w9, [sp, x10] bne 0b - add w6, w6, #7 - bic w6, w6, #7 - ld1 {v16.16b-v19.16b}, [sp], #64 - sub x2, x2, x6 - sub x3, x3, x6 - movi v20.8h, #1 -1: mov w8, w6 // beginning of line -2: // Simple layout for accessing 16bit values - // with 8bit LUT. - // - // 00 01 02 03 04 05 06 07 - // +-----------------------------------> - // |xDE#xAD|xCA#xFE|xBE#xEF|xFE#xED|.... - // +-----------------------------------> - // i-0 i-1 i-2 i-3 - ld1 {v2.8b}, [x1], #8 // dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]); - subs w8, w8, #8 - uxtl v0.8h, v2.8b // load src[x] - ushr v2.8h, v0.8h, #3 // >> BIT_DEPTH - 3 - shl v1.8h, v2.8h, #1 // low (x2, accessing short) - add v3.8h, v1.8h, v20.8h // +1 access upper short - sli v1.8h, v3.8h, #8 // shift insert index to upper byte - tbx v2.16b, {v16.16b-v19.16b}, v1.16b // table - add v1.8h, v0.8h, v2.8h // src[x] + table - sqxtun v4.8b, v1.8h // clip + narrow - st1 {v4.8b}, [x0], #8 // store - // done 8 pixels + ldp q16, q17, [sp], #32 +1: + ld1 {v2.8b}, [x1], x3 + subs w7, w7, #1 + uxtl v0.8h, v2.8b + ushr v3.8b, v2.8b, #3 // >> BIT_DEPTH - 3 + tbl v3.8b, {v16.16b-v17.16b}, v3.8b + sxtl v2.8h, v3.8b + add v0.8h, v0.8h, v2.8h // src[x] + table + sqxtun v0.8b, v0.8h // clip + narrow + st1 {v0.8b}, [x0], x2 + bne 1b + ret +endfunc + +function ff_h26x_sao_band_filter_16x16_8_neon, export=1 + stp xzr, xzr, [sp, #-32]! + stp xzr, xzr, [sp, #16] + mov w8, #4 +0: + ldrsh x9, [x4, x8, lsl #1] // sao_offset_val[k+1] + subs w8, w8, #1 + add w10, w8, w5 // k + sao_left_class + and w10, w10, #0x1F + strb w9, [sp, x10] + bne 0b + add w6, w6, #15 + bic w6, w6, #15 + ldp q16, q17, [sp], #32 + sub x2, x2, x6 + sub x3, x3, x6 +1: + mov w8, w6 // beginning of line +2: + ldr q2, [x1], #16 + subs w8, w8, #16 + uxtl v0.8h, v2.8b + uxtl2 v1.8h, v2.16b + ushr v3.16b, v2.16b, #3 // >> BIT_DEPTH - 3 + tbl v3.16b, {v16.16b-v17.16b}, v3.16b + sxtl v2.8h, v3.8b + sxtl2 v3.8h, v3.16b + add v0.8h, v0.8h, v2.8h // src[x] + table + add v1.8h, v1.8h, v3.8h + sqxtun v0.8b, v0.8h // clip + narrow + sqxtun2 v0.16b, v1.8h + str q0, [x0], #16 bne 2b - subs w7, w7, #1 // finished line, prep. new - add x0, x0, x2 // dst += stride_dst - add x1, x1, x3 // src += stride_src + subs w7, w7, #1 + add x0, x0, x2 // dst += stride_dst + add x1, x1, x3 // src += stride_src bne 1b ret endfunc diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index 5dd470baaa..0b159d1886 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -157,11 +157,11 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) c->idct_dc[2] = ff_hevc_idct_16x16_dc_8_neon; c->idct_dc[3] = ff_hevc_idct_32x32_dc_8_neon; c->transform_4x4_luma = ff_hevc_transform_luma_4x4_neon_8; - c->sao_band_filter[0] = + c->sao_band_filter[0] = ff_h26x_sao_band_filter_8x8_8_neon; c->sao_band_filter[1] = c->sao_band_filter[2] = c->sao_band_filter[3] = - c->sao_band_filter[4] = ff_h26x_sao_band_filter_8x8_8_neon; + c->sao_band_filter[4] = ff_h26x_sao_band_filter_16x16_8_neon; c->sao_edge_filter[0] = ff_hevc_sao_edge_filter_8x8_8_neon; c->sao_edge_filter[1] = c->sao_edge_filter[2] = diff --git a/libavcodec/aarch64/vvc/dsp_init.c b/libavcodec/aarch64/vvc/dsp_init.c index 2c99ba206b..9a171234f6 100644 --- a/libavcodec/aarch64/vvc/dsp_init.c +++ b/libavcodec/aarch64/vvc/dsp_init.c @@ -197,8 +197,9 @@ void ff_vvc_dsp_init_aarch64(VVCDSPContext *const c, const int bd) c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_8_neon; c->inter.apply_bdof = apply_bdof_8; - for (int i = 0; i < FF_ARRAY_ELEMS(c->sao.band_filter); i++) - c->sao.band_filter[i] = ff_h26x_sao_band_filter_8x8_8_neon; + c->sao.band_filter[0] = ff_h26x_sao_band_filter_8x8_8_neon; + for (int i = 1; i < FF_ARRAY_ELEMS(c->sao.band_filter); i++) + c->sao.band_filter[i] = ff_h26x_sao_band_filter_16x16_8_neon; c->sao.edge_filter[0] = ff_vvc_sao_edge_filter_8x8_8_neon; for (int i = 1; i < FF_ARRAY_ELEMS(c->sao.edge_filter); i++) c->sao.edge_filter[i] = ff_vvc_sao_edge_filter_16x16_8_neon;

1 0

avformat/mov: Reduce seek when interleaved_read is disabled
by Zhao Zhili 29 Apr '25

29 Apr '25

ffmpeg | branch: master | Zhao Zhili <zhilizhao(a)tencent.com> | Thu Apr 17 20:12:49 2025 +0800| [ca964ba139695fc0064d07ac6503626d549520c7] | committer: Zhao Zhili avformat/mov: Reduce seek when interleaved_read is disabled Don't select sample with small dts when interleaved_read is disabled. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ca964ba139695fc00… --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 452690090c..cb81b6c4da 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -10703,7 +10703,7 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st) ((s->pb->seekable & AVIO_SEEKABLE_NORMAL) && ((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && dts != AV_NOPTS_VALUE && ((dtsdiff <= AV_TIME_BASE && current_sample->pos < sample->pos) || - (dtsdiff > AV_TIME_BASE && dts < best_dts)))))) { + (dtsdiff > AV_TIME_BASE && dts < best_dts && mov->interleaved_read)))))) { sample = current_sample; best_dts = dts; *st = avst;

1 0

postproc/tests: Add test tools to .gitignore
by Andreas Rheinhardt 28 Apr '25

28 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Apr 28 16:01:13 2025 +0200| [d11d4277f9339b4c31a4619af8f273a5910840e8] | committer: Andreas Rheinhardt postproc/tests: Add test tools to .gitignore Reviewed-by: Marvin Scholz <epirat07(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d11d4277f9339b4c3… --- libpostproc/tests/.gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libpostproc/tests/.gitignore b/libpostproc/tests/.gitignore new file mode 100644 index 0000000000..d77aa7e3dd --- /dev/null +++ b/libpostproc/tests/.gitignore @@ -0,0 +1,2 @@ +/blocktest +/stripetest

1 0

avcodec/apv_decode: Remove redundant log message
by Andreas Rheinhardt 27 Apr '25

27 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 27 20:29:53 2025 +0200| [fcc562693e34d4cdbb486f2159547595554f7519] | committer: Andreas Rheinhardt avcodec/apv_decode: Remove redundant log message ff_thread_get_buffer() already emits its own logmessage. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fcc562693e34d4cdb… --- libavcodec/apv_decode.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/apv_decode.c b/libavcodec/apv_decode.c index 3b638795ea..6fe52ffd84 100644 --- a/libavcodec/apv_decode.c +++ b/libavcodec/apv_decode.c @@ -277,10 +277,8 @@ static int apv_decode(AVCodecContext *avctx, AVFrame *output, } err = ff_thread_get_buffer(avctx, output, 0); - if (err) { - av_log(avctx, AV_LOG_ERROR, "No output frame supplied.\n"); + if (err < 0) return err; - } apv->output_frame = output;

1 0

avcodec/apv_decode: Fix shadowing
by Andreas Rheinhardt 27 Apr '25

27 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 27 20:25:21 2025 +0200| [e2fcf234e462277d402bf087d514fd08636507a2] | committer: Andreas Rheinhardt avcodec/apv_decode: Fix shadowing Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2fcf234e462277d4… --- libavcodec/apv_decode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/apv_decode.c b/libavcodec/apv_decode.c index e28bc29c8f..3b638795ea 100644 --- a/libavcodec/apv_decode.c +++ b/libavcodec/apv_decode.c @@ -313,11 +313,11 @@ static int apv_decode_metadata(AVCodecContext *avctx, AVFrame *frame, return err; if (mdm) { - for (int i = 0; i < 3; i++) { - mdm->display_primaries[i][0] = - av_make_q(mdcv->primary_chromaticity_x[i], 1 << 16); - mdm->display_primaries[i][1] = - av_make_q(mdcv->primary_chromaticity_y[i], 1 << 16); + for (int j = 0; j < 3; j++) { + mdm->display_primaries[j][0] = + av_make_q(mdcv->primary_chromaticity_x[j], 1 << 16); + mdm->display_primaries[j][1] = + av_make_q(mdcv->primary_chromaticity_y[j], 1 << 16); } mdm->white_point[0] =

1 0

avformat/apvenc: Add AVFMT_NOTIMESTAMPS flag
by Andreas Rheinhardt 27 Apr '25

27 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 27 20:23:23 2025 +0200| [431c0f305d06b43901d3ddff2d63c8f3968f3a76] | committer: Andreas Rheinhardt avformat/apvenc: Add AVFMT_NOTIMESTAMPS flag This is a raw format. Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=431c0f305d06b4390… --- libavformat/apvenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/apvenc.c b/libavformat/apvenc.c index 823cc0e601..1e58ca8903 100644 --- a/libavformat/apvenc.c +++ b/libavformat/apvenc.c @@ -33,6 +33,7 @@ const FFOutputFormat ff_apv_muxer = { .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_APV, .p.subtitle_codec = AV_CODEC_ID_NONE, + .p.flags = AVFMT_NOTIMESTAMPS, .flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH | FF_OFMT_FLAG_ONLY_DEFAULT_CODECS, .write_packet = apv_write_packet, };

1 0

avformat/apvenc: Remove unused header
by Andreas Rheinhardt 27 Apr '25

27 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 27 20:12:19 2025 +0200| [aa50d2eca2700a68bc370d5511909221b5b0dd3f] | committer: Andreas Rheinhardt avformat/apvenc: Remove unused header Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa50d2eca2700a68b… --- libavformat/apvenc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/apvenc.c b/libavformat/apvenc.c index c7827cd5b5..823cc0e601 100644 --- a/libavformat/apvenc.c +++ b/libavformat/apvenc.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/apv.h" - #include "avformat.h" #include "mux.h"

1 0

avformat/apvenc: Only allow APV
by Andreas Rheinhardt 27 Apr '25

27 Apr '25

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Apr 27 20:11:50 2025 +0200| [7fd796c600bca66ec16306b1bfb028a9d4819e3e] | committer: Andreas Rheinhardt avformat/apvenc: Only allow APV Reviewed-by: Mark Thompson <sw(a)jkqxz.net> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fd796c600bca66ec… --- libavformat/apvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/apvenc.c b/libavformat/apvenc.c index 9c4d33fdae..c7827cd5b5 100644 --- a/libavformat/apvenc.c +++ b/libavformat/apvenc.c @@ -35,6 +35,6 @@ const FFOutputFormat ff_apv_muxer = { .p.audio_codec = AV_CODEC_ID_NONE, .p.video_codec = AV_CODEC_ID_APV, .p.subtitle_codec = AV_CODEC_ID_NONE, - .flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH, + .flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH | FF_OFMT_FLAG_ONLY_DEFAULT_CODECS, .write_packet = apv_write_packet, };

1 0