FFmpeg

Commit Graph

Author	SHA1	Message	Date
James Almer	d903c09d9a	avcodec/cbs_mpeg2: fix leak of extra_information_slice buffer in cbs_mpeg2_read_slice_header() cbs_mpeg2_free_slice() calls av_buffer_unref() on extra_information_ref, meaning allocating with av_malloc() was not the intention. Signed-off-by: James Almer <jamrial@gmail.com>	6 years ago
Andreas Rheinhardt	1759a9e5b5	cbs_mpeg2: Correct error codes Up until now, things that are merely unsupported by cbs_mpeg2 have been declared to be invalid input. This has been changed. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>	6 years ago
Andreas Rheinhardt	de58803839	cbs_mpeg2: Fix storage type for frame_centre_*_offset The frame_centre_horizontal/vertical_offset values contained in picture display extensions are actually signed values (i.e. it is possible to indicate that the display device should add black bars/pillars). The files sony-ct3.bs and tcela-6.bits (which are both used in fate tests for mpeg2_metadata) contain picture display extensions; the former even contains a negative frame_centre_vertical_offset. Fortunately, the old code did not damage the picture display extensions when one did a cycle of reading and writing. For the same reason the fate tests needn't be updated either. Furthermore these fields now use the trace output for matrices. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>	6 years ago
Andreas Rheinhardt	9c3f2a8894	cbs_mpeg2: Improve checks for invalid values MPEG-2 contains several elements that mustn't be zero according to the specifications: horizontal/vertical_size_value, aspect_ratio_information, frame_rate_code, the quantiser matrices, the colour_description elements, picture_coding_type, the f_code[r][s] values and quantiser_scale_code. It is now checked that the invalid values don't occur. The colour_description elements are treated specially in this regard: Given that there are files in the wild which use illegal values for the colour_description elements (some of them created by mpeg2_metadata), they will be corrected to the value meaning "unknown" (namely 2) during reading. This has been done in such a way that trace_headers will nevertheless report the original value, together with a message about the fixup. Furthermore, the trace_headers output of user_data has been beautified. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>	6 years ago
Andreas Rheinhardt	cfe4389d47	cbs_mpeg2: Correct and use enum values Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>	6 years ago
Aman Gupta	41ed2c3849	avcodec/cbs: ensure user_data is padded for GBC parsing Fixes crash noticed in the cbs_userdata patchset. ====ERROR: AddressSanitizer: heap-buffer-overflow on address 0x609000026c89 at pc 0x00010725d37b bp 0x7ffeea04e750 sp 0x7ffeea04e748 READ of size 4 at 0x609000026c89 thread T0 #0 0x10725d37a in ff_cbs_read_unsigned get_bits.h:274 #1 0x1072d2767 in ff_cbs_read_a53_user_data cbs_misc_syntax_template.c:119 #2 0x1078251a7 in h264_metadata_filter h264_metadata_bsf.c:595 #3 0x105c1321d in output_packet ffmpeg.c:853 0x609000026c89 is located 1 bytes to the right of 8-byte region [0x609000026c80,0x609000026c88) allocated by thread T0 here: #0 0x10aef08d7 in wrap_posix_memalign (libclang_rt.asan_osx_dynamic.dylib:x86_64h+0x578d7) #1 0x10aca95e6 in av_malloc mem.c:87 #2 0x10ac545fe in av_buffer_allocz buffer.c:72 #3 0x107263b27 in cbs_h264_read_nal_unit cbs_h264_syntax_template.c:722 #4 0x10725b688 in cbs_read_fragment_content cbs.c:155 Signed-off-by: Aman Gupta <aman@tmm1.net>	6 years ago
Mark Thompson	300ef25314	cbs: Add support for array subscripts in trace output This makes the trace output for arrays significantly nicer.	7 years ago
Mark Thompson	ce5870a3a8	cbs: Refcount all the things! This makes it easier for users of the CBS API to get alloc/free right - all subelements use the buffer API so that it's clear how to free them. It also allows eliding some redundant copies: the packet -> fragment copy disappears after this change if the input packet is refcounted, and more codec-specific cases are now possible (but not included in this patch).	7 years ago
Mark Thompson	686e388bbb	lavc: Add coded bitstream read/write support for MPEG-2 (cherry picked from commit `2bc9ba8d3c`) (cherry picked from commit `a41b69b5eb`)	7 years ago
Mark Thompson	a41b69b5eb	cbs_mpeg2: Add support for picture display extension	8 years ago
Mark Thompson	2bc9ba8d3c	lavc: Add coded bitstream read/write support for MPEG-2 Also enable MPEG-2 support in the trace_headers filter.	8 years ago

12 Commits (1c3ed1189313103e9b889165ef7c59baf699534a)