har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/vvc: Don't use ff_copy_bits()

Browse Source 
There is no benefit in using it: The fast path of copying
is not taken because of misalignment; furthermore we are
only dealing with a few byte here anyway, so simply copy
the bytes manually, avoiding the dependency on bitstream.c
in lavf (which also contains a function that is completely
unused in lavf).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-06-05 11:39:46 +02:00
parent 52fb49a8a3
commit 4482b3353d
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/Makefile
View File

@ -728,7 +728,6 @@ OBJS-$(CONFIG_LIBZMQ_PROTOCOL) += libzmq.o
# Objects duplicated from other libraries for shared builds # Objects duplicated from other libraries for shared builds
SHLIBOBJS += log2_tab.o to_upper4.o SHLIBOBJS += log2_tab.o to_upper4.o
SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o SHLIBOBJS-$(CONFIG_ISO_MEDIA) += mpegaudiotabs.o
SHLIBOBJS-$(CONFIG_ISO_WRITER) += bitstream.o
SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o SHLIBOBJS-$(CONFIG_FLV_MUXER) += mpeg4audio_sample_rates.o
SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o SHLIBOBJS-$(CONFIG_HLS_DEMUXER) += ac3_channel_layout_tab.o
SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o SHLIBOBJS-$(CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER) += jpegxl_parse.o

1
libavformat/bitstream.c
View File

@ -1 +0,0 @@
#include "libavcodec/bitstream.c"

4
libavformat/vvc.c
View File

@ -757,8 +757,8 @@ static int vvcc_write(AVIOContext *pb, VVCDecoderConfigurationRecord *vvcc)
put_bits(&pbc, 1, vvcc->ptl.ptl_frame_only_constraint_flag); put_bits(&pbc, 1, vvcc->ptl.ptl_frame_only_constraint_flag);
put_bits(&pbc, 1, vvcc->ptl.ptl_multilayer_enabled_flag); put_bits(&pbc, 1, vvcc->ptl.ptl_multilayer_enabled_flag);
av_assert0(vvcc->ptl.num_bytes_constraint_info); av_assert0(vvcc->ptl.num_bytes_constraint_info);
if (vvcc->ptl.num_bytes_constraint_info > 1) for (int i = 0; i < vvcc->ptl.num_bytes_constraint_info - 1; i++)
ff_copy_bits(&pbc, vvcc->ptl.general_constraint_info, (vvcc->ptl.num_bytes_constraint_info - 1) * 8); put_bits(&pbc, 8, vvcc->ptl.general_constraint_info[i]);
put_bits(&pbc, 6, vvcc->ptl.general_constraint_info[vvcc->ptl.num_bytes_constraint_info - 1] & 0x3f); put_bits(&pbc, 6, vvcc->ptl.general_constraint_info[vvcc->ptl.num_bytes_constraint_info - 1] & 0x3f);
flush_put_bits(&pbc); flush_put_bits(&pbc);
avio_write(pb, buf, put_bytes_output(&pbc)); avio_write(pb, buf, put_bytes_output(&pbc));

1
tests/ref/fate/source
View File

@ -7,7 +7,6 @@ libavdevice/file_open.c
libavdevice/reverse.c libavdevice/reverse.c
libavfilter/file_open.c libavfilter/file_open.c
libavfilter/log2_tab.c libavfilter/log2_tab.c
libavformat/bitstream.c
libavformat/file_open.c libavformat/file_open.c
libavformat/golomb_tab.c libavformat/golomb_tab.c
libavformat/log2_tab.c libavformat/log2_tab.c