Compare commits
1 Commits
release/4.
...
n4.5-dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c361fa9e21 |
4
CREDITS
4
CREDITS
@@ -1,6 +1,6 @@
|
||||
See the Git history of the project (https://git.ffmpeg.org/ffmpeg) to
|
||||
See the Git history of the project (git://source.ffmpeg.org/ffmpeg) to
|
||||
get the names of people who have contributed to FFmpeg.
|
||||
|
||||
To check the log, you can type the command "git log" in the FFmpeg
|
||||
source directory, or browse the online repository at
|
||||
https://git.ffmpeg.org/ffmpeg
|
||||
http://source.ffmpeg.org.
|
||||
|
||||
452
Changelog
452
Changelog
@@ -1,457 +1,7 @@
|
||||
Entries are sorted chronologically from oldest to youngest within each release,
|
||||
releases are sorted from youngest to oldest.
|
||||
|
||||
version 4.4.4:
|
||||
- avcodec/tests/snowenc: Fix 2nd test
|
||||
- avcodec/tests/snowenc: return a failure if DWT/IDWT mismatches
|
||||
- avcodec/snowenc: Fix visual weight calculation
|
||||
- avcodec/tests/snowenc: unbreak DWT tests
|
||||
- avcodec/vp3: Add missing check for av_malloc
|
||||
- avformat/nutdec: Add check for avformat_new_stream
|
||||
- avcodec/mpeg12dec: Check input size
|
||||
- avcodec/escape124: Fix some return codes
|
||||
- avcodec/escape124: fix signdness of end of input check
|
||||
- Use https for repository links
|
||||
- avcodec/rpzaenc: stop accessing out of bounds frame
|
||||
- avcodec/motionpixels: Mask pixels to valid values
|
||||
- avcodec/xpmdec: Check size before allocation to avoid truncation
|
||||
- avcodec/bink: Avoid undefined out of array end pointers in binkb_decode_plane()
|
||||
- avcodec/bink: Fix off by 1 error in ref end
|
||||
- avcodec/utils: Ensure linesize for SVQ3
|
||||
- avcodec/utils: allocate a line more for VC1 and WMV3
|
||||
- avcodec/videodsp_template: Adjust pointers to avoid undefined pointer things
|
||||
- avcodec/pngdec: Check deloco index more exactly
|
||||
- avcodec/ffv1dec: Check that num h/v slices is supported
|
||||
- avformat/mov: Check samplesize and offset to avoid integer overflow
|
||||
- avcodec/pictordec: Remove mid exit branch
|
||||
- avcodec/eac3dec: avoid float noise in fixed mode addition to overflow
|
||||
- avcodec/utils: use 32pixel alignment for bink
|
||||
- avcodec/scpr3: Check bx
|
||||
- avcodec/012v: Order operations for odd size handling
|
||||
- avcodec/eatgq: : Check index increments in tgq_decode_block()
|
||||
- avcodec/scpr: Test bx before use
|
||||
- avformat/mxfdec: Use 64bit in remainder
|
||||
- avcodec/sunrast: Fix maplength check
|
||||
- avcodec/wavpack: Avoid undefined shift in get_tail()
|
||||
- avcodec/wavpack: Check for end of input in wv_unpack_dsd_high()
|
||||
- avformat/id3v2: Check taglen in read_uslt()
|
||||
- avcodec/tiff: Ignore tile_count
|
||||
- avcodec/ffv1dec: restructure slice coordinate reading a bit
|
||||
- avcodec/mlpdec: Check max matrix instead of max channel in noise check
|
||||
- swscale/input: Use more unsigned intermediates
|
||||
- avcodec/alsdec: The minimal block is at least 7 bits
|
||||
- avformat/replaygain: avoid undefined / negative abs
|
||||
- swscale/output: Bias 16bps output calculations to improve non overflowing range
|
||||
- avcodec/speedhq: Check buf_size to be big enough for DC
|
||||
- avcodec/ffv1dec: Fail earlier if prior context is corrupted
|
||||
- avcodec/nvenc: fix b-frame DTS behavior with fractional framerates
|
||||
- avfilter/vf_untile: swap the chroma shift values used for plane offsets
|
||||
- avcodec/nvenc: fix vbv buffer size in cq mode
|
||||
- avcodec/mjpegenc: take into account component count when writing the SOF header size
|
||||
- swscale: aarch64: Fix yuv2rgb with negative stride
|
||||
|
||||
version 4.4.3:
|
||||
- avformat/vividas: Check packet size
|
||||
- configure: link to libatomic when it's present
|
||||
- avcodec/dstdec: Check for overflow in build_filter()
|
||||
- avformat/spdifdec: Use 64bit to compute bit rate
|
||||
- avformat/rpl: Use 64bit for duration computation
|
||||
- avformat/xwma: Use av_rescale() for duration computation
|
||||
- avformat/sdsdec: Use av_rescale() to avoid intermediate overflow in duration calculation
|
||||
- avformat/sbgdec: Check ts_int in genrate_intervals
|
||||
- avformat/rmdec: check tag_size
|
||||
- avformat/nutdec: Check fields
|
||||
- avformat/flvdec: Use 64bit for sum_flv_tag_size
|
||||
- avformat/jacosubdec: Fix overflow in get_shift()
|
||||
- avformat/dxa: avoid bpc overflows
|
||||
- avformat/cafdec: Check that nb_frasmes fits within 64bit
|
||||
- avformat/asfdec_o: Limit packet offset
|
||||
- avformat/ape: Check frames size
|
||||
- avformat/icodec: Check nb_pal
|
||||
- avformat/aiffdec: Use 64bit for block_duration use
|
||||
- avformat/aiffdec: Check block_duration
|
||||
- avformat/mxfdec: only probe max run in
|
||||
- avformat/mxfdec: Check run_in is within 65536
|
||||
- avcodec/mjpegdec: Check for unsupported bayer case
|
||||
- avcodec/apedec: Fix integer overflow in filter_3800()
|
||||
- avcodec/tta: Check 24bit scaling for overflow
|
||||
- avcodec/mobiclip: Check quantizer for overflow
|
||||
- avcodec/exr: Check preview psize
|
||||
- avcodec/tiff: Fix loop detection
|
||||
- libavformat/hls: Free keys
|
||||
- avcodec/fmvc: Move frame allocation to a later stage
|
||||
- avfilter/vf_showinfo: remove backspaces
|
||||
- avcodec/speedhq: Check width
|
||||
- avcodec/bink: disallow odd positioned scaled blocks
|
||||
- avformat/asfdec_o: limit recursion depth in asf_read_unknown()
|
||||
- doc/git-howto.texi: Document commit signing
|
||||
- libavcodec/8bps: Check that line lengths fit within the buffer
|
||||
- avcodec/midivid: Perform lzss_uncompress() before ff_reget_buffer()
|
||||
- libavformat/iff: Check for overflow in body_end calculation
|
||||
- avformat/avidec: Prevent entity expansion attacks
|
||||
- avcodec/h263dec: Sanity check against minimal I/P frame size
|
||||
- avcodec/hevcdec: Check s->ref in the md5 path similar to hwaccel
|
||||
- avcodec/mpegaudiodec_template: use unsigned shift in handle_crc()
|
||||
- avformat/subviewerdec: Make read_ts() more flexible
|
||||
- avcodec/mjpegdec: bayer and rct are incompatible
|
||||
- MAINTAINERS: Add ED25519 key for signing my commits in the future
|
||||
- avcodec/hevc_filter: copy_CTB() only within width&height
|
||||
- avcodec/tiff: Check tile_length and tile_width
|
||||
- avcodec/mss4: Check image size with av_image_check_size2()
|
||||
- avformat/flvdec: Check for EOF in index reading
|
||||
- avformat/nutdec: Check get_packetheader() in mainheader
|
||||
- avformat/asfdec_f: Use 64bit for packet start time
|
||||
- avcodec/exr: Check x/ysize
|
||||
- tools/target_dec_fuzzer: Adjust threshold for MMVIDEO
|
||||
- avcodec/lagarith: Check dst/src in zero run code
|
||||
- avcodec/h264dec: Skip late SEI
|
||||
- avcodec/sbrdsp_fixed: Fix integer overflows in sbr_qmf_deint_neg_c()
|
||||
- avfilter/vf_signature: Fix integer overflow in filter_frame()
|
||||
- avformat/rtsp: break on unknown protocols
|
||||
- avcodec/hevcdsp_template: stay within tables in sao_band_filter()
|
||||
- avcodec/tiff: Check pixel format types for dng
|
||||
- avcodec/qpeldsp: copy less for the mc0x cases
|
||||
- avformat/aaxdec: Check for empty segments
|
||||
- avcodec/ffv1dec: Limit golomb rice coded slices to width 8M
|
||||
- avformat/iff: simplify duration calculation
|
||||
- avcodec/wnv1: Check for width =1
|
||||
- avcodec/ffv1dec_template: fix indention
|
||||
- avformat/sctp: close socket on errors
|
||||
- avcodec/aasc: Fix indention
|
||||
- avcodec/qdrw: adjust max colors to array size
|
||||
- avcodec/alacdsp: Make intermediates unsigned
|
||||
- avformat/aiffdec: cleanup size handling for extreem cases
|
||||
- avformat/matroskadec: avoid integer overflows in SAR computation
|
||||
- avcodec/jpeglsdec: fix end check for xfrm
|
||||
- avcodec/cdgraphics: limit scrolling to the line
|
||||
- avformat/hls: Limit start_seq_no to one bit less
|
||||
- avformat/aiffdec: avoid integer overflow in get_meta()
|
||||
- avformat/ape: more bits in size for less overflows
|
||||
- avformat/aviobuf: Check buf_size in ffio_ensure_seekback()
|
||||
- avformat/bfi: Check offsets better
|
||||
- avformat/asfdec_f: Check packet_frag_timestamp
|
||||
- avcodec/texturedspenc: Fix indexing in color distribution determination
|
||||
- avformat/act: Check ff_get_wav_header() for failure
|
||||
- avcodec/libxavs2: Improve r redundancy in occured
|
||||
- avformat/libzmq: Improve r redundancy in occured
|
||||
- avfilter/vsrc_mandelbrot: Check for malloc failure
|
||||
- avfilter/vf_frei0r: Copy to frame allocated according to frei0r requirements
|
||||
- avfilter/video: Add ff_default_get_video_buffer2() to set specific alignment
|
||||
- avformat/genh: Check sample rate
|
||||
- configure: bump year
|
||||
- lavc/videotoolbox: do not pass AVCodecContext to decoder output callback
|
||||
- lavc/pthread_frame: always transfer stashed hwaccel state
|
||||
- avcodec/arm/sbcenc: avoid callee preserved vfp registers
|
||||
- avfilter/vf_scale: overwrite the width and height expressions with the original values
|
||||
- lavc/pthread_frame: avoid leaving stale hwaccel state in worker threads
|
||||
- configure: extend SDL check to accept all 2.x versions
|
||||
- lavf/tls_mbedtls: add support for mbedtls version 3
|
||||
|
||||
version 4.4.2:
|
||||
- fate: update reference files after the recent dash manifest muxer changes
|
||||
- avformat/webmdashenc: fix on-demand profile string
|
||||
- Update for FFmpeg 4.4.2
|
||||
- avcodec/exr: Avoid signed overflow in displayWindow
|
||||
- avcodec/diracdec: avoid signed integer overflow in global mv
|
||||
- avcodec/takdsp: Fix integer overflow in decorrelate_sf()
|
||||
- avcodec/apedec: fix a integer overflow in long_filter_high_3800()
|
||||
- avfilter/vf_subtitles: pass storage size to libass
|
||||
- avformat/aqtitledec: Skip unrepresentable durations
|
||||
- avformat/cafdec: Do not store empty keys in read_info_chunk()
|
||||
- avformat/mxfdec: Do not clear array in mxf_read_strong_ref_array() before writing
|
||||
- avformat/mxfdec: Check for avio_read() failure in mxf_read_strong_ref_array()
|
||||
- avformat/mxfdec: Check count in mxf_read_strong_ref_array()
|
||||
- avformat/hls: Check target_duration
|
||||
- avcodec/pixlet: Avoid signed integer overflow in scaling in filterfn()
|
||||
- avformat/matroskadec: Check pre_ns
|
||||
- avcodec/sonic: Use unsigned for predictor_k to avoid undefined behavior
|
||||
- avcodec/libuavs3d: Check ff_set_dimensions() for failure
|
||||
- avcodec/mjpegbdec: Set buf_size
|
||||
- avformat/matroskadec: Use rounded down duration in get_cue_desc() check
|
||||
- avcodec/argo: Check packet size
|
||||
- avcodec/g729_parser: Check channels
|
||||
- avformat/avidec: Check height
|
||||
- avformat/rmdec: Better duplicate tags check
|
||||
- avformat/mov: Disallow empty sidx
|
||||
- avformat/argo_asf: Fix order of operations in error check in argo_asf_write_trailer()
|
||||
- avformat/matroskadec: Check duration
|
||||
- avformat/mov: Corner case encryption error cleanup in mov_read_senc()
|
||||
- avcodec/jpeglsdec: Fix if( code style
|
||||
- avcodec/jpeglsdec: Check get_ur_golomb_jpegls() for error
|
||||
- avcodec/motion_est: fix indention of ff_get_best_fcode()
|
||||
- avcodec/motion_est: Fix xy indexing on range violation in ff_get_best_fcode()
|
||||
- avformat/hls: Use unsigned for iv computation
|
||||
- avcodec/jpeglsdec: Increase range for N in ls_get_code_runterm() by using unsigned
|
||||
- avformat/matroskadec: Check desc_bytes
|
||||
- avformat/utils: Fix invalid NULL pointer operation in ff_parse_key_value()
|
||||
- avformat/matroskadec: Fix infinite loop with bz decompression
|
||||
- avformat/mov: Check size before subtraction
|
||||
- avcodec/cfhd: Avoid signed integer overflow in coeff
|
||||
- avcodec/apedec: Fix integer overflows in predictor_update_3930()
|
||||
- avcodec/apedec: fix integer overflow in 8bit samples
|
||||
- avformat/flvdec: timestamps cannot use the full int64 range
|
||||
- avcodec/tiff: Remove messing with jpeg context
|
||||
- avcodec/tiff: Use ff_set_dimensions() for setting up mjpeg context dimensions
|
||||
- avcodec/tiff: Pass max_pixels to mjpeg context
|
||||
- avcodec/vqavideo: reset accounting on error
|
||||
- avcodec/alacdsp: fix integer overflow in decorrelate_stereo()
|
||||
- avformat/4xm: Check for duplicate track ids
|
||||
- avformat/4xm: Consider max_streams on reallocating tracks array
|
||||
- avformat/mov: Check next offset in mov_read_dref()
|
||||
- avformat/vivo: Favor setting fps from explicit fractions
|
||||
- avformat/vivo: Do not use the general expression evaluator for parsing a floating point value
|
||||
- avformat/mxfdec: Check for duplicate mxf_read_index_entry_array()
|
||||
- avcodec/apedec: Change avg to uint32_t
|
||||
- avformat/mxfdec: Check component_depth in mxf_get_color_range()
|
||||
- avformat/mov: Disallow duplicate smdm
|
||||
- avformat/mov: Check for EOF in mov_read_glbl()
|
||||
- avcodec/vp3: Check version in all cases when VP4 code is not built
|
||||
- avformat/mov: Check channels for mov_parse_stsd_audio()
|
||||
- avformat/avidec: Check read_odml_index() for failure
|
||||
- avformat/aiffdec: Use av_rescale() for bitrate
|
||||
- avformat/aiffdec: sanity check block_align
|
||||
- avformat/aiffdec: Check sample_rate
|
||||
- avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
|
||||
- avcodec/zmbvenc: Fix memleak upon init error
|
||||
- avcodec/dnxhdenc: Fix segfault when using too many slice threads
|
||||
- avcodec/wma(dec|enc): Fix memleaks upon allocation error
|
||||
- avfilter/avfilter: Actually error out on init error
|
||||
- avcodec/opus_silk: Remove wrong size information in function declaration
|
||||
- avformat/omadec: Don't output uninitialized values
|
||||
- avformat/jacosubenc: Fix writing extradata
|
||||
- avformat/cafenc: Fix memleak when trailer is never written
|
||||
- avformat/cafenc: Don't segfault upon allocation error
|
||||
- avformat/cafenc: Fix potential integer overflow
|
||||
- avformat/movenc: Limit ism_lookahead to a sane value
|
||||
- avutil/utils: Remove racy check from avutil_version()
|
||||
- avformat/sccdec: Don't use uninitialized data, fix crash, simplify logic
|
||||
- avformat/subtitles: Honour ff_subtitles_read_line() documentation
|
||||
- avformat/tee: Fix leak of FIFO-options dictionary
|
||||
- avformat/tee: Fix leak of strings
|
||||
- avcodec/rasc: Fix potential use of uninitialized value
|
||||
- avfilter/vf_w3fdif: Fix segfault on allocation error
|
||||
- avfilter/af_surround: Fix memleaks upon allocation error
|
||||
- avfilter/af_vibrato: Fix segfault upon allocation error
|
||||
- avfilter/aeval: Fix leak of expressions upon reallocation error
|
||||
- avdevice/xv: Increase array size
|
||||
- avfilter/asrc_flite: Fix use-after-frees
|
||||
- avfilter/asrc_flite: Don't segfault when using list_voices option
|
||||
- Revert "avfilter/vf_idet: reduce noisyness if the filter has been auto inserted"
|
||||
- avformat/matroskadec: Don't unnecessarily reduce aspect ratio
|
||||
- avcodec/h263: Fix global-buffer-overflow with noout flag2 set
|
||||
- avcodec/vaapi_encode: Fix segfault upon closing uninitialized encoder
|
||||
- avcodec/movtextenc: Fix infinite loop due to variable truncation
|
||||
- avcodec/libopenh264dec: Increase array sizes, fix stack-buffer overread
|
||||
- avcodec/libkvazaar: Increase array size
|
||||
- avformat/aadec: Don't use the same loop counter in inner and outer loop
|
||||
- avformat/moflex: Don't use uninitialized timebase for data stream
|
||||
- lavf/udp: do not return an uninitialized value from udp_open()
|
||||
- avcodec/nvenc: zero-initialize NV_ENC_REGISTER_RESOURCE struct
|
||||
- configure: Add missing libshine->mpegaudioheader dependency
|
||||
- avcodec/Makefile: Add missing entry for ADPCM_IMA_AMV_ENCODER
|
||||
- avcodec/Makefile: Only compile nvenc.o if needed
|
||||
- avcodec/av1_vaapi: improve decode quality
|
||||
- avcodec/av1_vaapi: enable segmentation features
|
||||
- avcodec/av1_vaapi: setting 2 output surface for film grain
|
||||
- avcodec/vaapi: increase av1 decode pool size
|
||||
- avcodec/dxva2_av1: fix global motion params
|
||||
- avcodec/av1_vaapi: add gm params valid check
|
||||
- avcodec/av1dec: support setup shear process
|
||||
- avcodec/av1: extend some definitions in spec section 3
|
||||
- cbs_av1: fix incorrect data type
|
||||
- avcodec/libdav1d: let libdav1d choose optimal max frame delay
|
||||
- avcodec/libdav1d: pass auto threads value to libdav1d
|
||||
|
||||
version 4.4.1:
|
||||
- avcodec/flac_parser: Consider AV_INPUT_BUFFER_PADDING_SIZE
|
||||
- avcodec/ttadsp: Fix integer overflows in tta_filter_process_c()
|
||||
- avutil/mathematics: Document av_rescale_rnd() behavior on non int64 results
|
||||
- avcodec/utils: Ensure 8x8 alignment for ARGO in avcodec_align_dimensions2()
|
||||
- avformat/matroskadec: Reset state also on failure in matroska_reset_status()
|
||||
- avformat/wavdec: Check smv_block_size
|
||||
- avformat/rmdec: Check for multiple audio_stream_info
|
||||
- avcodec/apedec: Use 64bit to avoid overflow
|
||||
- avcodec/apedec: Fix undefined integer overflow in long_filter_ehigh_3830()
|
||||
- oavformat/avidec: Check offset in odml
|
||||
- avformat/mpegts: use actually read packet size in mpegts_resync special case
|
||||
- fftools/ffmpeg: Fix crash when flushing non-fully setup output stream
|
||||
- avfilter/scale_npp: fix non-aligned output frame dimensions
|
||||
- Revert "avformat/hlsenc: compute video_keyframe_size after write keyframe"
|
||||
- Changelog: update
|
||||
- swscale/alphablend: Fix slice handling
|
||||
- avcodec/apedec: Fix integer overflow in filter_fast_3320()
|
||||
- avformat/mov: Fix last mfra check
|
||||
- avcodec/mxpegdec: Check for AVDISCARD_ALL
|
||||
- avcodec/flicvideo: Check remaining bytes in FLI*COPY
|
||||
- avcodec/utils: ARGO writes 4x4 blocks without regard to the image dimensions
|
||||
- avcodec/cbs_h265_syntax_template: Limit sps_num_palette_predictor_initializer_minus1 to 127
|
||||
- avcodec/snowdec: Maintain avmv buffer
|
||||
- avcodec/mpeg12dec: Do not put mpeg_f_code into an invalid state on error return
|
||||
- avcodec/mpegvideo_enc: Limit bitrate tolerance to the representable
|
||||
- avcodec/apedec: Fix integer overflow in intermediate
|
||||
- avformat/mvdec: Do not set invalid sample rate
|
||||
- avformat/sbgdec: Check for t0 overflow in expand_tseq()
|
||||
- avformat/rmdec: Use 64bit for intermediate for DEINT_ID_INT4
|
||||
- avformat/sbgdec: Check opt_duration and start for overflow
|
||||
- avcodec/exr: Fix undefined integer multiplication
|
||||
- avformat/mov: Check for duplicate clli
|
||||
- avformat/utils: Ignore negative duration in codec_info_duration computation
|
||||
- avformat/jacosubdec: Check for min in t overflow in get_shift()
|
||||
- avformat/mxfdec: check channel number in mxf_get_d10_aes3_packet()
|
||||
- (origin/release/4.4) avcodec/wmadec: handle run_level_decode error
|
||||
- avcodec/wma: Return specific error code
|
||||
- avcodec/dxva2_av1: fix superres_denom parameter
|
||||
- avcodec/libdav1d: fix compilation after recent libdav1d API changes
|
||||
- Changelog: update
|
||||
- avcodec/utils: don't return negative values in av_get_audio_frame_duration()
|
||||
- avcodec/jpeg2000dec: Check that atom header is within bytsetream
|
||||
- avcodec/apedec: Fix 2 integer overflows in filter_3800()
|
||||
- avcodec/xpmdec: Move allocations down after more error checks
|
||||
- avcodec/argo: Move U, fix shift
|
||||
- avformat/mov: Check dts for overflow in mov_read_trun()
|
||||
- avformat/avidec: Use 64bit for frame number in odml index parsing
|
||||
- avcodec/mjpegbdec: Skip SOS on AVDISCARD_ALL as does mjpeg
|
||||
- avcodec/mjpegdec: Check for bits left in mjpeg_decode_scan_progressive_ac()
|
||||
- avformat/adtsenc: return value check for init_get_bits in adts_decode_extradata
|
||||
- avcodec/webp: Check available space in loop in decode_entropy_coded_image()
|
||||
- avcodec/h264dec: use picture parameters in ff_print_debug_info2()
|
||||
- avcodec/vc1dec: ff_print_debug_info() does not support WMV3 field_mode
|
||||
- avcodec/frame_thread_encoder: Free AVCodecContext structure on error during init
|
||||
- avcodec/faxcompr: Check for end of input in cmode == 1 in decode_group3_2d_line()
|
||||
- avcodec/vc1dec: Disable error concealment for *IMAGE
|
||||
- avcodec/sbrdsp_fixed: Fix negation overflow in sbr_neg_odd_64_c()
|
||||
- avcodec/argo: Check for even dimensions
|
||||
- avformat/wtvdec: Check for EOF before seeking back in parse_media_type()
|
||||
- avformat/mpc8: Check first keyframe position for overflow
|
||||
- avcodec/exr: Check ac_count
|
||||
- avformat/wavdec: Use 64bit in new_pos computation
|
||||
- avformat/sbgdec: Check for overflow in timestamp preparation
|
||||
- avformat/dsicin: Check packet size for overflow
|
||||
- avformat/dsfdec: Change order of operations in bitrate computation
|
||||
- avformat/bfi: check nframes
|
||||
- avformat/avidec: fix position overflow in avi_load_index()
|
||||
- avformat/asfdec_f: Check sizeX against padding
|
||||
- avformat/aiffdec: Check for size overflow in header parsing
|
||||
- avcodec/aaccoder: Add minimal bias in search_for_ms()
|
||||
- avformat/mov: Fix incorrect overflow detection in mov_read_sidx()
|
||||
- avformat/mov: Avoid undefined overflow in time_offset calculation
|
||||
- avfilter/af_drmeter: Check that there is data
|
||||
- avfilter/vf_fftdnoiz: Use lrintf() in export_row8()
|
||||
- avfilter/vf_mestimate: Check b_count
|
||||
- avformat/mov: do not ignore errors in mov_metadata_hmmt()
|
||||
- avformat/mxfdec: Check size for shrinking
|
||||
- avcodec/dnxhddec: check and propagate function return value
|
||||
- swscale/slice: Fix wrong return on error
|
||||
- avcodec/aacdec_template: Avoid some invalid values to be set by decode_audio_specific_config_gb()
|
||||
- swscale/slice: Check slice for allocation failure
|
||||
- avformat/matroskadec: Fix handling of huge default durations
|
||||
- avcodec/lpc: check for zero err in normalization in compute_lpc_coefs()
|
||||
- avcodec/j2kenc: Check for av_strtok() failure
|
||||
- avformat/ftp: Check for av_strtok() failure
|
||||
- tools/cws2fws: Check read() for failure
|
||||
- avcodec/cpia: Fix missing src_size update
|
||||
- avcodec/exr: Better size checks
|
||||
- avcodec/clearvideo: Check tile_size to be not too large
|
||||
- avcodec/utils: Use 64bit for intermediate in AV_CODEC_ID_ADPCM_THP* duration calculation
|
||||
- avformat/aaxdec: Check avio_seek() in header reading
|
||||
- avcodec/hevc_sei: Use get_bits_long() for time_offset_value
|
||||
- avformat/rmdec: Check old_format len for overflow
|
||||
- avformat/realtextdec: Check the pts difference before using it for the duration computation
|
||||
- avformat/qcp: Avoid negative nb_rates
|
||||
- avformat/pp_bnk: Use 64bit in bitrate computation
|
||||
- avformat/nutdec: Check tmp_size
|
||||
- avformat/msf: Check that channels doesnt overflow during extradata construction
|
||||
- avformat/subtitles: Check pts difference before use
|
||||
- avformat/mpc8: Check for position overflow in mpc8_handle_chunk()
|
||||
- avformat/mccdec: Fix overflows in num/den
|
||||
- avformat/iff: Use 64bit in duration computation
|
||||
- avformat/dxa: Check fps to be within the supported range more precissely
|
||||
- avcodec/iff: Only write palette to plane 1 if its PAL8
|
||||
- avformat/tta: Check for EOF in index reading loop
|
||||
- avfilter/vf_scale: set the RGB matrix coefficients in case of RGB
|
||||
- avfilter/vf_scale: reset color matrix in case of identity & non-RGB
|
||||
- ffmpeg: fix order between field order autodetection and override
|
||||
- avcodec/h264_slice: clear old slice POC values on parsing failure
|
||||
- avfilter/f_metadata: do not return the frame early if there is no metadata
|
||||
- ffbuild: Avoid using the --preprocessor argument to windres
|
||||
- avcodec/crystalhd: signal that the decoder sets all output frame properties
|
||||
- avcodec/cuviddec: signal that the decoder sets all output frame properties
|
||||
- avcodec/decode: reindent after the previous commit
|
||||
- avcodec/decode: add an internal codec flag to signal a decoder sets all output frame properties
|
||||
- avcodec/decode: fetch packets from the pkt_props FIFO on every frame returned
|
||||
- Update missed irc links
|
||||
- avformat/rpl: The associative law doesnt hold for signed integers in C
|
||||
- avcodec/faxcompr: Check available bits in decode_uncompressed()
|
||||
- avcodec/faxcompr: Check if bits are available before reading in cmode == 9 || cmode == 10
|
||||
- avformat/utils: Avoid overflow in codec_info_duration computation for subtitles
|
||||
- avformat/utils: check dts/duration to be representable before using them
|
||||
- avcodec/utils: do "calc from frame_bytes, channels, and block_align" in 64bit
|
||||
- avcodec/ttadata: Add sentinel at the end of ff_tta_shift_1
|
||||
- avformat/mov: Check for duplicate mdcv
|
||||
- avfilter/vf_dctdnoiz: Check threads
|
||||
- avfilter/vf_ciescope: Fix undefined behavior in rgb_to_xy() with black
|
||||
- avcodec/dpx: fix off by 1 in bits_per_color check
|
||||
- avformat/rpl: Check for EOF and zero framesize
|
||||
- avcodec/vc2enc: Check for non negative slice bounds
|
||||
- avformat/rpl: Use 64bit in bitrate computation and check it
|
||||
- avcodec/mpegvideo_enc: Reset stuffing bits if they are not supported
|
||||
- avcodec/svq1enc: Do not print debug RD value before it has been computed
|
||||
- avcodec/aacpsy: Check bandwidth
|
||||
- avcodec/aacenc: Do not divide by lambda_count if it is 0
|
||||
- avcodec/aacenc: Use FLT_EPSILON for lambda minimum
|
||||
- avfilter/vf_yadif: Fix handing of tiny images
|
||||
- avfilter/vf_vmafmotion: Check dimensions
|
||||
- avformat/movenc: Check pal_size before use
|
||||
- avcodec/lpc: Avoid floating point division by 0
|
||||
- avcodec/aacpsy: Avoid floating point division by 0 of norm_fac
|
||||
- avcodec/aacenc: Avoid 0 lambda
|
||||
- avcodec/exr: More strictly check dc_count
|
||||
- avcodec/exr: x/ymax cannot be INT_MAX
|
||||
- avformat/avio: Check av_opt_copy() for failure
|
||||
- avformat/moflex: Remove unneeded format variable
|
||||
- avformat/fifo: check for flushed packets and timeshift
|
||||
- avcodec/clearvideo: Check for 0 tile_shift
|
||||
- avcodec/vc1: Check remaining bits in ff_vc1_parse_frame_header()
|
||||
- avformat/mov: Ignore duplicate CoLL
|
||||
- avformat/mov: Limit nb_chapter_tracks to input size
|
||||
- avformat/utils: Use 64bit earlier in r_frame_rate check
|
||||
- avcodec/alsdec: Fix decoding error with mono audio files
|
||||
- avformat/mvdec: Check sample rate in parse_audio_var()
|
||||
- avcodec/faxcompr: Check for end of bitstream in decode_group3_1d_line() and decode_group3_2d_line()
|
||||
- avcodec/utils: treat PAL8 for jpegs similar to other colorspaces
|
||||
- avcodec/jpeglsdec: Set alpha plane in PAL8 so image is not 100% transparent
|
||||
- avformat/asfdec_o: Use ff_get_extradata()
|
||||
- avformat/id3v2: Check end for overflow in id3v2_parse()
|
||||
- avformat/mxfdec: Fix file position addition
|
||||
- avformat/wtvdec: Improve size overflow checks in parse_chunks()
|
||||
- avcodec/faxcompr: Check remaining bits on error in decode_group3_1d_line()
|
||||
- avformat/mov: check for pts overflow in mov_read_sidx()
|
||||
- avcodec/utils: Check ima wav duration for overflow
|
||||
- avcodec/rv10: Execute whole size check earlier for rv20
|
||||
- avformat/cafdec: Check channels
|
||||
- avcodec/exr: increase vlc depth
|
||||
- avcodec/dpx: Check bits_per_color earlier
|
||||
- avformat/mvi: Check audio_data_size to be non negative
|
||||
- avcodec/nvenc: disable s12m timestamps by default
|
||||
- aarch64: hevc_idct: Fix overflows in idct_dc
|
||||
- avcodec/vaapi_av1: pass full buffer size for each tile
|
||||
- avcodec/videotoolboxenc: #define TARGET_CPU_ARM64 to 0 if not provided by the SDK
|
||||
- lavc/pngdec: fix updating reference frames for APNG_DISPOSE_OP_BACKGROUND
|
||||
- ffmpeg: return no chosen output if an uninitialized stream is unavailable
|
||||
- avcodec/h263, h263data: Move ff_h263_init_rl_inter to h263.c
|
||||
- configure: Add missing mpegvideo dependency for IPU decoder
|
||||
- avcodec/ttmlenc: Don't confuse capabilities and caps_internal
|
||||
- avformat/mpegts: add missing sample_rate value to Opus extradata
|
||||
- avformat/movenc: fix writing dOps atoms
|
||||
- avcodec/av1_metadata: don't store the inserted TD OBU in stack
|
||||
- avcodec/nellymoserenc: Fix segfault when using unsupported channels/rate
|
||||
- avutil/cpu: Use HW_NCPUONLINE to detect # of online CPUs with OpenBSD
|
||||
- avcodec/nvenc: fix lossless tuning logic
|
||||
- avfilter/overlay_cuda: check av_buffer_ref result
|
||||
- avfilter/overlay_cuda: hold explicit reference to hw_device_ctx
|
||||
- avformat/matroskaenc: Fix leak when writing attachment without filename
|
||||
|
||||
version 4.4:
|
||||
version <next>:
|
||||
- AudioToolbox output device
|
||||
- MacCaption demuxer
|
||||
- PGX decoder
|
||||
|
||||
@@ -615,7 +615,6 @@ Jean Delvare 7CA6 9F44 60F1 BDC4 1FD2 C858 A552 6B9B B3CD 4E6A
|
||||
Loren Merritt ABD9 08F4 C920 3F65 D8BE 35D7 1540 DAA7 060F 56DE
|
||||
Lynne FE50 139C 6805 72CA FD52 1F8D A2FE A5F0 3F03 4464
|
||||
Michael Niedermayer 9FF2 128B 147E F673 0BAD F133 611E C787 040B 0FAB
|
||||
DD1E C9E8 DE08 5C62 9B3E 1846 B18E 8928 B394 8D64
|
||||
Nicolas George 24CE 01CE 9ACC 5CEB 74D8 8D9D B063 D997 36E5 4C93
|
||||
Nikolay Aleksandrov 8978 1D8C FB71 588E 4B27 EAA8 C4F0 B5FC E011 13B1
|
||||
Panagiotis Issaris 6571 13A3 33D9 3726 F728 AA98 F643 B12E ECF3 E029
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
|
||||
┌────────────────────────────────────┐
|
||||
│ RELEASE NOTES for FFmpeg 4.4 "Rao" │
|
||||
└────────────────────────────────────┘
|
||||
|
||||
The FFmpeg Project proudly presents FFmpeg 4.4 "Rao", about 10
|
||||
months after the release of FFmpeg 4.3.
|
||||
|
||||
A complete Changelog is available at the root of the project, and the
|
||||
complete Git history on https://git.ffmpeg.org/gitweb/ffmpeg.git
|
||||
|
||||
We hope you will like this release as much as we enjoyed working on it, and
|
||||
as usual, if you have any questions about it, or any FFmpeg related topic,
|
||||
feel free to join us on the #ffmpeg IRC channel (on irc.libera.chat) or ask
|
||||
on the mailing-lists.
|
||||
43
configure
vendored
43
configure
vendored
@@ -536,7 +536,7 @@ die(){
|
||||
|
||||
If you think configure made a mistake, make sure you are using the latest
|
||||
version from Git. If the latest version fails, report the problem to the
|
||||
ffmpeg-user@ffmpeg.org mailing list or IRC #ffmpeg on irc.libera.chat.
|
||||
ffmpeg-user@ffmpeg.org mailing list or IRC #ffmpeg on irc.freenode.net.
|
||||
EOF
|
||||
if disabled logging; then
|
||||
cat <<EOF
|
||||
@@ -1735,6 +1735,7 @@ EXTERNAL_LIBRARY_GPL_LIST="
|
||||
EXTERNAL_LIBRARY_NONFREE_LIST="
|
||||
decklink
|
||||
libfdk_aac
|
||||
openssl
|
||||
libtls
|
||||
"
|
||||
|
||||
@@ -1826,7 +1827,6 @@ EXTERNAL_LIBRARY_LIST="
|
||||
mediacodec
|
||||
openal
|
||||
opengl
|
||||
openssl
|
||||
pocketsphinx
|
||||
vapoursynth
|
||||
"
|
||||
@@ -2761,7 +2761,6 @@ indeo3_decoder_select="hpeldsp"
|
||||
indeo4_decoder_select="ividsp"
|
||||
indeo5_decoder_select="ividsp"
|
||||
interplay_video_decoder_select="hpeldsp"
|
||||
ipu_decoder_select="mpegvideo"
|
||||
jpegls_decoder_select="mjpeg_decoder"
|
||||
jv_decoder_select="blockdsp"
|
||||
lagarith_decoder_select="llviddsp"
|
||||
@@ -3268,7 +3267,7 @@ librav1e_encoder_deps="librav1e"
|
||||
librav1e_encoder_select="extract_extradata_bsf"
|
||||
librsvg_decoder_deps="librsvg"
|
||||
libshine_encoder_deps="libshine"
|
||||
libshine_encoder_select="audio_frame_queue mpegaudioheader"
|
||||
libshine_encoder_select="audio_frame_queue"
|
||||
libspeex_decoder_deps="libspeex"
|
||||
libspeex_encoder_deps="libspeex"
|
||||
libspeex_encoder_select="audio_frame_queue"
|
||||
@@ -3365,7 +3364,6 @@ opus_muxer_select="ogg_muxer"
|
||||
psp_muxer_select="mov_muxer"
|
||||
rtp_demuxer_select="sdp_demuxer"
|
||||
rtp_muxer_select="golomb jpegtables"
|
||||
rtp_mpegts_muxer_select="mpegts_muxer rtp_muxer"
|
||||
rtpdec_select="asf_demuxer jpegtables mov_demuxer mpegts_demuxer rm_demuxer rtp_protocol srtp"
|
||||
rtsp_demuxer_select="http_protocol rtpdec"
|
||||
rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
|
||||
@@ -3706,23 +3704,23 @@ cws2fws_extralibs="zlib_extralibs"
|
||||
|
||||
# libraries, in any order
|
||||
avcodec_deps="avutil"
|
||||
avcodec_suggest="libm stdatomic"
|
||||
avcodec_suggest="libm"
|
||||
avcodec_select="null_bsf"
|
||||
avdevice_deps="avformat avcodec avutil"
|
||||
avdevice_suggest="libm stdatomic"
|
||||
avdevice_suggest="libm"
|
||||
avfilter_deps="avutil"
|
||||
avfilter_suggest="libm stdatomic"
|
||||
avfilter_suggest="libm"
|
||||
avformat_deps="avcodec avutil"
|
||||
avformat_suggest="libm network zlib stdatomic"
|
||||
avformat_suggest="libm network zlib"
|
||||
avresample_deps="avutil"
|
||||
avresample_suggest="libm"
|
||||
avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt stdatomic"
|
||||
avutil_suggest="clock_gettime ffnvcodec libm libdrm libmfx opencl user32 vaapi vulkan videotoolbox corefoundation corevideo coremedia bcrypt"
|
||||
postproc_deps="avutil gpl"
|
||||
postproc_suggest="libm stdatomic"
|
||||
postproc_suggest="libm"
|
||||
swresample_deps="avutil"
|
||||
swresample_suggest="libm libsoxr stdatomic"
|
||||
swresample_suggest="libm libsoxr"
|
||||
swscale_deps="avutil"
|
||||
swscale_suggest="libm stdatomic"
|
||||
swscale_suggest="libm"
|
||||
|
||||
avcodec_extralibs="pthreads_extralibs iconv_extralibs dxva2_extralibs"
|
||||
avfilter_extralibs="pthreads_extralibs"
|
||||
@@ -6186,14 +6184,7 @@ check_headers asm/types.h
|
||||
# it seems there are versions of clang in some distros that try to use the
|
||||
# gcc headers, which explodes for stdatomic
|
||||
# so we also check that atomics actually work here
|
||||
#
|
||||
# some configurations also require linking to libatomic, so try
|
||||
# both with -latomic and without
|
||||
for LATOMIC in "-latomic" ""; do
|
||||
check_builtin stdatomic stdatomic.h \
|
||||
"atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo += bar" \
|
||||
$LATOMIC && eval stdatomic_extralibs="\$LATOMIC" && break
|
||||
done
|
||||
check_builtin stdatomic stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0); foo += bar"
|
||||
|
||||
check_lib advapi32 "windows.h" RegCloseKey -ladvapi32
|
||||
check_lib bcrypt "windows.h bcrypt.h" BCryptGenRandom -lbcrypt &&
|
||||
@@ -6531,10 +6522,7 @@ enabled omx_rpi && { test_code cc OMX_Core.h OMX_IndexConfigBrcmVideoR
|
||||
die "ERROR: OpenMAX IL headers from raspberrypi/firmware not found"; } &&
|
||||
enable omx
|
||||
enabled omx && require_headers OMX_Core.h
|
||||
enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h OPENSSL_init_ssl &&
|
||||
{ enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
|
||||
{ enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
|
||||
check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
|
||||
enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
|
||||
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
|
||||
check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
|
||||
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
|
||||
@@ -6565,7 +6553,7 @@ fi
|
||||
|
||||
if enabled sdl2; then
|
||||
SDL2_CONFIG="${cross_prefix}sdl2-config"
|
||||
test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent
|
||||
test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent
|
||||
if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then
|
||||
sdl2_cflags=$("${SDL2_CONFIG}" --cflags)
|
||||
sdl2_extralibs=$("${SDL2_CONFIG}" --libs)
|
||||
@@ -7512,6 +7500,7 @@ LD_LIB=$LD_LIB
|
||||
LD_PATH=$LD_PATH
|
||||
DLLTOOL=$dlltool
|
||||
WINDRES=$windres
|
||||
DEPWINDRES=$dep_cc
|
||||
DOXYGEN=$doxygen
|
||||
LDFLAGS=$LDFLAGS
|
||||
LDEXEFLAGS=$LDEXEFLAGS
|
||||
@@ -7594,7 +7583,7 @@ cat > $TMPH <<EOF
|
||||
#define FFMPEG_CONFIG_H
|
||||
#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
|
||||
#define FFMPEG_LICENSE "$(c_escape $license)"
|
||||
#define CONFIG_THIS_YEAR 2023
|
||||
#define CONFIG_THIS_YEAR 2021
|
||||
#define FFMPEG_DATADIR "$(eval c_escape $datadir)"
|
||||
#define AVCONV_DATADIR "$(eval c_escape $datadir)"
|
||||
#define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})"
|
||||
|
||||
@@ -38,7 +38,7 @@ PROJECT_NAME = FFmpeg
|
||||
# could be handy for archiving the generated documentation or if some version
|
||||
# control system is used.
|
||||
|
||||
PROJECT_NUMBER = 4.4.4
|
||||
PROJECT_NUMBER =
|
||||
|
||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||
# for a project that appears at the top of each page and should give viewer a
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
The FFmpeg developers.
|
||||
|
||||
For details about the authorship, see the Git history of the project
|
||||
(https://git.ffmpeg.org/ffmpeg), e.g. by typing the command
|
||||
(git://source.ffmpeg.org/ffmpeg), e.g. by typing the command
|
||||
@command{git log} in the FFmpeg source directory, or browsing the
|
||||
online repository at @url{https://git.ffmpeg.org/ffmpeg}.
|
||||
online repository at @url{http://source.ffmpeg.org}.
|
||||
|
||||
Maintainers for the specific components are listed in the file
|
||||
@file{MAINTAINERS} in the source code tree.
|
||||
|
||||
@@ -53,7 +53,7 @@ Most distribution and operating system provide a package for it.
|
||||
@section Cloning the source tree
|
||||
|
||||
@example
|
||||
git clone https://git.ffmpeg.org/ffmpeg.git <target>
|
||||
git clone git://source.ffmpeg.org/ffmpeg <target>
|
||||
@end example
|
||||
|
||||
This will put the FFmpeg sources into the directory @var{<target>}.
|
||||
@@ -187,18 +187,11 @@ to make sure you don't have untracked files or deletions.
|
||||
git add [-i|-p|-A] <filenames/dirnames>
|
||||
@end example
|
||||
|
||||
Make sure you have told Git your name, email address and GPG key
|
||||
Make sure you have told Git your name and email address
|
||||
|
||||
@example
|
||||
git config --global user.name "My Name"
|
||||
git config --global user.email my@@email.invalid
|
||||
git config --global user.signingkey ABCDEF0123245
|
||||
@end example
|
||||
|
||||
Enable signing all commits or use -S
|
||||
|
||||
@example
|
||||
git config --global commit.gpgsign true
|
||||
@end example
|
||||
|
||||
Use @option{--global} to set the global configuration for all your Git checkouts.
|
||||
@@ -400,19 +393,6 @@ git checkout -b svn_23456 $SHA1
|
||||
where @var{$SHA1} is the commit hash from the @command{git log} output.
|
||||
|
||||
|
||||
@chapter gpg key generation
|
||||
|
||||
If you have no gpg key yet, we recommend that you create a ed25519 based key as it
|
||||
is small, fast and secure. Especially it results in small signatures in git.
|
||||
|
||||
@example
|
||||
gpg --default-new-key-algo "ed25519/cert,sign+cv25519/encr" --quick-generate-key "human@@server.com"
|
||||
@end example
|
||||
|
||||
When generating a key, make sure the email specified matches the email used in git as some sites like
|
||||
github consider mismatches a reason to declare such commits unverified. After generating a key you
|
||||
can add it to the MAINTAINER file and upload it to a keyserver.
|
||||
|
||||
@chapter Pre-push checklist
|
||||
|
||||
Once you have a set of commits that you feel are ready for pushing,
|
||||
|
||||
@@ -418,4 +418,4 @@ done:
|
||||
|
||||
When all of this is done, you can submit your patch to the ffmpeg-devel
|
||||
mailing-list for review. If you need any help, feel free to come on our IRC
|
||||
channel, #ffmpeg-devel on irc.libera.chat.
|
||||
channel, #ffmpeg-devel on irc.freenode.net.
|
||||
|
||||
@@ -90,7 +90,7 @@ COMPILE_MSA = $(call COMPILE,CC,MSAFLAGS)
|
||||
-$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@)
|
||||
|
||||
%.o: %.rc
|
||||
$(WINDRES) $(IFLAGS) $(foreach ARG,$(CC_DEPFLAGS),--preprocessor-arg "$(ARG)") -o $@ $<
|
||||
$(WINDRES) $(IFLAGS) --preprocessor "$(DEPWINDRES) -E -xc-header -DRC_INVOKED $(CC_DEPFLAGS)" -o $@ $<
|
||||
|
||||
%.i: %.c
|
||||
$(CC) $(CCFLAGS) $(CC_E) $<
|
||||
|
||||
@@ -1974,9 +1974,6 @@ static void flush_encoders(void)
|
||||
AVPacket *pkt = ost->pkt;
|
||||
int pkt_size;
|
||||
|
||||
if (!pkt)
|
||||
break;
|
||||
|
||||
switch (enc->codec_type) {
|
||||
case AVMEDIA_TYPE_AUDIO:
|
||||
desc = "audio";
|
||||
@@ -3466,7 +3463,12 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
|
||||
enc_ctx->bits_per_raw_sample = frame_bits_per_raw_sample;
|
||||
}
|
||||
|
||||
// Field order: autodetection
|
||||
if (ost->top_field_first == 0) {
|
||||
enc_ctx->field_order = AV_FIELD_BB;
|
||||
} else if (ost->top_field_first == 1) {
|
||||
enc_ctx->field_order = AV_FIELD_TT;
|
||||
}
|
||||
|
||||
if (frame) {
|
||||
if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) &&
|
||||
ost->top_field_first >= 0)
|
||||
@@ -3481,13 +3483,6 @@ static int init_output_stream_encode(OutputStream *ost, AVFrame *frame)
|
||||
enc_ctx->field_order = AV_FIELD_PROGRESSIVE;
|
||||
}
|
||||
|
||||
// Field order: override
|
||||
if (ost->top_field_first == 0) {
|
||||
enc_ctx->field_order = AV_FIELD_BB;
|
||||
} else if (ost->top_field_first == 1) {
|
||||
enc_ctx->field_order = AV_FIELD_TT;
|
||||
}
|
||||
|
||||
if (ost->forced_keyframes) {
|
||||
if (!strncmp(ost->forced_keyframes, "expr:", 5)) {
|
||||
ret = av_expr_parse(&ost->forced_keyframes_pexpr, ost->forced_keyframes+5,
|
||||
@@ -3955,7 +3950,7 @@ static OutputStream *choose_output(void)
|
||||
ost->st->index, ost->st->id, ost->initialized, ost->inputs_done, ost->finished);
|
||||
|
||||
if (!ost->initialized && !ost->inputs_done)
|
||||
return ost->unavailable ? NULL : ost;
|
||||
return ost;
|
||||
|
||||
if (!ost->finished && opts < opts_min) {
|
||||
opts_min = opts;
|
||||
|
||||
@@ -131,8 +131,8 @@ static int zero12v_decode_frame(AVCodecContext *avctx, void *data,
|
||||
u = x/2 + (uint16_t *)(pic->data[1] + line * pic->linesize[1]);
|
||||
v = x/2 + (uint16_t *)(pic->data[2] + line * pic->linesize[2]);
|
||||
memcpy(y, y_temp, sizeof(*y) * (width - x));
|
||||
memcpy(u, u_temp, sizeof(*u) * ((width - x + 1) / 2));
|
||||
memcpy(v, v_temp, sizeof(*v) * ((width - x + 1) / 2));
|
||||
memcpy(u, u_temp, sizeof(*u) * (width - x + 1) / 2);
|
||||
memcpy(v, v_temp, sizeof(*v) * (width - x + 1) / 2);
|
||||
}
|
||||
|
||||
line_end += stride;
|
||||
|
||||
@@ -70,9 +70,6 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
||||
unsigned char *planemap = c->planemap;
|
||||
int ret;
|
||||
|
||||
if (buf_size < planes * height *2)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
|
||||
return ret;
|
||||
|
||||
|
||||
@@ -132,6 +132,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \
|
||||
motion_est.o ratecontrol.o \
|
||||
mpegvideoencdsp.o
|
||||
OBJS-$(CONFIG_MSS34DSP) += mss34dsp.o
|
||||
OBJS-$(CONFIG_NVENC) += nvenc.o
|
||||
OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o
|
||||
OBJS-$(CONFIG_QPELDSP) += qpeldsp.o
|
||||
OBJS-$(CONFIG_QSV) += qsv.o
|
||||
@@ -374,9 +375,9 @@ OBJS-$(CONFIG_H264_CUVID_DECODER) += cuviddec.o
|
||||
OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o
|
||||
OBJS-$(CONFIG_H264_MF_ENCODER) += mfenc.o mf_utils.o
|
||||
OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o
|
||||
OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc.o nvenc_h264.o
|
||||
OBJS-$(CONFIG_NVENC_ENCODER) += nvenc.o nvenc_h264.o
|
||||
OBJS-$(CONFIG_NVENC_H264_ENCODER) += nvenc.o nvenc_h264.o
|
||||
OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o
|
||||
OBJS-$(CONFIG_NVENC_ENCODER) += nvenc_h264.o
|
||||
OBJS-$(CONFIG_NVENC_H264_ENCODER) += nvenc_h264.o
|
||||
OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o
|
||||
OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec.o
|
||||
OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
|
||||
@@ -396,8 +397,8 @@ OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o
|
||||
OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o
|
||||
OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o
|
||||
OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o
|
||||
OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc.o nvenc_hevc.o
|
||||
OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc.o nvenc_hevc.o
|
||||
OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o
|
||||
OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.o
|
||||
OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o
|
||||
OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \
|
||||
hevc_data.o
|
||||
@@ -874,7 +875,6 @@ OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o
|
||||
OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o
|
||||
OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_AMV_ENCODER) += adpcmenc.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_ALP_DECODER) += adpcm.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_ALP_ENCODER) += adpcmenc.o adpcm_data.o
|
||||
OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o
|
||||
|
||||
@@ -107,16 +107,13 @@ static void render_charset(AVCodecContext *avctx, uint8_t *charset,
|
||||
uint8_t pix;
|
||||
int lowdiff, highdiff;
|
||||
int *best_cb = c->mc_best_cb;
|
||||
uint8_t index1[256];
|
||||
uint8_t index2[256];
|
||||
uint8_t dither[256];
|
||||
static uint8_t index1[256];
|
||||
static uint8_t index2[256];
|
||||
static uint8_t dither[256];
|
||||
int i;
|
||||
int distance;
|
||||
|
||||
/* Generate lookup-tables for dither and index before looping.
|
||||
* This code relies on c->mc_luma_vals[c->mc_pal_size - 1] being
|
||||
* the maximum of all the mc_luma_vals values and on the minimum
|
||||
* being zero; this ensures that dither is properly initialized. */
|
||||
/* generate lookup-tables for dither and index before looping */
|
||||
i = 0;
|
||||
for (a=0; a < 256; a++) {
|
||||
if(i < c->mc_pal_size -1 && a == c->mc_luma_vals[i + 1]) {
|
||||
|
||||
@@ -843,25 +843,25 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe)
|
||||
sce0->ics.swb_sizes[g],
|
||||
sce0->sf_idx[w*16+g],
|
||||
sce0->band_type[w*16+g],
|
||||
lambda / (band0->threshold + FLT_MIN), INFINITY, &b1, NULL, 0);
|
||||
lambda / band0->threshold, INFINITY, &b1, NULL, 0);
|
||||
dist1 += quantize_band_cost(s, &sce1->coeffs[start + (w+w2)*128],
|
||||
R34,
|
||||
sce1->ics.swb_sizes[g],
|
||||
sce1->sf_idx[w*16+g],
|
||||
sce1->band_type[w*16+g],
|
||||
lambda / (band1->threshold + FLT_MIN), INFINITY, &b2, NULL, 0);
|
||||
lambda / band1->threshold, INFINITY, &b2, NULL, 0);
|
||||
dist2 += quantize_band_cost(s, M,
|
||||
M34,
|
||||
sce0->ics.swb_sizes[g],
|
||||
mididx,
|
||||
midcb,
|
||||
lambda / (minthr + FLT_MIN), INFINITY, &b3, NULL, 0);
|
||||
lambda / minthr, INFINITY, &b3, NULL, 0);
|
||||
dist2 += quantize_band_cost(s, S,
|
||||
S34,
|
||||
sce1->ics.swb_sizes[g],
|
||||
sididx,
|
||||
sidcb,
|
||||
mslambda / (minthr * bmax + FLT_MIN), INFINITY, &b4, NULL, 0);
|
||||
mslambda / (minthr * bmax), INFINITY, &b4, NULL, 0);
|
||||
B0 += b1+b2;
|
||||
B1 += b3+b4;
|
||||
dist1 -= b1+b2;
|
||||
|
||||
@@ -1076,18 +1076,14 @@ static int decode_audio_specific_config_gb(AACContext *ac,
|
||||
{
|
||||
int i, ret;
|
||||
GetBitContext gbc = *gb;
|
||||
MPEG4AudioConfig m4ac_bak = *m4ac;
|
||||
|
||||
if ((i = ff_mpeg4audio_get_config_gb(m4ac, &gbc, sync_extension, avctx)) < 0) {
|
||||
*m4ac = m4ac_bak;
|
||||
if ((i = ff_mpeg4audio_get_config_gb(m4ac, &gbc, sync_extension, avctx)) < 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
if (m4ac->sampling_index > 12) {
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
"invalid sampling rate index %d\n",
|
||||
m4ac->sampling_index);
|
||||
*m4ac = m4ac_bak;
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
if (m4ac->object_type == AOT_ER_AAC_LD &&
|
||||
@@ -1095,7 +1091,6 @@ static int decode_audio_specific_config_gb(AACContext *ac,
|
||||
av_log(avctx, AV_LOG_ERROR,
|
||||
"invalid low delay sampling rate index %d\n",
|
||||
m4ac->sampling_index);
|
||||
*m4ac = m4ac_bak;
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
* TODOs:
|
||||
* add sane pulse detection
|
||||
***********************************/
|
||||
#include <float.h>
|
||||
|
||||
#include "libavutil/libm.h"
|
||||
#include "libavutil/float_dsp.h"
|
||||
@@ -853,7 +852,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
|
||||
/* Not so fast though */
|
||||
ratio = sqrtf(ratio);
|
||||
}
|
||||
s->lambda = av_clipf(s->lambda * ratio, FLT_EPSILON, 65536.f);
|
||||
s->lambda = FFMIN(s->lambda * ratio, 65536.f);
|
||||
|
||||
/* Keep iterating if we must reduce and lambda is in the sky */
|
||||
if (ratio > 0.9f && ratio < 1.1f) {
|
||||
@@ -898,7 +897,7 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
|
||||
{
|
||||
AACEncContext *s = avctx->priv_data;
|
||||
|
||||
av_log(avctx, AV_LOG_INFO, "Qavg: %.3f\n", s->lambda_count ? s->lambda_sum / s->lambda_count : NAN);
|
||||
av_log(avctx, AV_LOG_INFO, "Qavg: %.3f\n", s->lambda_sum / s->lambda_count);
|
||||
|
||||
ff_mdct_end(&s->mdct1024);
|
||||
ff_mdct_end(&s->mdct128);
|
||||
|
||||
@@ -308,9 +308,6 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) {
|
||||
const int bandwidth = ctx->cutoff ? ctx->cutoff : AAC_CUTOFF(ctx->avctx);
|
||||
const float num_bark = calc_bark((float)bandwidth);
|
||||
|
||||
if (bandwidth <= 0)
|
||||
return AVERROR(EINVAL);
|
||||
|
||||
ctx->model_priv_data = av_mallocz(sizeof(AacPsyContext));
|
||||
if (!ctx->model_priv_data)
|
||||
return AVERROR(ENOMEM);
|
||||
@@ -797,7 +794,7 @@ static void psy_3gpp_analyze_channel(FFPsyContext *ctx, int channel,
|
||||
|
||||
if (pe < 1.15f * desired_pe) {
|
||||
/* 6.6.1.3.6 "Final threshold modification by linearization" */
|
||||
norm_fac = norm_fac ? 1.0f / norm_fac : 0;
|
||||
norm_fac = 1.0f / norm_fac;
|
||||
for (w = 0; w < wi->num_windows*16; w += 16) {
|
||||
for (g = 0; g < num_bands; g++) {
|
||||
AacPsyBand *band = &pch->band[w+g];
|
||||
|
||||
@@ -573,13 +573,14 @@ idct_16x16 10
|
||||
// void ff_hevc_idct_NxN_dc_DEPTH_neon(int16_t *coeffs)
|
||||
.macro idct_dc size, bitdepth
|
||||
function ff_hevc_idct_\size\()x\size\()_dc_\bitdepth\()_neon, export=1
|
||||
movi v1.8h, #((1 << (14 - \bitdepth))+1)
|
||||
ld1r {v4.8h}, [x0]
|
||||
srshr v4.8h, v4.8h, #1
|
||||
srshr v0.8h, v4.8h, #(14 - \bitdepth)
|
||||
srshr v1.8h, v4.8h, #(14 - \bitdepth)
|
||||
add v4.8h, v4.8h, v1.8h
|
||||
sshr v0.8h, v4.8h, #(15 - \bitdepth)
|
||||
sshr v1.8h, v4.8h, #(15 - \bitdepth)
|
||||
.if \size > 4
|
||||
srshr v2.8h, v4.8h, #(14 - \bitdepth)
|
||||
srshr v3.8h, v4.8h, #(14 - \bitdepth)
|
||||
sshr v2.8h, v4.8h, #(15 - \bitdepth)
|
||||
sshr v3.8h, v4.8h, #(15 - \bitdepth)
|
||||
.if \size > 16 /* dc 32x32 */
|
||||
mov x2, #4
|
||||
1:
|
||||
|
||||
@@ -104,26 +104,26 @@ static int aasc_decode_frame(AVCodecContext *avctx,
|
||||
ff_msrle_decode(avctx, s->frame, 8, &s->gb);
|
||||
break;
|
||||
case MKTAG('A', 'A', 'S', 'C'):
|
||||
switch (compr) {
|
||||
case 0:
|
||||
stride = (avctx->width * psize + psize) & ~psize;
|
||||
if (buf_size < stride * avctx->height)
|
||||
return AVERROR_INVALIDDATA;
|
||||
for (i = avctx->height - 1; i >= 0; i--) {
|
||||
memcpy(s->frame->data[0] + i * s->frame->linesize[0], buf, avctx->width * psize);
|
||||
buf += stride;
|
||||
buf_size -= stride;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
bytestream2_init(&s->gb, buf, buf_size);
|
||||
ff_msrle_decode(avctx, s->frame, 8, &s->gb);
|
||||
break;
|
||||
default:
|
||||
av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);
|
||||
switch (compr) {
|
||||
case 0:
|
||||
stride = (avctx->width * psize + psize) & ~psize;
|
||||
if (buf_size < stride * avctx->height)
|
||||
return AVERROR_INVALIDDATA;
|
||||
for (i = avctx->height - 1; i >= 0; i--) {
|
||||
memcpy(s->frame->data[0] + i * s->frame->linesize[0], buf, avctx->width * psize);
|
||||
buf += stride;
|
||||
buf_size -= stride;
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
bytestream2_init(&s->gb, buf, buf_size);
|
||||
ff_msrle_decode(avctx, s->frame, 8, &s->gb);
|
||||
break;
|
||||
default:
|
||||
av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
av_log(avctx, AV_LOG_ERROR, "Unknown FourCC: %X\n", avctx->codec_tag);
|
||||
return -1;
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
#ifndef AVCODEC_AC3_H
|
||||
#define AVCODEC_AC3_H
|
||||
|
||||
#define AC3_MAX_CODED_FRAME_SIZE 3840 /* in bytes */
|
||||
#define EAC3_MAX_CHANNELS 16 /**< maximum number of channels in EAC3 */
|
||||
#define AC3_MAX_CHANNELS 7 /**< maximum number of channels, including coupling channel */
|
||||
#define CPL_CH 0 /**< coupling channel index */
|
||||
@@ -74,7 +75,6 @@
|
||||
#define AC3_DYNAMIC_RANGE1 0
|
||||
|
||||
typedef int INTFLOAT;
|
||||
typedef unsigned int UINTFLOAT;
|
||||
typedef int16_t SHORTFLOAT;
|
||||
|
||||
#else /* USE_FIXED */
|
||||
@@ -94,7 +94,6 @@ typedef int16_t SHORTFLOAT;
|
||||
#define AC3_DYNAMIC_RANGE1 1.0f
|
||||
|
||||
typedef float INTFLOAT;
|
||||
typedef float UINTFLOAT;
|
||||
typedef float SHORTFLOAT;
|
||||
|
||||
#endif /* USE_FIXED */
|
||||
|
||||
@@ -1729,7 +1729,7 @@ static void ac3_output_frame(AC3EncodeContext *s, unsigned char *frame)
|
||||
{
|
||||
int blk;
|
||||
|
||||
init_put_bits(&s->pb, frame, s->frame_size);
|
||||
init_put_bits(&s->pb, frame, AC3_MAX_CODED_FRAME_SIZE);
|
||||
|
||||
s->output_frame_header(s);
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@ static const int8_t mtf_index_table[16] = {
|
||||
typedef struct ADPCMDecodeContext {
|
||||
ADPCMChannelStatus status[14];
|
||||
int vqa_version; /**< VQA version. Used for ADPCM_IMA_WS */
|
||||
int has_status; /**< Status flag. Reset to 0 after a flush. */
|
||||
int has_status;
|
||||
} ADPCMDecodeContext;
|
||||
|
||||
static av_cold int adpcm_decode_init(AVCodecContext * avctx)
|
||||
@@ -1811,6 +1811,11 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
|
||||
}
|
||||
break;
|
||||
case AV_CODEC_ID_ADPCM_AICA:
|
||||
if (!c->has_status) {
|
||||
for (channel = 0; channel < avctx->channels; channel++)
|
||||
c->status[channel].step = 0;
|
||||
c->has_status = 1;
|
||||
}
|
||||
for (channel = 0; channel < avctx->channels; channel++) {
|
||||
samples = samples_p[channel];
|
||||
for (n = nb_samples >> 1; n > 0; n--) {
|
||||
@@ -2072,6 +2077,13 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
|
||||
}
|
||||
break;
|
||||
case AV_CODEC_ID_ADPCM_ZORK:
|
||||
if (!c->has_status) {
|
||||
for (channel = 0; channel < avctx->channels; channel++) {
|
||||
c->status[channel].predictor = 0;
|
||||
c->status[channel].step_index = 0;
|
||||
}
|
||||
c->has_status = 1;
|
||||
}
|
||||
for (n = 0; n < nb_samples * avctx->channels; n++) {
|
||||
int v = bytestream2_get_byteu(&gb);
|
||||
*samples++ = adpcm_zork_expand_nibble(&c->status[n % avctx->channels], v);
|
||||
@@ -2109,37 +2121,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
|
||||
static void adpcm_flush(AVCodecContext *avctx)
|
||||
{
|
||||
ADPCMDecodeContext *c = avctx->priv_data;
|
||||
|
||||
switch(avctx->codec_id) {
|
||||
case AV_CODEC_ID_ADPCM_AICA:
|
||||
for (int channel = 0; channel < avctx->channels; channel++)
|
||||
c->status[channel].step = 0;
|
||||
break;
|
||||
|
||||
case AV_CODEC_ID_ADPCM_ARGO:
|
||||
for (int channel = 0; channel < avctx->channels; channel++) {
|
||||
c->status[channel].sample1 = 0;
|
||||
c->status[channel].sample2 = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case AV_CODEC_ID_ADPCM_IMA_ALP:
|
||||
case AV_CODEC_ID_ADPCM_IMA_CUNNING:
|
||||
case AV_CODEC_ID_ADPCM_IMA_SSI:
|
||||
case AV_CODEC_ID_ADPCM_ZORK:
|
||||
for (int channel = 0; channel < avctx->channels; channel++) {
|
||||
c->status[channel].predictor = 0;
|
||||
c->status[channel].step_index = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
/* Other codecs may want to handle this during decoding. */
|
||||
c->has_status = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
c->has_status = 1;
|
||||
c->has_status = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -959,14 +959,14 @@ static const AVOption options[] = {
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
static const AVClass adpcm_encoder_class = {
|
||||
.class_name = "ADPCM Encoder",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
};
|
||||
|
||||
#define ADPCM_ENCODER(id_, name_, sample_fmts_, capabilities_, long_name_) \
|
||||
static const AVClass name_ ## _encoder_class = { \
|
||||
.class_name = #name_, \
|
||||
.item_name = av_default_item_name, \
|
||||
.option = options, \
|
||||
.version = LIBAVUTIL_VERSION_INT, \
|
||||
}; \
|
||||
\
|
||||
AVCodec ff_ ## name_ ## _encoder = { \
|
||||
.name = #name_, \
|
||||
.long_name = NULL_IF_CONFIG_SMALL(long_name_), \
|
||||
@@ -979,7 +979,7 @@ AVCodec ff_ ## name_ ## _encoder = { \
|
||||
.sample_fmts = sample_fmts_, \
|
||||
.capabilities = capabilities_, \
|
||||
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_INIT_THREADSAFE, \
|
||||
.priv_class = &name_ ## _encoder_class, \
|
||||
.priv_class = &adpcm_encoder_class, \
|
||||
}
|
||||
|
||||
ADPCM_ENCODER(AV_CODEC_ID_ADPCM_ARGO, adpcm_argo, sample_fmts_p, 0, "ADPCM Argonaut Games");
|
||||
|
||||
@@ -29,12 +29,12 @@ static void decorrelate_stereo(int32_t *buffer[2], int nb_samples,
|
||||
int i;
|
||||
|
||||
for (i = 0; i < nb_samples; i++) {
|
||||
uint32_t a, b;
|
||||
int32_t a, b;
|
||||
|
||||
a = buffer[0][i];
|
||||
b = buffer[1][i];
|
||||
|
||||
a -= (int)(b * decorr_left_weight) >> decorr_shift;
|
||||
a -= (b * decorr_left_weight) >> decorr_shift;
|
||||
b += a;
|
||||
|
||||
buffer[0][i] = b;
|
||||
|
||||
@@ -1017,7 +1017,7 @@ static int read_block(ALSDecContext *ctx, ALSBlockData *bd)
|
||||
|
||||
*bd->shift_lsbs = 0;
|
||||
|
||||
if (get_bits_left(gb) < 7)
|
||||
if (get_bits_left(gb) < 1)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
// read block type flag and read the samples accordingly
|
||||
@@ -1632,7 +1632,7 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
|
||||
AVCodecContext *avctx = ctx->avctx;
|
||||
GetBitContext *gb = &ctx->gb;
|
||||
unsigned int div_blocks[32]; ///< block sizes.
|
||||
int c;
|
||||
unsigned int c;
|
||||
unsigned int js_blocks[2];
|
||||
uint32_t bs_info = 0;
|
||||
int ret;
|
||||
@@ -1810,17 +1810,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
|
||||
else
|
||||
ctx->cur_frame_length = sconf->frame_length;
|
||||
|
||||
ctx->highest_decoded_channel = -1;
|
||||
ctx->highest_decoded_channel = 0;
|
||||
// decode the frame data
|
||||
if ((invalid_frame = read_frame_data(ctx, ra_frame)) < 0)
|
||||
av_log(ctx->avctx, AV_LOG_WARNING,
|
||||
"Reading frame data failed. Skipping RA unit.\n");
|
||||
|
||||
if (ctx->highest_decoded_channel == -1) {
|
||||
av_log(ctx->avctx, AV_LOG_WARNING,
|
||||
"No channel data decoded.\n");
|
||||
if (ctx->highest_decoded_channel == 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
ctx->frame_id++;
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@ typedef struct APEFilter {
|
||||
int16_t *historybuffer; ///< filter memory
|
||||
int16_t *delay; ///< filtered values
|
||||
|
||||
uint32_t avg;
|
||||
int avg;
|
||||
} APEFilter;
|
||||
|
||||
typedef struct APERice {
|
||||
@@ -879,7 +879,7 @@ static av_always_inline int filter_fast_3320(APEPredictor *p,
|
||||
}
|
||||
|
||||
predictionA = p->buf[delayA] * 2U - p->buf[delayA - 1];
|
||||
p->lastA[filter] = decoded + (unsigned)((int32_t)(predictionA * p->coeffsA[filter][0]) >> 9);
|
||||
p->lastA[filter] = decoded + ((int32_t)(predictionA * p->coeffsA[filter][0]) >> 9);
|
||||
|
||||
if ((decoded ^ predictionA) > 0)
|
||||
p->coeffsA[filter][0]++;
|
||||
@@ -909,8 +909,8 @@ static av_always_inline int filter_3800(APEPredictor *p,
|
||||
return predictionA;
|
||||
}
|
||||
d2 = p->buf[delayA];
|
||||
d1 = (p->buf[delayA] - (unsigned)p->buf[delayA - 1]) * 2;
|
||||
d0 = p->buf[delayA] + ((p->buf[delayA - 2] - (unsigned)p->buf[delayA - 1]) * 8);
|
||||
d1 = (p->buf[delayA] - p->buf[delayA - 1]) * 2U;
|
||||
d0 = p->buf[delayA] + ((p->buf[delayA - 2] - p->buf[delayA - 1]) * 8U);
|
||||
d3 = p->buf[delayB] * 2U - p->buf[delayB - 1];
|
||||
d4 = p->buf[delayB];
|
||||
|
||||
@@ -930,7 +930,7 @@ static av_always_inline int filter_3800(APEPredictor *p,
|
||||
p->coeffsB[filter][0] += (((d3 >> 29) & 4) - 2) * sign;
|
||||
p->coeffsB[filter][1] -= (((d4 >> 30) & 2) - 1) * sign;
|
||||
|
||||
p->filterB[filter] = p->lastA[filter] + (unsigned)(predictionB >> shift);
|
||||
p->filterB[filter] = p->lastA[filter] + (predictionB >> shift);
|
||||
p->filterA[filter] = p->filterB[filter] + (unsigned)((int)(p->filterA[filter] * 31U) >> 5);
|
||||
|
||||
return p->filterA[filter];
|
||||
@@ -955,7 +955,7 @@ static void long_filter_high_3800(int32_t *buffer, int order, int shift, int len
|
||||
dotprod += delay[j] * (unsigned)coeffs[j];
|
||||
coeffs[j] += ((delay[j] >> 31) | 1) * sign;
|
||||
}
|
||||
buffer[i] -= (unsigned)(dotprod >> shift);
|
||||
buffer[i] -= dotprod >> shift;
|
||||
for (j = 0; j < order - 1; j++)
|
||||
delay[j] = delay[j + 1];
|
||||
delay[order - 1] = buffer[i];
|
||||
@@ -979,7 +979,7 @@ static void long_filter_ehigh_3830(int32_t *buffer, int length)
|
||||
for (j = 7; j > 0; j--)
|
||||
delay[j] = delay[j - 1];
|
||||
delay[0] = buffer[i];
|
||||
buffer[i] -= (unsigned)(dotprod >> 9);
|
||||
buffer[i] -= dotprod >> 9;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1088,13 +1088,13 @@ static av_always_inline int predictor_update_3930(APEPredictor *p,
|
||||
const int delayA)
|
||||
{
|
||||
int32_t predictionA, sign;
|
||||
uint32_t d0, d1, d2, d3;
|
||||
int32_t d0, d1, d2, d3;
|
||||
|
||||
p->buf[delayA] = p->lastA[filter];
|
||||
d0 = p->buf[delayA ];
|
||||
d1 = p->buf[delayA ] - (unsigned)p->buf[delayA - 1];
|
||||
d2 = p->buf[delayA - 1] - (unsigned)p->buf[delayA - 2];
|
||||
d3 = p->buf[delayA - 2] - (unsigned)p->buf[delayA - 3];
|
||||
d1 = p->buf[delayA ] - p->buf[delayA - 1];
|
||||
d2 = p->buf[delayA - 1] - p->buf[delayA - 2];
|
||||
d3 = p->buf[delayA - 2] - p->buf[delayA - 3];
|
||||
|
||||
predictionA = d0 * p->coeffsA[filter][0] +
|
||||
d1 * p->coeffsA[filter][1] +
|
||||
@@ -1105,10 +1105,10 @@ static av_always_inline int predictor_update_3930(APEPredictor *p,
|
||||
p->filterA[filter] = p->lastA[filter] + ((int)(p->filterA[filter] * 31U) >> 5);
|
||||
|
||||
sign = APESIGN(decoded);
|
||||
p->coeffsA[filter][0] += (((int32_t)d0 < 0) * 2 - 1) * sign;
|
||||
p->coeffsA[filter][1] += (((int32_t)d1 < 0) * 2 - 1) * sign;
|
||||
p->coeffsA[filter][2] += (((int32_t)d2 < 0) * 2 - 1) * sign;
|
||||
p->coeffsA[filter][3] += (((int32_t)d3 < 0) * 2 - 1) * sign;
|
||||
p->coeffsA[filter][0] += ((d0 < 0) * 2 - 1) * sign;
|
||||
p->coeffsA[filter][1] += ((d1 < 0) * 2 - 1) * sign;
|
||||
p->coeffsA[filter][2] += ((d2 < 0) * 2 - 1) * sign;
|
||||
p->coeffsA[filter][3] += ((d3 < 0) * 2 - 1) * sign;
|
||||
|
||||
return p->filterA[filter];
|
||||
}
|
||||
@@ -1337,7 +1337,7 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f,
|
||||
absres = FFABSU(res);
|
||||
if (absres)
|
||||
*f->adaptcoeffs = APESIGN(res) *
|
||||
(8 << ((absres > f->avg * 3LL) + (absres > (f->avg + f->avg / 3))));
|
||||
(8 << ((absres > f->avg * 3) + (absres > f->avg * 4 / 3)));
|
||||
/* equivalent to the following code
|
||||
if (absres <= f->avg * 4 / 3)
|
||||
*f->adaptcoeffs = APESIGN(res) * 8;
|
||||
@@ -1587,7 +1587,7 @@ static int ape_decode_frame(AVCodecContext *avctx, void *data,
|
||||
for (ch = 0; ch < s->channels; ch++) {
|
||||
sample8 = (uint8_t *)frame->data[ch];
|
||||
for (i = 0; i < blockstodecode; i++)
|
||||
*sample8++ = (s->decoded[ch][i] + 0x80U) & 0xff;
|
||||
*sample8++ = (s->decoded[ch][i] + 0x80) & 0xff;
|
||||
}
|
||||
break;
|
||||
case 16:
|
||||
|
||||
@@ -59,7 +59,7 @@ static int decode_pal8(AVCodecContext *avctx, uint32_t *pal)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
pal[start + i] = (0xFFU << 24) | bytestream2_get_be24u(gb);
|
||||
pal[start + i] = (0xFF << 24U) | bytestream2_get_be24u(gb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -608,9 +608,6 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
||||
uint32_t chunk;
|
||||
int ret;
|
||||
|
||||
if (avpkt->size < 4)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
bytestream2_init(gb, avpkt->data, avpkt->size);
|
||||
|
||||
if ((ret = ff_reget_buffer(avctx, frame, 0)) < 0)
|
||||
@@ -688,11 +685,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
if (avctx->width % 2 || avctx->height % 2) {
|
||||
avpriv_request_sample(s, "Odd dimensions\n");
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
s->frame = av_frame_alloc();
|
||||
if (!s->frame)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
@@ -38,49 +38,49 @@ function ff_sbc_analyze_4_neon, export=1
|
||||
/* TODO: merge even and odd cases (or even merge all four calls to this
|
||||
* function) in order to have only aligned reads from 'in' array
|
||||
* and reduce number of load instructions */
|
||||
vld1.16 {d16, d17}, [r0, :64]!
|
||||
vld1.16 {d20, d21}, [r2, :128]!
|
||||
vld1.16 {d4, d5}, [r0, :64]!
|
||||
vld1.16 {d8, d9}, [r2, :128]!
|
||||
|
||||
vmull.s16 q0, d16, d20
|
||||
vld1.16 {d18, d19}, [r0, :64]!
|
||||
vmull.s16 q1, d17, d21
|
||||
vld1.16 {d22, d23}, [r2, :128]!
|
||||
vmull.s16 q0, d4, d8
|
||||
vld1.16 {d6, d7}, [r0, :64]!
|
||||
vmull.s16 q1, d5, d9
|
||||
vld1.16 {d10, d11}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q0, d18, d22
|
||||
vld1.16 {d16, d17}, [r0, :64]!
|
||||
vmlal.s16 q1, d19, d23
|
||||
vld1.16 {d20, d21}, [r2, :128]!
|
||||
vmlal.s16 q0, d6, d10
|
||||
vld1.16 {d4, d5}, [r0, :64]!
|
||||
vmlal.s16 q1, d7, d11
|
||||
vld1.16 {d8, d9}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q0, d16, d20
|
||||
vld1.16 {d18, d19}, [r0, :64]!
|
||||
vmlal.s16 q1, d17, d21
|
||||
vld1.16 {d22, d23}, [r2, :128]!
|
||||
vmlal.s16 q0, d4, d8
|
||||
vld1.16 {d6, d7}, [r0, :64]!
|
||||
vmlal.s16 q1, d5, d9
|
||||
vld1.16 {d10, d11}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q0, d18, d22
|
||||
vld1.16 {d16, d17}, [r0, :64]!
|
||||
vmlal.s16 q1, d19, d23
|
||||
vld1.16 {d20, d21}, [r2, :128]!
|
||||
vmlal.s16 q0, d6, d10
|
||||
vld1.16 {d4, d5}, [r0, :64]!
|
||||
vmlal.s16 q1, d7, d11
|
||||
vld1.16 {d8, d9}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q0, d16, d20
|
||||
vmlal.s16 q1, d17, d21
|
||||
vmlal.s16 q0, d4, d8
|
||||
vmlal.s16 q1, d5, d9
|
||||
|
||||
vpadd.s32 d0, d0, d1
|
||||
vpadd.s32 d1, d2, d3
|
||||
|
||||
vrshrn.s32 d0, q0, SBC_PROTO_FIXED_SCALE
|
||||
|
||||
vld1.16 {d16, d17, d18, d19}, [r2, :128]!
|
||||
vld1.16 {d2, d3, d4, d5}, [r2, :128]!
|
||||
|
||||
vdup.i32 d1, d0[1] /* TODO: can be eliminated */
|
||||
vdup.i32 d0, d0[0] /* TODO: can be eliminated */
|
||||
|
||||
vmull.s16 q10, d16, d0
|
||||
vmull.s16 q11, d17, d0
|
||||
vmlal.s16 q10, d18, d1
|
||||
vmlal.s16 q11, d19, d1
|
||||
vmull.s16 q3, d2, d0
|
||||
vmull.s16 q4, d3, d0
|
||||
vmlal.s16 q3, d4, d1
|
||||
vmlal.s16 q4, d5, d1
|
||||
|
||||
vpadd.s32 d0, d20, d21 /* TODO: can be eliminated */
|
||||
vpadd.s32 d1, d22, d23 /* TODO: can be eliminated */
|
||||
vpadd.s32 d0, d6, d7 /* TODO: can be eliminated */
|
||||
vpadd.s32 d1, d8, d9 /* TODO: can be eliminated */
|
||||
|
||||
vst1.32 {d0, d1}, [r1, :128]
|
||||
|
||||
@@ -91,57 +91,57 @@ function ff_sbc_analyze_8_neon, export=1
|
||||
/* TODO: merge even and odd cases (or even merge all four calls to this
|
||||
* function) in order to have only aligned reads from 'in' array
|
||||
* and reduce number of load instructions */
|
||||
vld1.16 {d16, d17}, [r0, :64]!
|
||||
vld1.16 {d20, d21}, [r2, :128]!
|
||||
vld1.16 {d4, d5}, [r0, :64]!
|
||||
vld1.16 {d8, d9}, [r2, :128]!
|
||||
|
||||
vmull.s16 q12, d16, d20
|
||||
vld1.16 {d18, d19}, [r0, :64]!
|
||||
vmull.s16 q13, d17, d21
|
||||
vld1.16 {d22, d23}, [r2, :128]!
|
||||
vmull.s16 q14, d18, d22
|
||||
vld1.16 {d16, d17}, [r0, :64]!
|
||||
vmull.s16 q15, d19, d23
|
||||
vld1.16 {d20, d21}, [r2, :128]!
|
||||
vmull.s16 q6, d4, d8
|
||||
vld1.16 {d6, d7}, [r0, :64]!
|
||||
vmull.s16 q7, d5, d9
|
||||
vld1.16 {d10, d11}, [r2, :128]!
|
||||
vmull.s16 q8, d6, d10
|
||||
vld1.16 {d4, d5}, [r0, :64]!
|
||||
vmull.s16 q9, d7, d11
|
||||
vld1.16 {d8, d9}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q12, d16, d20
|
||||
vld1.16 {d18, d19}, [r0, :64]!
|
||||
vmlal.s16 q13, d17, d21
|
||||
vld1.16 {d22, d23}, [r2, :128]!
|
||||
vmlal.s16 q14, d18, d22
|
||||
vld1.16 {d16, d17}, [r0, :64]!
|
||||
vmlal.s16 q15, d19, d23
|
||||
vld1.16 {d20, d21}, [r2, :128]!
|
||||
vmlal.s16 q6, d4, d8
|
||||
vld1.16 {d6, d7}, [r0, :64]!
|
||||
vmlal.s16 q7, d5, d9
|
||||
vld1.16 {d10, d11}, [r2, :128]!
|
||||
vmlal.s16 q8, d6, d10
|
||||
vld1.16 {d4, d5}, [r0, :64]!
|
||||
vmlal.s16 q9, d7, d11
|
||||
vld1.16 {d8, d9}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q12, d16, d20
|
||||
vld1.16 {d18, d19}, [r0, :64]!
|
||||
vmlal.s16 q13, d17, d21
|
||||
vld1.16 {d22, d23}, [r2, :128]!
|
||||
vmlal.s16 q14, d18, d22
|
||||
vld1.16 {d16, d17}, [r0, :64]!
|
||||
vmlal.s16 q15, d19, d23
|
||||
vld1.16 {d20, d21}, [r2, :128]!
|
||||
vmlal.s16 q6, d4, d8
|
||||
vld1.16 {d6, d7}, [r0, :64]!
|
||||
vmlal.s16 q7, d5, d9
|
||||
vld1.16 {d10, d11}, [r2, :128]!
|
||||
vmlal.s16 q8, d6, d10
|
||||
vld1.16 {d4, d5}, [r0, :64]!
|
||||
vmlal.s16 q9, d7, d11
|
||||
vld1.16 {d8, d9}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q12, d16, d20
|
||||
vld1.16 {d18, d19}, [r0, :64]!
|
||||
vmlal.s16 q13, d17, d21
|
||||
vld1.16 {d22, d23}, [r2, :128]!
|
||||
vmlal.s16 q14, d18, d22
|
||||
vld1.16 {d16, d17}, [r0, :64]!
|
||||
vmlal.s16 q15, d19, d23
|
||||
vld1.16 {d20, d21}, [r2, :128]!
|
||||
vmlal.s16 q6, d4, d8
|
||||
vld1.16 {d6, d7}, [r0, :64]!
|
||||
vmlal.s16 q7, d5, d9
|
||||
vld1.16 {d10, d11}, [r2, :128]!
|
||||
vmlal.s16 q8, d6, d10
|
||||
vld1.16 {d4, d5}, [r0, :64]!
|
||||
vmlal.s16 q9, d7, d11
|
||||
vld1.16 {d8, d9}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q12, d16, d20
|
||||
vld1.16 {d18, d19}, [r0, :64]!
|
||||
vmlal.s16 q13, d17, d21
|
||||
vld1.16 {d22, d23}, [r2, :128]!
|
||||
vmlal.s16 q6, d4, d8
|
||||
vld1.16 {d6, d7}, [r0, :64]!
|
||||
vmlal.s16 q7, d5, d9
|
||||
vld1.16 {d10, d11}, [r2, :128]!
|
||||
|
||||
vmlal.s16 q14, d18, d22
|
||||
vmlal.s16 q15, d19, d23
|
||||
vmlal.s16 q8, d6, d10
|
||||
vmlal.s16 q9, d7, d11
|
||||
|
||||
vpadd.s32 d0, d24, d25
|
||||
vpadd.s32 d1, d26, d27
|
||||
vpadd.s32 d2, d28, d29
|
||||
vpadd.s32 d3, d30, d31
|
||||
vpadd.s32 d0, d12, d13
|
||||
vpadd.s32 d1, d14, d15
|
||||
vpadd.s32 d2, d16, d17
|
||||
vpadd.s32 d3, d18, d19
|
||||
|
||||
vrshr.s32 q0, q0, SBC_PROTO_FIXED_SCALE
|
||||
vrshr.s32 q1, q1, SBC_PROTO_FIXED_SCALE
|
||||
@@ -153,38 +153,38 @@ function ff_sbc_analyze_8_neon, export=1
|
||||
vdup.i32 d1, d0[1] /* TODO: can be eliminated */
|
||||
vdup.i32 d0, d0[0] /* TODO: can be eliminated */
|
||||
|
||||
vld1.16 {d16, d17}, [r2, :128]!
|
||||
vmull.s16 q12, d16, d0
|
||||
vld1.16 {d18, d19}, [r2, :128]!
|
||||
vmull.s16 q13, d17, d0
|
||||
vmull.s16 q14, d18, d0
|
||||
vmull.s16 q15, d19, d0
|
||||
vld1.16 {d4, d5}, [r2, :128]!
|
||||
vmull.s16 q6, d4, d0
|
||||
vld1.16 {d6, d7}, [r2, :128]!
|
||||
vmull.s16 q7, d5, d0
|
||||
vmull.s16 q8, d6, d0
|
||||
vmull.s16 q9, d7, d0
|
||||
|
||||
vld1.16 {d16, d17}, [r2, :128]!
|
||||
vmlal.s16 q12, d16, d1
|
||||
vld1.16 {d18, d19}, [r2, :128]!
|
||||
vmlal.s16 q13, d17, d1
|
||||
vmlal.s16 q14, d18, d1
|
||||
vmlal.s16 q15, d19, d1
|
||||
vld1.16 {d4, d5}, [r2, :128]!
|
||||
vmlal.s16 q6, d4, d1
|
||||
vld1.16 {d6, d7}, [r2, :128]!
|
||||
vmlal.s16 q7, d5, d1
|
||||
vmlal.s16 q8, d6, d1
|
||||
vmlal.s16 q9, d7, d1
|
||||
|
||||
vld1.16 {d16, d17}, [r2, :128]!
|
||||
vmlal.s16 q12, d16, d2
|
||||
vld1.16 {d18, d19}, [r2, :128]!
|
||||
vmlal.s16 q13, d17, d2
|
||||
vmlal.s16 q14, d18, d2
|
||||
vmlal.s16 q15, d19, d2
|
||||
vld1.16 {d4, d5}, [r2, :128]!
|
||||
vmlal.s16 q6, d4, d2
|
||||
vld1.16 {d6, d7}, [r2, :128]!
|
||||
vmlal.s16 q7, d5, d2
|
||||
vmlal.s16 q8, d6, d2
|
||||
vmlal.s16 q9, d7, d2
|
||||
|
||||
vld1.16 {d16, d17}, [r2, :128]!
|
||||
vmlal.s16 q12, d16, d3
|
||||
vld1.16 {d18, d19}, [r2, :128]!
|
||||
vmlal.s16 q13, d17, d3
|
||||
vmlal.s16 q14, d18, d3
|
||||
vmlal.s16 q15, d19, d3
|
||||
vld1.16 {d4, d5}, [r2, :128]!
|
||||
vmlal.s16 q6, d4, d3
|
||||
vld1.16 {d6, d7}, [r2, :128]!
|
||||
vmlal.s16 q7, d5, d3
|
||||
vmlal.s16 q8, d6, d3
|
||||
vmlal.s16 q9, d7, d3
|
||||
|
||||
vpadd.s32 d0, d24, d25 /* TODO: can be eliminated */
|
||||
vpadd.s32 d1, d26, d27 /* TODO: can be eliminated */
|
||||
vpadd.s32 d2, d28, d29 /* TODO: can be eliminated */
|
||||
vpadd.s32 d3, d30, d31 /* TODO: can be eliminated */
|
||||
vpadd.s32 d0, d12, d13 /* TODO: can be eliminated */
|
||||
vpadd.s32 d1, d14, d15 /* TODO: can be eliminated */
|
||||
vpadd.s32 d2, d16, d17 /* TODO: can be eliminated */
|
||||
vpadd.s32 d3, d18, d19 /* TODO: can be eliminated */
|
||||
|
||||
vst1.32 {d0, d1, d2, d3}, [r1, :128]
|
||||
|
||||
|
||||
@@ -376,7 +376,7 @@ ASSSplitContext *ff_ass_split(const char *buf)
|
||||
ASSSplitContext *ctx = av_mallocz(sizeof(*ctx));
|
||||
if (!ctx)
|
||||
return NULL;
|
||||
if (buf && !strncmp(buf, "\xef\xbb\xbf", 3)) // Skip UTF-8 BOM header
|
||||
if (buf && !memcmp(buf, "\xef\xbb\xbf", 3)) // Skip UTF-8 BOM header
|
||||
buf += 3;
|
||||
ctx->current_section = -1;
|
||||
if (ass_split(ctx, buf) < 0) {
|
||||
|
||||
@@ -114,13 +114,6 @@ enum {
|
||||
AV1_WARP_MODEL_TRANSLATION = 1,
|
||||
AV1_WARP_MODEL_ROTZOOM = 2,
|
||||
AV1_WARP_MODEL_AFFINE = 3,
|
||||
AV1_WARP_PARAM_REDUCE_BITS = 6,
|
||||
|
||||
AV1_DIV_LUT_BITS = 8,
|
||||
AV1_DIV_LUT_PREC_BITS = 14,
|
||||
AV1_DIV_LUT_NUM = 257,
|
||||
|
||||
AV1_MAX_LOOP_FILTER = 63,
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@ typedef struct AV1MetadataContext {
|
||||
CBSBSFContext common;
|
||||
|
||||
int td;
|
||||
AV1RawOBU td_obu;
|
||||
|
||||
int color_primaries;
|
||||
int transfer_characteristics;
|
||||
@@ -108,11 +107,12 @@ static int av1_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt,
|
||||
CodedBitstreamFragment *frag)
|
||||
{
|
||||
AV1MetadataContext *ctx = bsf->priv_data;
|
||||
AV1RawOBU td, *obu;
|
||||
int err, i;
|
||||
|
||||
for (i = 0; i < frag->nb_units; i++) {
|
||||
if (frag->units[i].type == AV1_OBU_SEQUENCE_HEADER) {
|
||||
AV1RawOBU *obu = frag->units[i].content;
|
||||
obu = frag->units[i].content;
|
||||
err = av1_metadata_update_sequence_header(bsf, &obu->obu.sequence_header);
|
||||
if (err < 0)
|
||||
return err;
|
||||
@@ -120,12 +120,16 @@ static int av1_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt,
|
||||
}
|
||||
|
||||
// If a Temporal Delimiter is present, it must be the first OBU.
|
||||
if (frag->nb_units && frag->units[0].type == AV1_OBU_TEMPORAL_DELIMITER) {
|
||||
if (frag->units[0].type == AV1_OBU_TEMPORAL_DELIMITER) {
|
||||
if (ctx->td == BSF_ELEMENT_REMOVE)
|
||||
ff_cbs_delete_unit(frag, 0);
|
||||
} else if (pkt && ctx->td == BSF_ELEMENT_INSERT) {
|
||||
td = (AV1RawOBU) {
|
||||
.header.obu_type = AV1_OBU_TEMPORAL_DELIMITER,
|
||||
};
|
||||
|
||||
err = ff_cbs_insert_unit_content(frag, 0, AV1_OBU_TEMPORAL_DELIMITER,
|
||||
&ctx->td_obu, NULL);
|
||||
&td, NULL);
|
||||
if (err < 0) {
|
||||
av_log(bsf, AV_LOG_ERROR, "Failed to insert Temporal Delimiter.\n");
|
||||
return err;
|
||||
@@ -151,12 +155,6 @@ static const CBSBSFType av1_metadata_type = {
|
||||
|
||||
static int av1_metadata_init(AVBSFContext *bsf)
|
||||
{
|
||||
AV1MetadataContext *ctx = bsf->priv_data;
|
||||
|
||||
ctx->td_obu = (AV1RawOBU) {
|
||||
.header.obu_type = AV1_OBU_TEMPORAL_DELIMITER,
|
||||
};
|
||||
|
||||
return ff_cbs_bsf_generic_init(bsf, &av1_metadata_type);
|
||||
}
|
||||
|
||||
|
||||
@@ -28,34 +28,6 @@
|
||||
#include "internal.h"
|
||||
#include "profiles.h"
|
||||
|
||||
/**< same with Div_Lut defined in spec 7.11.3.7 */
|
||||
static const uint16_t div_lut[AV1_DIV_LUT_NUM] = {
|
||||
16384, 16320, 16257, 16194, 16132, 16070, 16009, 15948, 15888, 15828, 15768,
|
||||
15709, 15650, 15592, 15534, 15477, 15420, 15364, 15308, 15252, 15197, 15142,
|
||||
15087, 15033, 14980, 14926, 14873, 14821, 14769, 14717, 14665, 14614, 14564,
|
||||
14513, 14463, 14413, 14364, 14315, 14266, 14218, 14170, 14122, 14075, 14028,
|
||||
13981, 13935, 13888, 13843, 13797, 13752, 13707, 13662, 13618, 13574, 13530,
|
||||
13487, 13443, 13400, 13358, 13315, 13273, 13231, 13190, 13148, 13107, 13066,
|
||||
13026, 12985, 12945, 12906, 12866, 12827, 12788, 12749, 12710, 12672, 12633,
|
||||
12596, 12558, 12520, 12483, 12446, 12409, 12373, 12336, 12300, 12264, 12228,
|
||||
12193, 12157, 12122, 12087, 12053, 12018, 11984, 11950, 11916, 11882, 11848,
|
||||
11815, 11782, 11749, 11716, 11683, 11651, 11619, 11586, 11555, 11523, 11491,
|
||||
11460, 11429, 11398, 11367, 11336, 11305, 11275, 11245, 11215, 11185, 11155,
|
||||
11125, 11096, 11067, 11038, 11009, 10980, 10951, 10923, 10894, 10866, 10838,
|
||||
10810, 10782, 10755, 10727, 10700, 10673, 10645, 10618, 10592, 10565, 10538,
|
||||
10512, 10486, 10460, 10434, 10408, 10382, 10356, 10331, 10305, 10280, 10255,
|
||||
10230, 10205, 10180, 10156, 10131, 10107, 10082, 10058, 10034, 10010, 9986,
|
||||
9963, 9939, 9916, 9892, 9869, 9846, 9823, 9800, 9777, 9754, 9732,
|
||||
9709, 9687, 9664, 9642, 9620, 9598, 9576, 9554, 9533, 9511, 9489,
|
||||
9468, 9447, 9425, 9404, 9383, 9362, 9341, 9321, 9300, 9279, 9259,
|
||||
9239, 9218, 9198, 9178, 9158, 9138, 9118, 9098, 9079, 9059, 9039,
|
||||
9020, 9001, 8981, 8962, 8943, 8924, 8905, 8886, 8867, 8849, 8830,
|
||||
8812, 8793, 8775, 8756, 8738, 8720, 8702, 8684, 8666, 8648, 8630,
|
||||
8613, 8595, 8577, 8560, 8542, 8525, 8508, 8490, 8473, 8456, 8439,
|
||||
8422, 8405, 8389, 8372, 8355, 8339, 8322, 8306, 8289, 8273, 8257,
|
||||
8240, 8224, 8208, 8192
|
||||
};
|
||||
|
||||
static uint32_t inverse_recenter(int r, uint32_t v)
|
||||
{
|
||||
if (v > 2 * r)
|
||||
@@ -125,70 +97,6 @@ static void read_global_param(AV1DecContext *s, int type, int ref, int idx)
|
||||
-mx, mx + 1, r) << prec_diff) + round;
|
||||
}
|
||||
|
||||
static uint64_t round_two(uint64_t x, uint16_t n)
|
||||
{
|
||||
if (n == 0)
|
||||
return x;
|
||||
return ((x + ((uint64_t)1 << (n - 1))) >> n);
|
||||
}
|
||||
|
||||
static int64_t round_two_signed(int64_t x, uint16_t n)
|
||||
{
|
||||
return ((x<0) ? -((int64_t)round_two(-x, n)) : (int64_t)round_two(x, n));
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve divisor process.
|
||||
* see spec 7.11.3.7
|
||||
*/
|
||||
static int16_t resolve_divisor(uint32_t d, uint16_t *shift)
|
||||
{
|
||||
int32_t e, f;
|
||||
|
||||
*shift = av_log2(d);
|
||||
e = d - (1 << (*shift));
|
||||
if (*shift > AV1_DIV_LUT_BITS)
|
||||
f = round_two(e, *shift - AV1_DIV_LUT_BITS);
|
||||
else
|
||||
f = e << (AV1_DIV_LUT_BITS - (*shift));
|
||||
|
||||
*shift += AV1_DIV_LUT_PREC_BITS;
|
||||
|
||||
return div_lut[f];
|
||||
}
|
||||
|
||||
/**
|
||||
* check if global motion params is valid.
|
||||
* see spec 7.11.3.6
|
||||
*/
|
||||
static uint8_t get_shear_params_valid(AV1DecContext *s, int idx)
|
||||
{
|
||||
int16_t alpha, beta, gamma, delta, divf, divs;
|
||||
int64_t v, w;
|
||||
int32_t *param = &s->cur_frame.gm_params[idx][0];
|
||||
if (param[2] < 0)
|
||||
return 0;
|
||||
|
||||
alpha = av_clip_int16(param[2] - (1 << AV1_WARPEDMODEL_PREC_BITS));
|
||||
beta = av_clip_int16(param[3]);
|
||||
divf = resolve_divisor(abs(param[2]), &divs);
|
||||
v = (int64_t)param[4] * (1 << AV1_WARPEDMODEL_PREC_BITS);
|
||||
w = (int64_t)param[3] * param[4];
|
||||
gamma = av_clip_int16((int)round_two_signed((v * divf), divs));
|
||||
delta = av_clip_int16(param[5] - (int)round_two_signed((w * divf), divs) - (1 << AV1_WARPEDMODEL_PREC_BITS));
|
||||
|
||||
alpha = round_two_signed(alpha, AV1_WARP_PARAM_REDUCE_BITS) << AV1_WARP_PARAM_REDUCE_BITS;
|
||||
beta = round_two_signed(beta, AV1_WARP_PARAM_REDUCE_BITS) << AV1_WARP_PARAM_REDUCE_BITS;
|
||||
gamma = round_two_signed(gamma, AV1_WARP_PARAM_REDUCE_BITS) << AV1_WARP_PARAM_REDUCE_BITS;
|
||||
delta = round_two_signed(delta, AV1_WARP_PARAM_REDUCE_BITS) << AV1_WARP_PARAM_REDUCE_BITS;
|
||||
|
||||
if ((4 * abs(alpha) + 7 * abs(beta)) >= (1 << AV1_WARPEDMODEL_PREC_BITS) ||
|
||||
(4 * abs(gamma) + 4 * abs(delta)) >= (1 << AV1_WARPEDMODEL_PREC_BITS))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* update gm type/params, since cbs already implemented part of this funcation,
|
||||
* so we don't need to full implement spec.
|
||||
@@ -236,9 +144,6 @@ static void global_motion_params(AV1DecContext *s)
|
||||
read_global_param(s, type, ref, 0);
|
||||
read_global_param(s, type, ref, 1);
|
||||
}
|
||||
if (type <= AV1_WARP_MODEL_AFFINE) {
|
||||
s->cur_frame.gm_invalid[ref] = !get_shear_params_valid(s, ref);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -604,9 +509,6 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s
|
||||
|
||||
dst->spatial_id = src->spatial_id;
|
||||
dst->temporal_id = src->temporal_id;
|
||||
memcpy(dst->gm_invalid,
|
||||
src->gm_invalid,
|
||||
AV1_NUM_REF_FRAMES * sizeof(uint8_t));
|
||||
memcpy(dst->gm_type,
|
||||
src->gm_type,
|
||||
AV1_NUM_REF_FRAMES * sizeof(uint8_t));
|
||||
|
||||
@@ -42,7 +42,6 @@ typedef struct AV1Frame {
|
||||
int temporal_id;
|
||||
int spatial_id;
|
||||
|
||||
uint8_t gm_invalid[AV1_NUM_REF_FRAMES];
|
||||
uint8_t gm_type[AV1_NUM_REF_FRAMES];
|
||||
int32_t gm_params[AV1_NUM_REF_FRAMES][6];
|
||||
|
||||
|
||||
@@ -318,13 +318,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
|
||||
avctx->time_base.den = avctx->sample_rate;
|
||||
}
|
||||
|
||||
if (av_codec_is_encoder(avctx->codec))
|
||||
ret = ff_encode_preinit(avctx);
|
||||
else
|
||||
ret = ff_decode_preinit(avctx);
|
||||
if (ret < 0)
|
||||
goto free_and_end;
|
||||
|
||||
if (!HAVE_THREADS)
|
||||
av_log(avctx, AV_LOG_WARNING, "Warning: not compiled with thread support, using thread emulation\n");
|
||||
|
||||
@@ -346,6 +339,13 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
|
||||
if (!HAVE_THREADS && !(codec->caps_internal & FF_CODEC_CAP_AUTO_THREADS))
|
||||
avctx->thread_count = 1;
|
||||
|
||||
if (av_codec_is_encoder(avctx->codec))
|
||||
ret = ff_encode_preinit(avctx);
|
||||
else
|
||||
ret = ff_decode_preinit(avctx);
|
||||
if (ret < 0)
|
||||
goto free_and_end;
|
||||
|
||||
if ( avctx->codec->init && (!(avctx->active_thread_type&FF_THREAD_FRAME)
|
||||
|| avci->frame_thread_encoder)) {
|
||||
ret = avctx->codec->init(avctx);
|
||||
@@ -644,11 +644,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const char *unknown_if_null(const char *str)
|
||||
{
|
||||
return str ? str : "unknown";
|
||||
}
|
||||
|
||||
void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||
{
|
||||
const char *codec_type;
|
||||
@@ -658,7 +653,6 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||
int new_line = 0;
|
||||
AVRational display_aspect_ratio;
|
||||
const char *separator = enc->dump_separator ? (const char *)enc->dump_separator : ", ";
|
||||
const char *str;
|
||||
|
||||
if (!buf || buf_size <= 0)
|
||||
return;
|
||||
@@ -694,27 +688,28 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||
av_strlcat(buf, separator, buf_size);
|
||||
|
||||
snprintf(buf + strlen(buf), buf_size - strlen(buf),
|
||||
"%s", enc->pix_fmt == AV_PIX_FMT_NONE ? "none" :
|
||||
unknown_if_null(av_get_pix_fmt_name(enc->pix_fmt)));
|
||||
"%s", enc->pix_fmt == AV_PIX_FMT_NONE ? "none" :
|
||||
av_get_pix_fmt_name(enc->pix_fmt));
|
||||
if (enc->bits_per_raw_sample && enc->pix_fmt != AV_PIX_FMT_NONE &&
|
||||
enc->bits_per_raw_sample < av_pix_fmt_desc_get(enc->pix_fmt)->comp[0].depth)
|
||||
av_strlcatf(detail, sizeof(detail), "%d bpc, ", enc->bits_per_raw_sample);
|
||||
if (enc->color_range != AVCOL_RANGE_UNSPECIFIED &&
|
||||
(str = av_color_range_name(enc->color_range)))
|
||||
av_strlcatf(detail, sizeof(detail), "%s, ", str);
|
||||
if (enc->color_range != AVCOL_RANGE_UNSPECIFIED)
|
||||
av_strlcatf(detail, sizeof(detail), "%s, ",
|
||||
av_color_range_name(enc->color_range));
|
||||
|
||||
if (enc->colorspace != AVCOL_SPC_UNSPECIFIED ||
|
||||
enc->color_primaries != AVCOL_PRI_UNSPECIFIED ||
|
||||
enc->color_trc != AVCOL_TRC_UNSPECIFIED) {
|
||||
const char *col = unknown_if_null(av_color_space_name(enc->colorspace));
|
||||
const char *pri = unknown_if_null(av_color_primaries_name(enc->color_primaries));
|
||||
const char *trc = unknown_if_null(av_color_transfer_name(enc->color_trc));
|
||||
if (strcmp(col, pri) || strcmp(col, trc)) {
|
||||
if (enc->colorspace != (int)enc->color_primaries ||
|
||||
enc->colorspace != (int)enc->color_trc) {
|
||||
new_line = 1;
|
||||
av_strlcatf(detail, sizeof(detail), "%s/%s/%s, ",
|
||||
col, pri, trc);
|
||||
av_color_space_name(enc->colorspace),
|
||||
av_color_primaries_name(enc->color_primaries),
|
||||
av_color_transfer_name(enc->color_trc));
|
||||
} else
|
||||
av_strlcatf(detail, sizeof(detail), "%s, ", col);
|
||||
av_strlcatf(detail, sizeof(detail), "%s, ",
|
||||
av_get_colorspace_name(enc->colorspace));
|
||||
}
|
||||
|
||||
if (enc->field_order != AV_FIELD_UNKNOWN) {
|
||||
@@ -732,9 +727,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||
}
|
||||
|
||||
if (av_log_get_level() >= AV_LOG_VERBOSE &&
|
||||
enc->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED &&
|
||||
(str = av_chroma_location_name(enc->chroma_sample_location)))
|
||||
av_strlcatf(detail, sizeof(detail), "%s, ", str);
|
||||
enc->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED)
|
||||
av_strlcatf(detail, sizeof(detail), "%s, ",
|
||||
av_chroma_location_name(enc->chroma_sample_location));
|
||||
|
||||
if (strlen(detail) > 1) {
|
||||
detail[strlen(detail) - 2] = 0;
|
||||
@@ -792,10 +787,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
|
||||
"%d Hz, ", enc->sample_rate);
|
||||
}
|
||||
av_get_channel_layout_string(buf + strlen(buf), buf_size - strlen(buf), enc->channels, enc->channel_layout);
|
||||
if (enc->sample_fmt != AV_SAMPLE_FMT_NONE &&
|
||||
(str = av_get_sample_fmt_name(enc->sample_fmt))) {
|
||||
if (enc->sample_fmt != AV_SAMPLE_FMT_NONE) {
|
||||
snprintf(buf + strlen(buf), buf_size - strlen(buf),
|
||||
", %s", str);
|
||||
", %s", av_get_sample_fmt_name(enc->sample_fmt));
|
||||
}
|
||||
if ( enc->bits_per_raw_sample > 0
|
||||
&& enc->bits_per_raw_sample != av_get_bytes_per_sample(enc->sample_fmt) * 8)
|
||||
|
||||
@@ -869,7 +869,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
|
||||
|
||||
binkb_init_bundles(c);
|
||||
ref_start = frame->data[plane_idx];
|
||||
ref_end = frame->data[plane_idx] + ((bh - 1) * frame->linesize[plane_idx] + bw - 1) * 8;
|
||||
ref_end = frame->data[plane_idx] + (bh * frame->linesize[plane_idx] + bw) * 8;
|
||||
|
||||
for (i = 0; i < 64; i++)
|
||||
coordmap[i] = (i & 7) + (i >> 3) * stride;
|
||||
@@ -925,7 +925,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
|
||||
xoff = binkb_get_value(c, BINKB_SRC_X_OFF);
|
||||
yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias;
|
||||
ref = dst + xoff + yoff * stride;
|
||||
if (ref < ref_start || ref > ref_end) {
|
||||
if (ref < ref_start || ref + 8*stride > ref_end) {
|
||||
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
|
||||
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
|
||||
c->put_pixels_tab(dst, ref, stride, 8);
|
||||
@@ -941,7 +941,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
|
||||
xoff = binkb_get_value(c, BINKB_SRC_X_OFF);
|
||||
yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias;
|
||||
ref = dst + xoff + yoff * stride;
|
||||
if (ref < ref_start || ref > ref_end) {
|
||||
if (ref < ref_start || ref + 8 * stride > ref_end) {
|
||||
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
|
||||
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
|
||||
c->put_pixels_tab(dst, ref, stride, 8);
|
||||
@@ -973,7 +973,7 @@ static int binkb_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
|
||||
xoff = binkb_get_value(c, BINKB_SRC_X_OFF);
|
||||
yoff = binkb_get_value(c, BINKB_SRC_Y_OFF) + ybias;
|
||||
ref = dst + xoff + yoff * stride;
|
||||
if (ref < ref_start || ref > ref_end) {
|
||||
if (ref < ref_start || ref + 8 * stride > ref_end) {
|
||||
av_log(c->avctx, AV_LOG_WARNING, "Reference block is out of bounds\n");
|
||||
} else if (ref + 8*stride < dst || ref >= dst + 8*stride) {
|
||||
c->put_pixels_tab(dst, ref, stride, 8);
|
||||
@@ -1086,7 +1086,7 @@ static int bink_decode_plane(BinkContext *c, AVFrame *frame, GetBitContext *gb,
|
||||
for (bx = 0; bx < bw; bx++, dst += 8, prev += 8) {
|
||||
blk = get_value(c, BINK_SRC_BLOCK_TYPES);
|
||||
// 16x16 block type on odd line means part of the already decoded block, so skip it
|
||||
if (((by & 1) || (bx & 1)) && blk == SCALED_BLOCK) {
|
||||
if ((by & 1) && blk == SCALED_BLOCK) {
|
||||
bx++;
|
||||
dst += 8;
|
||||
prev += 8;
|
||||
|
||||
@@ -70,7 +70,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
||||
BinkAudioContext *s = avctx->priv_data;
|
||||
int sample_rate = avctx->sample_rate;
|
||||
int sample_rate_half;
|
||||
int i, ret;
|
||||
int i;
|
||||
int frame_len_bits;
|
||||
|
||||
/* determine frame length */
|
||||
@@ -132,13 +132,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
|
||||
s->first = 1;
|
||||
|
||||
if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT)
|
||||
ret = ff_rdft_init(&s->trans.rdft, frame_len_bits, DFT_C2R);
|
||||
ff_rdft_init(&s->trans.rdft, frame_len_bits, DFT_C2R);
|
||||
else if (CONFIG_BINKAUDIO_DCT_DECODER)
|
||||
ret = ff_dct_init(&s->trans.dct, frame_len_bits, DCT_III);
|
||||
ff_dct_init(&s->trans.dct, frame_len_bits, DCT_III);
|
||||
else
|
||||
av_assert0(0);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
s->pkt = av_packet_alloc();
|
||||
if (!s->pkt)
|
||||
@@ -347,7 +345,6 @@ AVCodec ff_binkaudio_rdft_decoder = {
|
||||
.close = decode_end,
|
||||
.receive_frame = binkaudio_receive_frame,
|
||||
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
|
||||
};
|
||||
|
||||
AVCodec ff_binkaudio_dct_decoder = {
|
||||
@@ -360,5 +357,4 @@ AVCodec ff_binkaudio_dct_decoder = {
|
||||
.close = decode_end,
|
||||
.receive_frame = binkaudio_receive_frame,
|
||||
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
|
||||
};
|
||||
|
||||
@@ -45,15 +45,14 @@ void av_bsf_free(AVBSFContext **pctx)
|
||||
return;
|
||||
ctx = *pctx;
|
||||
|
||||
if (ctx->internal) {
|
||||
if (ctx->filter->close)
|
||||
ctx->filter->close(ctx);
|
||||
av_packet_free(&ctx->internal->buffer_pkt);
|
||||
av_freep(&ctx->internal);
|
||||
}
|
||||
if (ctx->filter->close)
|
||||
ctx->filter->close(ctx);
|
||||
if (ctx->filter->priv_class && ctx->priv_data)
|
||||
av_opt_free(ctx->priv_data);
|
||||
|
||||
if (ctx->internal)
|
||||
av_packet_free(&ctx->internal->buffer_pkt);
|
||||
av_freep(&ctx->internal);
|
||||
av_freep(&ctx->priv_data);
|
||||
|
||||
avcodec_parameters_free(&ctx->par_in);
|
||||
@@ -111,20 +110,7 @@ int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx)
|
||||
ret = AVERROR(ENOMEM);
|
||||
goto fail;
|
||||
}
|
||||
/* allocate priv data and init private options */
|
||||
if (filter->priv_data_size) {
|
||||
ctx->priv_data = av_mallocz(filter->priv_data_size);
|
||||
if (!ctx->priv_data) {
|
||||
ret = AVERROR(ENOMEM);
|
||||
goto fail;
|
||||
}
|
||||
if (filter->priv_class) {
|
||||
*(const AVClass **)ctx->priv_data = filter->priv_class;
|
||||
av_opt_set_defaults(ctx->priv_data);
|
||||
}
|
||||
}
|
||||
/* Allocate AVBSFInternal; must happen after priv_data has been allocated
|
||||
* so that a filter->close needing priv_data is never called without. */
|
||||
|
||||
bsfi = av_mallocz(sizeof(*bsfi));
|
||||
if (!bsfi) {
|
||||
ret = AVERROR(ENOMEM);
|
||||
@@ -138,6 +124,19 @@ int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
/* allocate priv data and init private options */
|
||||
if (filter->priv_data_size) {
|
||||
ctx->priv_data = av_mallocz(filter->priv_data_size);
|
||||
if (!ctx->priv_data) {
|
||||
ret = AVERROR(ENOMEM);
|
||||
goto fail;
|
||||
}
|
||||
if (filter->priv_class) {
|
||||
*(const AVClass **)ctx->priv_data = filter->priv_class;
|
||||
av_opt_set_defaults(ctx->priv_data);
|
||||
}
|
||||
}
|
||||
|
||||
*pctx = ctx;
|
||||
return 0;
|
||||
fail:
|
||||
|
||||
@@ -355,7 +355,7 @@ static int FUNC(set_frame_refs)(CodedBitstreamContext *ctx, RWContext *rw,
|
||||
AV1_REF_FRAME_ALTREF2, AV1_REF_FRAME_ALTREF
|
||||
};
|
||||
int8_t ref_frame_idx[AV1_REFS_PER_FRAME], used_frame[AV1_NUM_REF_FRAMES];
|
||||
int16_t shifted_order_hints[AV1_NUM_REF_FRAMES];
|
||||
int8_t shifted_order_hints[AV1_NUM_REF_FRAMES];
|
||||
int cur_frame_hint, latest_order_hint, earliest_order_hint, ref;
|
||||
int i, j;
|
||||
|
||||
|
||||
@@ -728,7 +728,7 @@ static int FUNC(sps_scc_extension)(CodedBitstreamContext *ctx, RWContext *rw,
|
||||
|
||||
flag(sps_palette_predictor_initializer_present_flag);
|
||||
if (current->sps_palette_predictor_initializer_present_flag) {
|
||||
ue(sps_num_palette_predictor_initializer_minus1, 0, 127);
|
||||
ue(sps_num_palette_predictor_initializer_minus1, 0, 128);
|
||||
for (comp = 0; comp < (current->chroma_format_idc ? 3 : 1); comp++) {
|
||||
int bit_depth = comp == 0 ? current->bit_depth_luma_minus8 + 8
|
||||
: current->bit_depth_chroma_minus8 + 8;
|
||||
|
||||
@@ -239,7 +239,7 @@ static void cdg_scroll(CDGraphicsContext *cc, uint8_t *data,
|
||||
for (y = FFMAX(0, vinc); y < FFMIN(CDG_FULL_HEIGHT + vinc, CDG_FULL_HEIGHT); y++)
|
||||
memcpy(out + FFMAX(0, hinc) + stride * y,
|
||||
in + FFMAX(0, hinc) - hinc + (y - vinc) * stride,
|
||||
FFABS(stride) - FFABS(hinc));
|
||||
FFMIN(stride + hinc, stride));
|
||||
|
||||
if (vinc > 0)
|
||||
cdg_fill_wrapper(0, 0, out,
|
||||
|
||||
@@ -221,7 +221,6 @@ static void free_buffers(CFHDContext *s)
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < FF_ARRAY_ELEMS(s->plane); i++) {
|
||||
Plane *p = &s->plane[i];
|
||||
av_freep(&s->plane[i].idwt_buf);
|
||||
av_freep(&s->plane[i].idwt_tmp);
|
||||
s->plane[i].idwt_size = 0;
|
||||
@@ -231,16 +230,9 @@ static void free_buffers(CFHDContext *s)
|
||||
|
||||
for (j = 0; j < 10; j++)
|
||||
s->plane[i].l_h[j] = NULL;
|
||||
|
||||
for (j = 0; j < DWT_LEVELS_3D; j++)
|
||||
p->band[j][0].read_ok =
|
||||
p->band[j][1].read_ok =
|
||||
p->band[j][2].read_ok =
|
||||
p->band[j][3].read_ok = 0;
|
||||
}
|
||||
s->a_height = 0;
|
||||
s->a_width = 0;
|
||||
s->a_transform_type = INT_MIN;
|
||||
}
|
||||
|
||||
static int alloc_buffers(AVCodecContext *avctx)
|
||||
@@ -364,7 +356,6 @@ static int alloc_buffers(AVCodecContext *avctx)
|
||||
}
|
||||
}
|
||||
|
||||
s->a_transform_type = s->transform_type;
|
||||
s->a_height = s->coded_height;
|
||||
s->a_width = s->coded_width;
|
||||
s->a_format = s->coded_format;
|
||||
@@ -664,8 +655,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
s->coded_height = s->a_height;
|
||||
|
||||
if (s->a_width != s->coded_width || s->a_height != s->coded_height ||
|
||||
s->a_format != s->coded_format ||
|
||||
s->transform_type != s->a_transform_type) {
|
||||
s->a_format != s->coded_format) {
|
||||
free_buffers(s);
|
||||
if ((ret = alloc_buffers(avctx)) < 0) {
|
||||
free_buffers(s);
|
||||
@@ -708,18 +698,11 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
coeff_data = s->plane[s->channel_num].subband[s->subband_num_actual];
|
||||
|
||||
/* Lowpass coefficients */
|
||||
if (tag == BitstreamMarker && data == 0xf0f) {
|
||||
int lowpass_height, lowpass_width, lowpass_a_height, lowpass_a_width;
|
||||
|
||||
if (!s->a_width || !s->a_height) {
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
goto end;
|
||||
}
|
||||
|
||||
lowpass_height = s->plane[s->channel_num].band[0][0].height;
|
||||
lowpass_width = s->plane[s->channel_num].band[0][0].width;
|
||||
lowpass_a_height = s->plane[s->channel_num].band[0][0].a_height;
|
||||
lowpass_a_width = s->plane[s->channel_num].band[0][0].a_width;
|
||||
if (tag == BitstreamMarker && data == 0xf0f && s->a_width && s->a_height) {
|
||||
int lowpass_height = s->plane[s->channel_num].band[0][0].height;
|
||||
int lowpass_width = s->plane[s->channel_num].band[0][0].width;
|
||||
int lowpass_a_height = s->plane[s->channel_num].band[0][0].a_height;
|
||||
int lowpass_a_width = s->plane[s->channel_num].band[0][0].a_width;
|
||||
|
||||
if (lowpass_width < 3 ||
|
||||
lowpass_width > lowpass_a_width) {
|
||||
@@ -766,30 +749,20 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
lowpass_width * sizeof(*coeff_data));
|
||||
}
|
||||
|
||||
s->plane[s->channel_num].band[0][0].read_ok = 1;
|
||||
|
||||
av_log(avctx, AV_LOG_DEBUG, "Lowpass coefficients %d\n", lowpass_width * lowpass_height);
|
||||
}
|
||||
|
||||
av_assert0(s->subband_num_actual != 255);
|
||||
if (tag == BandHeader || tag == BandSecondPass) {
|
||||
int highpass_height, highpass_width, highpass_a_width, highpass_a_height, highpass_stride, a_expected;
|
||||
if ((tag == BandHeader || tag == BandSecondPass) && s->subband_num_actual != 255 && s->a_width && s->a_height) {
|
||||
int highpass_height = s->plane[s->channel_num].band[s->level][s->subband_num].height;
|
||||
int highpass_width = s->plane[s->channel_num].band[s->level][s->subband_num].width;
|
||||
int highpass_a_width = s->plane[s->channel_num].band[s->level][s->subband_num].a_width;
|
||||
int highpass_a_height = s->plane[s->channel_num].band[s->level][s->subband_num].a_height;
|
||||
int highpass_stride = s->plane[s->channel_num].band[s->level][s->subband_num].stride;
|
||||
int expected;
|
||||
int a_expected = highpass_a_height * highpass_a_width;
|
||||
int level, run, coeff;
|
||||
int count = 0, bytes;
|
||||
|
||||
if (!s->a_width || !s->a_height) {
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
goto end;
|
||||
}
|
||||
|
||||
highpass_height = s->plane[s->channel_num].band[s->level][s->subband_num].height;
|
||||
highpass_width = s->plane[s->channel_num].band[s->level][s->subband_num].width;
|
||||
highpass_a_width = s->plane[s->channel_num].band[s->level][s->subband_num].a_width;
|
||||
highpass_a_height = s->plane[s->channel_num].band[s->level][s->subband_num].a_height;
|
||||
highpass_stride = s->plane[s->channel_num].band[s->level][s->subband_num].stride;
|
||||
a_expected = highpass_a_height * highpass_a_width;
|
||||
|
||||
if (!got_buffer) {
|
||||
av_log(avctx, AV_LOG_ERROR, "No end of header tag found\n");
|
||||
ret = AVERROR(EINVAL);
|
||||
@@ -838,7 +811,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
const uint16_t q = s->quantisation;
|
||||
|
||||
for (i = 0; i < run; i++) {
|
||||
*coeff_data |= coeff * 256U;
|
||||
*coeff_data |= coeff * 256;
|
||||
*coeff_data++ *= q;
|
||||
}
|
||||
} else {
|
||||
@@ -869,7 +842,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
const uint16_t q = s->quantisation;
|
||||
|
||||
for (i = 0; i < run; i++) {
|
||||
*coeff_data |= coeff * 256U;
|
||||
*coeff_data |= coeff * 256;
|
||||
*coeff_data++ *= q;
|
||||
}
|
||||
} else {
|
||||
@@ -900,7 +873,6 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
|
||||
bytestream2_seek(&gb, bytes, SEEK_CUR);
|
||||
|
||||
av_log(avctx, AV_LOG_DEBUG, "End subband coeffs %i extra %i\n", count, count - expected);
|
||||
s->plane[s->channel_num].band[s->level][s->subband_num].read_ok = 1;
|
||||
finish:
|
||||
if (s->subband_num_actual != 255)
|
||||
s->codebook = 0;
|
||||
@@ -916,7 +888,6 @@ finish:
|
||||
ff_thread_finish_setup(avctx);
|
||||
|
||||
if (!s->a_width || !s->a_height || s->a_format == AV_PIX_FMT_NONE ||
|
||||
s->a_transform_type == INT_MIN ||
|
||||
s->coded_width || s->coded_height || s->coded_format != AV_PIX_FMT_NONE) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Invalid dimensions\n");
|
||||
ret = AVERROR(EINVAL);
|
||||
@@ -929,22 +900,6 @@ finish:
|
||||
goto end;
|
||||
}
|
||||
|
||||
for (plane = 0; plane < s->planes; plane++) {
|
||||
int o, level;
|
||||
|
||||
for (level = 0; level < (s->transform_type == 0 ? DWT_LEVELS : DWT_LEVELS_3D) ; level++) {
|
||||
if (s->transform_type == 2)
|
||||
if (level == 2 || level == 5)
|
||||
continue;
|
||||
for (o = !!level; o < 4 ; o++) {
|
||||
if (!s->plane[plane].band[level][o].read_ok) {
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (s->transform_type == 0 && s->sample_type != 1) {
|
||||
for (plane = 0; plane < s->planes && !ret; plane++) {
|
||||
/* level 1 */
|
||||
@@ -1426,14 +1381,12 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
|
||||
if (pdst->plane[0].idwt_size != psrc->plane[0].idwt_size ||
|
||||
pdst->a_format != psrc->a_format ||
|
||||
pdst->a_width != psrc->a_width ||
|
||||
pdst->a_height != psrc->a_height ||
|
||||
pdst->a_transform_type != psrc->a_transform_type)
|
||||
pdst->a_height != psrc->a_height)
|
||||
free_buffers(pdst);
|
||||
|
||||
pdst->a_format = psrc->a_format;
|
||||
pdst->a_width = psrc->a_width;
|
||||
pdst->a_height = psrc->a_height;
|
||||
pdst->a_transform_type = psrc->a_transform_type;
|
||||
pdst->transform_type = psrc->transform_type;
|
||||
pdst->progressive = psrc->progressive;
|
||||
pdst->planes = psrc->planes;
|
||||
@@ -1442,7 +1395,6 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
|
||||
pdst->coded_width = pdst->a_width;
|
||||
pdst->coded_height = pdst->a_height;
|
||||
pdst->coded_format = pdst->a_format;
|
||||
pdst->transform_type = pdst->a_transform_type;
|
||||
ret = alloc_buffers(dst);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@@ -114,7 +114,6 @@ typedef struct SubBand {
|
||||
int width;
|
||||
int a_height;
|
||||
int height;
|
||||
int8_t read_ok;
|
||||
} SubBand;
|
||||
|
||||
typedef struct Plane {
|
||||
@@ -166,7 +165,6 @@ typedef struct CFHDContext {
|
||||
int a_width;
|
||||
int a_height;
|
||||
int a_format;
|
||||
int a_transform_type;
|
||||
|
||||
int bpc; // bits per channel/component
|
||||
int channel_cnt;
|
||||
|
||||
@@ -722,8 +722,8 @@ static av_cold int clv_decode_init(AVCodecContext *avctx)
|
||||
}
|
||||
|
||||
c->tile_shift = av_log2(c->tile_size);
|
||||
if (1U << c->tile_shift != c->tile_size || c->tile_shift < 1 || c->tile_shift > 30) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Tile size: %d, is not power of 2 > 1 and < 2^31\n", c->tile_size);
|
||||
if (1U << c->tile_shift != c->tile_size) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Tile size: %d, is not power of 2.\n", c->tile_size);
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
|
||||
@@ -111,7 +111,6 @@ static int cpia_decode_frame(AVCodecContext *avctx,
|
||||
// Read line length, two byte little endian
|
||||
linelength = AV_RL16(src);
|
||||
src += 2;
|
||||
src_size -= 2;
|
||||
|
||||
if (src_size < linelength) {
|
||||
frame->decode_error_flags = FF_DECODE_ERROR_INVALID_BITSTREAM;
|
||||
|
||||
@@ -785,7 +785,6 @@ static int crystalhd_receive_frame(AVCodecContext *avctx, AVFrame *frame)
|
||||
.flush = flush, \
|
||||
.bsfs = bsf_name, \
|
||||
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \
|
||||
.caps_internal = FF_CODEC_CAP_SETS_FRAME_PROPS, \
|
||||
.pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUYV422, AV_PIX_FMT_NONE}, \
|
||||
.wrapper_name = "crystalhd", \
|
||||
};
|
||||
|
||||
@@ -1150,7 +1150,6 @@ static const AVCodecHWConfigInternal *const cuvid_hw_configs[] = {
|
||||
.flush = cuvid_flush, \
|
||||
.bsfs = bsf_name, \
|
||||
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING | AV_CODEC_CAP_HARDWARE, \
|
||||
.caps_internal = FF_CODEC_CAP_SETS_FRAME_PROPS, \
|
||||
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_CUDA, \
|
||||
AV_PIX_FMT_NV12, \
|
||||
AV_PIX_FMT_P010, \
|
||||
|
||||
@@ -925,10 +925,10 @@ static void fill_in_adpcm_bufer(DCAEncContext *c)
|
||||
* But there are no proper value in decoder history, so likely result will be no good.
|
||||
* Bitstream has "Predictor history flag switch", but this flag disables history for all subbands
|
||||
*/
|
||||
samples[0] = c->adpcm_history[ch][band][0] * (1 << 7);
|
||||
samples[1] = c->adpcm_history[ch][band][1] * (1 << 7);
|
||||
samples[2] = c->adpcm_history[ch][band][2] * (1 << 7);
|
||||
samples[3] = c->adpcm_history[ch][band][3] * (1 << 7);
|
||||
samples[0] = c->adpcm_history[ch][band][0] << 7;
|
||||
samples[1] = c->adpcm_history[ch][band][1] << 7;
|
||||
samples[2] = c->adpcm_history[ch][band][2] << 7;
|
||||
samples[3] = c->adpcm_history[ch][band][3] << 7;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -233,11 +233,9 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt)
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) {
|
||||
ret = extract_packet_props(avctx->internal, pkt);
|
||||
if (ret < 0)
|
||||
goto finish;
|
||||
}
|
||||
ret = extract_packet_props(avctx->internal, pkt);
|
||||
if (ret < 0)
|
||||
goto finish;
|
||||
|
||||
ret = apply_param_change(avctx, pkt);
|
||||
if (ret < 0)
|
||||
@@ -504,13 +502,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
|
||||
pkt->data += consumed;
|
||||
pkt->size -= consumed;
|
||||
avci->last_pkt_props->size -= consumed; // See extract_packet_props() comment.
|
||||
pkt->pts = AV_NOPTS_VALUE;
|
||||
pkt->dts = AV_NOPTS_VALUE;
|
||||
if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) {
|
||||
avci->last_pkt_props->size -= consumed; // See extract_packet_props() comment.
|
||||
avci->last_pkt_props->pts = AV_NOPTS_VALUE;
|
||||
avci->last_pkt_props->dts = AV_NOPTS_VALUE;
|
||||
}
|
||||
avci->last_pkt_props->pts = AV_NOPTS_VALUE;
|
||||
avci->last_pkt_props->dts = AV_NOPTS_VALUE;
|
||||
}
|
||||
|
||||
if (got_frame)
|
||||
@@ -552,11 +548,6 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
|
||||
if (ret == AVERROR_EOF)
|
||||
avci->draining_done = 1;
|
||||
|
||||
if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS) &&
|
||||
IS_EMPTY(avci->last_pkt_props) && av_fifo_size(avci->pkt_props) >= sizeof(*avci->last_pkt_props))
|
||||
av_fifo_generic_read(avci->pkt_props,
|
||||
avci->last_pkt_props, sizeof(*avci->last_pkt_props), NULL);
|
||||
|
||||
if (!ret) {
|
||||
frame->best_effort_timestamp = guess_correct_pts(avctx,
|
||||
frame->pts,
|
||||
@@ -1747,37 +1738,39 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
|
||||
{ AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE },
|
||||
};
|
||||
|
||||
if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_FRAME_PROPS)) {
|
||||
frame->pts = pkt->pts;
|
||||
if (IS_EMPTY(pkt) && av_fifo_size(avctx->internal->pkt_props) >= sizeof(*pkt))
|
||||
av_fifo_generic_read(avctx->internal->pkt_props,
|
||||
pkt, sizeof(*pkt), NULL);
|
||||
|
||||
frame->pts = pkt->pts;
|
||||
#if FF_API_PKT_PTS
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
frame->pkt_pts = pkt->pts;
|
||||
frame->pkt_pts = pkt->pts;
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif
|
||||
frame->pkt_pos = pkt->pos;
|
||||
frame->pkt_duration = pkt->duration;
|
||||
frame->pkt_size = pkt->size;
|
||||
frame->pkt_pos = pkt->pos;
|
||||
frame->pkt_duration = pkt->duration;
|
||||
frame->pkt_size = pkt->size;
|
||||
|
||||
for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) {
|
||||
buffer_size_t size;
|
||||
uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size);
|
||||
if (packet_sd) {
|
||||
AVFrameSideData *frame_sd = av_frame_new_side_data(frame,
|
||||
sd[i].frame,
|
||||
size);
|
||||
if (!frame_sd)
|
||||
return AVERROR(ENOMEM);
|
||||
for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) {
|
||||
buffer_size_t size;
|
||||
uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size);
|
||||
if (packet_sd) {
|
||||
AVFrameSideData *frame_sd = av_frame_new_side_data(frame,
|
||||
sd[i].frame,
|
||||
size);
|
||||
if (!frame_sd)
|
||||
return AVERROR(ENOMEM);
|
||||
|
||||
memcpy(frame_sd->data, packet_sd, size);
|
||||
}
|
||||
memcpy(frame_sd->data, packet_sd, size);
|
||||
}
|
||||
add_metadata_from_side_data(pkt, frame);
|
||||
}
|
||||
add_metadata_from_side_data(pkt, frame);
|
||||
|
||||
if (pkt->flags & AV_PKT_FLAG_DISCARD) {
|
||||
frame->flags |= AV_FRAME_FLAG_DISCARD;
|
||||
} else {
|
||||
frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD);
|
||||
}
|
||||
if (pkt->flags & AV_PKT_FLAG_DISCARD) {
|
||||
frame->flags |= AV_FRAME_FLAG_DISCARD;
|
||||
} else {
|
||||
frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD);
|
||||
}
|
||||
frame->reordered_opaque = avctx->reordered_opaque;
|
||||
|
||||
|
||||
@@ -1432,8 +1432,8 @@ static void global_mv(DiracContext *s, DiracBlock *block, int x, int y, int ref)
|
||||
int *c = s->globalmc[ref].perspective;
|
||||
|
||||
int64_t m = (1<<ep) - (c[0]*(int64_t)x + c[1]*(int64_t)y);
|
||||
int64_t mx = m * (uint64_t)((A[0][0] * (int64_t)x + A[0][1]*(int64_t)y) + (1LL<<ez) * b[0]);
|
||||
int64_t my = m * (uint64_t)((A[1][0] * (int64_t)x + A[1][1]*(int64_t)y) + (1LL<<ez) * b[1]);
|
||||
int64_t mx = m * (int64_t)((A[0][0] * (int64_t)x + A[0][1]*(int64_t)y) + (1LL<<ez) * b[0]);
|
||||
int64_t my = m * (int64_t)((A[1][0] * (int64_t)x + A[1][1]*(int64_t)y) + (1LL<<ez) * b[1]);
|
||||
|
||||
block->u.mv[ref][0] = (mx + (1<<(ez+ep))) >> (ez+ep);
|
||||
block->u.mv[ref][1] = (my + (1<<(ez+ep))) >> (ez+ep);
|
||||
|
||||
@@ -112,7 +112,6 @@ static av_cold int dnxhd_decode_init(AVCodecContext *avctx)
|
||||
|
||||
static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth)
|
||||
{
|
||||
int ret;
|
||||
if (cid != ctx->cid) {
|
||||
const CIDEntry *cid_table = ff_dnxhd_get_cid_table(cid);
|
||||
|
||||
@@ -133,26 +132,19 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth)
|
||||
ff_free_vlc(&ctx->dc_vlc);
|
||||
ff_free_vlc(&ctx->run_vlc);
|
||||
|
||||
if ((ret = init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257,
|
||||
init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257,
|
||||
ctx->cid_table->ac_bits, 1, 1,
|
||||
ctx->cid_table->ac_codes, 2, 2, 0)) < 0)
|
||||
goto out;
|
||||
if ((ret = init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, bitdepth > 8 ? 14 : 12,
|
||||
ctx->cid_table->ac_codes, 2, 2, 0);
|
||||
init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, bitdepth > 8 ? 14 : 12,
|
||||
ctx->cid_table->dc_bits, 1, 1,
|
||||
ctx->cid_table->dc_codes, 1, 1, 0)) < 0)
|
||||
goto out;
|
||||
if ((ret = init_vlc(&ctx->run_vlc, DNXHD_VLC_BITS, 62,
|
||||
ctx->cid_table->dc_codes, 1, 1, 0);
|
||||
init_vlc(&ctx->run_vlc, DNXHD_VLC_BITS, 62,
|
||||
ctx->cid_table->run_bits, 1, 1,
|
||||
ctx->cid_table->run_codes, 2, 2, 0)) < 0)
|
||||
goto out;
|
||||
ctx->cid_table->run_codes, 2, 2, 0);
|
||||
|
||||
ctx->cid = cid;
|
||||
}
|
||||
ret = 0;
|
||||
out:
|
||||
if (ret < 0)
|
||||
av_log(ctx->avctx, AV_LOG_ERROR, "init_vlc failed\n");
|
||||
return ret;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dnxhd_get_profile(int cid)
|
||||
|
||||
@@ -1353,7 +1353,7 @@ static av_cold int dnxhd_encode_end(AVCodecContext *avctx)
|
||||
av_freep(&ctx->qmatrix_c16);
|
||||
av_freep(&ctx->qmatrix_l16);
|
||||
|
||||
if (ctx->thread[1]) {
|
||||
if (avctx->active_thread_type == FF_THREAD_SLICE) {
|
||||
for (i = 1; i < avctx->thread_count; i++)
|
||||
av_freep(&ctx->thread[i]);
|
||||
}
|
||||
|
||||
@@ -242,9 +242,6 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
if (bits_per_color > 31)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
buf += 820;
|
||||
avctx->sample_aspect_ratio.num = read32(&buf, endian);
|
||||
avctx->sample_aspect_ratio.den = read32(&buf, endian);
|
||||
@@ -319,7 +316,7 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
minCV = av_int2float(i);
|
||||
maxCV = av_int2float(j);
|
||||
if (bits_per_color >= 1 &&
|
||||
minCV == 0.0f && maxCV == ((1U<<bits_per_color) - 1)) {
|
||||
minCV == 0.0f && maxCV == ((1<<bits_per_color) - 1)) {
|
||||
avctx->color_range = AVCOL_RANGE_JPEG;
|
||||
} else if (bits_per_color >= 8 &&
|
||||
minCV == (1 <<(bits_per_color - 4)) &&
|
||||
|
||||
@@ -215,7 +215,7 @@ static uint8_t prob_dst_x_bit(int c)
|
||||
return (ff_reverse[c & 127] >> 1) + 1;
|
||||
}
|
||||
|
||||
static int build_filter(int16_t table[DST_MAX_ELEMENTS][16][256], const Table *fsets)
|
||||
static void build_filter(int16_t table[DST_MAX_ELEMENTS][16][256], const Table *fsets)
|
||||
{
|
||||
int i, j, k, l;
|
||||
|
||||
@@ -226,17 +226,14 @@ static int build_filter(int16_t table[DST_MAX_ELEMENTS][16][256], const Table *f
|
||||
int total = av_clip(length - j * 8, 0, 8);
|
||||
|
||||
for (k = 0; k < 256; k++) {
|
||||
int64_t v = 0;
|
||||
int v = 0;
|
||||
|
||||
for (l = 0; l < total; l++)
|
||||
v += (((k >> l) & 1) * 2 - 1) * fsets->coeff[i][j * 8 + l];
|
||||
if ((int16_t)v != v)
|
||||
return AVERROR_INVALIDDATA;
|
||||
table[i][j][k] = v;
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int decode_frame(AVCodecContext *avctx, void *data,
|
||||
@@ -332,9 +329,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
||||
return AVERROR_INVALIDDATA;
|
||||
ac_init(ac, gb);
|
||||
|
||||
ret = build_filter(s->filter, &s->fsets);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
build_filter(s->filter, &s->fsets);
|
||||
|
||||
memset(s->status, 0xAA, sizeof(s->status));
|
||||
memset(dsd, 0, frame->nb_samples * 4 * channels);
|
||||
|
||||
@@ -261,22 +261,24 @@ const AVDVProfile* ff_dv_frame_profile(AVCodecContext* codec, const AVDVProfile
|
||||
const uint8_t *frame, unsigned buf_size)
|
||||
{
|
||||
#if CONFIG_DVPROFILE
|
||||
int i, dsf, stype, pal;
|
||||
int i, dsf, stype;
|
||||
|
||||
if(buf_size < DV_PROFILE_BYTES)
|
||||
return NULL;
|
||||
|
||||
dsf = (frame[3] & 0x80) >> 7;
|
||||
stype = frame[80 * 5 + 48 + 3] & 0x1f;
|
||||
pal = !!(frame[80 * 5 + 48 + 3] & 0x20);
|
||||
|
||||
/* 576i50 25Mbps 4:1:1 is a special case */
|
||||
if ((dsf == 1 && stype == 0 && frame[4] & 0x07 /* the APT field */) ||
|
||||
(stype == 31 && codec && codec->codec_tag==AV_RL32("SL25") && codec->coded_width==720 && codec->coded_height==576))
|
||||
return &dv_profiles[2];
|
||||
|
||||
/* hack for trac issues #8333 and #2177, PAL DV files with dsf flag 0 - detect via pal flag and buf_size */
|
||||
if (dsf == 0 && pal == 1 && stype == dv_profiles[1].video_stype && buf_size == dv_profiles[1].frame_size)
|
||||
if( stype == 0
|
||||
&& codec
|
||||
&& (codec->codec_tag==AV_RL32("dvsd") || codec->codec_tag==AV_RL32("CDVC"))
|
||||
&& codec->coded_width ==720
|
||||
&& codec->coded_height==576)
|
||||
return &dv_profiles[1];
|
||||
|
||||
for (i = 0; i < FF_ARRAY_ELEMS(dv_profiles); i++)
|
||||
|
||||
@@ -73,7 +73,7 @@ static int fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *c
|
||||
pp->max_height = seq->max_frame_height_minus_1 + 1;
|
||||
|
||||
pp->CurrPicTextureIndex = ff_dxva2_get_surface_index(avctx, ctx, h->cur_frame.tf.f);
|
||||
pp->superres_denom = frame_header->use_superres ? frame_header->coded_denom + AV1_SUPERRES_DENOM_MIN : AV1_SUPERRES_NUM;
|
||||
pp->superres_denom = frame_header->use_superres ? frame_header->coded_denom : AV1_SUPERRES_NUM;
|
||||
pp->bitdepth = get_bit_depth_from_seq(seq);
|
||||
pp->seq_profile = seq->seq_profile;
|
||||
|
||||
@@ -139,7 +139,7 @@ static int fill_picture_parameters(const AVCodecContext *avctx, AVDXVAContext *c
|
||||
pp->frame_refs[i].Index = ref_frame->buf[0] ? ref_idx : 0xFF;
|
||||
|
||||
/* Global Motion */
|
||||
pp->frame_refs[i].wminvalid = h->cur_frame.gm_invalid[AV1_REF_FRAME_LAST + i];
|
||||
pp->frame_refs[i].wminvalid = (h->cur_frame.gm_type[AV1_REF_FRAME_LAST + i] == AV1_WARP_MODEL_IDENTITY);
|
||||
pp->frame_refs[i].wmtype = h->cur_frame.gm_type[AV1_REF_FRAME_LAST + i];
|
||||
for (j = 0; j < 6; ++j) {
|
||||
pp->frame_refs[i].wmmat[j] = h->cur_frame.gm_params[AV1_REF_FRAME_LAST + i][j];
|
||||
|
||||
@@ -139,11 +139,9 @@ static void ff_eac3_apply_spectral_extension(AC3DecodeContext *s)
|
||||
// spx_noise_blend and spx_signal_blend are both FP.23
|
||||
nscale *= 1.0 / (1<<23);
|
||||
sscale *= 1.0 / (1<<23);
|
||||
if (nscale < -1.0)
|
||||
nscale = -1.0;
|
||||
#endif
|
||||
for (i = 0; i < s->spx_band_sizes[bnd]; i++) {
|
||||
UINTFLOAT noise = (INTFLOAT)(nscale * (int32_t)av_lfg_get(&s->dith_state));
|
||||
float noise = nscale * (int32_t)av_lfg_get(&s->dith_state);
|
||||
s->transform_coeffs[ch][bin] *= sscale;
|
||||
s->transform_coeffs[ch][bin++] += noise;
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ static av_cold int tgq_decode_init(AVCodecContext *avctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb)
|
||||
static void tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb)
|
||||
{
|
||||
uint8_t *perm = s->scantable.permutated;
|
||||
int i, j, value;
|
||||
@@ -69,8 +69,6 @@ static int tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb)
|
||||
for (i = 1; i < 64;) {
|
||||
switch (show_bits(gb, 3)) {
|
||||
case 4:
|
||||
if (i >= 63)
|
||||
return AVERROR_INVALIDDATA;
|
||||
block[perm[i++]] = 0;
|
||||
case 0:
|
||||
block[perm[i++]] = 0;
|
||||
@@ -80,8 +78,6 @@ static int tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb)
|
||||
case 1:
|
||||
skip_bits(gb, 2);
|
||||
value = get_bits(gb, 6);
|
||||
if (value > 64 - i)
|
||||
return AVERROR_INVALIDDATA;
|
||||
for (j = 0; j < value; j++)
|
||||
block[perm[i++]] = 0;
|
||||
break;
|
||||
@@ -109,7 +105,6 @@ static int tgq_decode_block(TgqContext *s, int16_t block[64], GetBitContext *gb)
|
||||
}
|
||||
}
|
||||
block[0] += 128 << 4;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void tgq_idct_put_mb(TgqContext *s, int16_t (*block)[64], AVFrame *frame,
|
||||
@@ -169,11 +164,8 @@ static int tgq_decode_mb(TgqContext *s, AVFrame *frame, int mb_y, int mb_x)
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
for (i = 0; i < 6; i++) {
|
||||
int ret = tgq_decode_block(s, s->block[i], &gb);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
for (i = 0; i < 6; i++)
|
||||
tgq_decode_block(s, s->block[i], &gb);
|
||||
tgq_idct_put_mb(s, s->block, frame, mb_x, mb_y);
|
||||
bytestream2_skip(&s->gb, mode);
|
||||
} else {
|
||||
|
||||
@@ -565,7 +565,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
if (avctx->pix_fmt == avctx->codec->pix_fmts[i])
|
||||
break;
|
||||
if (avctx->codec->pix_fmts[i] == AV_PIX_FMT_NONE
|
||||
&& !(avctx->codec_id == AV_CODEC_ID_MJPEG
|
||||
&& !((avctx->codec_id == AV_CODEC_ID_MJPEG || avctx->codec_id == AV_CODEC_ID_LJPEG)
|
||||
&& avctx->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL)) {
|
||||
char buf[128];
|
||||
snprintf(buf, sizeof(buf), "%d", avctx->pix_fmt);
|
||||
|
||||
@@ -88,6 +88,11 @@ static CodeBook unpack_codebook(GetBitContext* gb, unsigned depth,
|
||||
unsigned i, j;
|
||||
CodeBook cb = { 0 };
|
||||
|
||||
if (size >= INT_MAX / 34 || get_bits_left(gb) < size * 34)
|
||||
return cb;
|
||||
|
||||
if (size >= INT_MAX / sizeof(MacroBlock))
|
||||
return cb;
|
||||
cb.blocks = av_malloc(size ? size * sizeof(MacroBlock) : 1);
|
||||
if (!cb.blocks)
|
||||
return cb;
|
||||
@@ -221,7 +226,7 @@ static int escape124_decode_frame(AVCodecContext *avctx,
|
||||
// represent a lower bound of the space needed for skipped superblocks. Non
|
||||
// skipped SBs need more space.
|
||||
if (get_bits_left(&gb) < 64 + s->num_superblocks * 23LL / 4320)
|
||||
return AVERROR_INVALIDDATA;
|
||||
return -1;
|
||||
|
||||
frame_flags = get_bits_long(&gb, 32);
|
||||
frame_size = get_bits_long(&gb, 32);
|
||||
@@ -272,14 +277,9 @@ static int escape124_decode_frame(AVCodecContext *avctx,
|
||||
}
|
||||
|
||||
av_freep(&s->codebooks[i].blocks);
|
||||
if (cb_size >= INT_MAX / 34 || get_bits_left(&gb) < (int)cb_size * 34)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
if (cb_size >= INT_MAX / sizeof(MacroBlock))
|
||||
return AVERROR_INVALIDDATA;
|
||||
s->codebooks[i] = unpack_codebook(&gb, cb_depth, cb_size);
|
||||
if (!s->codebooks[i].blocks)
|
||||
return AVERROR(ENOMEM);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -418,16 +418,11 @@ static int huf_decode(VLC *vlc, GetByteContext *gb, int nbits, int run_sym,
|
||||
|
||||
init_get_bits(&gbit, gb->buffer, nbits);
|
||||
while (get_bits_left(&gbit) > 0 && oe < no) {
|
||||
uint16_t x = get_vlc2(&gbit, vlc->table, 12, 3);
|
||||
uint16_t x = get_vlc2(&gbit, vlc->table, 12, 2);
|
||||
|
||||
if (x == run_sym) {
|
||||
int run = get_bits(&gbit, 8);
|
||||
uint16_t fill;
|
||||
|
||||
if (oe == 0 || oe + run > no)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
fill = out[oe - 1];
|
||||
uint16_t fill = out[oe - 1];
|
||||
|
||||
while (run-- > 0)
|
||||
out[oe++] = fill;
|
||||
@@ -1014,9 +1009,7 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
|
||||
dc_count = AV_RL64(src + 72);
|
||||
ac_compression = AV_RL64(src + 80);
|
||||
|
||||
if ( compressed_size < (uint64_t)(lo_size | ac_size | dc_size | rle_csize) || compressed_size < 88LL + lo_size + ac_size + dc_size + rle_csize
|
||||
|| ac_count > (uint64_t)INT_MAX/2
|
||||
)
|
||||
if (compressed_size < 88LL + lo_size + ac_size + dc_size + rle_csize)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
bytestream2_init(&gb, src + 88, compressed_size - 88);
|
||||
@@ -1033,14 +1026,12 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
|
||||
}
|
||||
|
||||
if (ac_size > 0) {
|
||||
unsigned long dest_len;
|
||||
unsigned long dest_len = ac_count * 2LL;
|
||||
GetByteContext agb = gb;
|
||||
|
||||
if (ac_count > 3LL * td->xsize * s->scan_lines_per_block)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
dest_len = ac_count * 2LL;
|
||||
|
||||
av_fast_padded_malloc(&td->ac_data, &td->ac_size, dest_len);
|
||||
if (!td->ac_data)
|
||||
return AVERROR(ENOMEM);
|
||||
@@ -1063,15 +1054,13 @@ static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
|
||||
bytestream2_skip(&gb, ac_size);
|
||||
}
|
||||
|
||||
{
|
||||
unsigned long dest_len;
|
||||
if (dc_size > 0) {
|
||||
unsigned long dest_len = dc_count * 2LL;
|
||||
GetByteContext agb = gb;
|
||||
|
||||
if (dc_count != dc_w * dc_h * 3)
|
||||
if (dc_count > (6LL * td->xsize * td->ysize + 63) / 64)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
dest_len = dc_count * 2LL;
|
||||
|
||||
av_fast_padded_malloc(&td->dc_data, &td->dc_size, FFALIGN(dest_len, 64) * 2);
|
||||
if (!td->dc_data)
|
||||
return AVERROR(ENOMEM);
|
||||
@@ -1240,8 +1229,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
|
||||
td->ysize = FFMIN(s->tile_attr.ySize, s->ydelta - tile_y * s->tile_attr.ySize);
|
||||
td->xsize = FFMIN(s->tile_attr.xSize, s->xdelta - tile_x * s->tile_attr.xSize);
|
||||
|
||||
if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX ||
|
||||
av_image_check_size2(td->xsize, td->ysize, s->avctx->max_pixels, AV_PIX_FMT_NONE, 0, s->avctx) < 0)
|
||||
if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
td->channel_line_size = td->xsize * s->current_channel_offset;/* uncompress size of one line */
|
||||
@@ -1265,8 +1253,7 @@ static int decode_block(AVCodecContext *avctx, void *tdata,
|
||||
td->ysize = FFMIN(s->scan_lines_per_block, s->ymax - line + 1); /* s->ydelta - line ?? */
|
||||
td->xsize = s->xdelta;
|
||||
|
||||
if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX ||
|
||||
av_image_check_size2(td->xsize, td->ysize, s->avctx->max_pixels, AV_PIX_FMT_NONE, 0, s->avctx) < 0)
|
||||
if (td->xsize * (uint64_t)s->current_channel_offset > INT_MAX)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
td->channel_line_size = td->xsize * s->current_channel_offset;/* uncompress size of one line */
|
||||
@@ -1803,7 +1790,6 @@ static int decode_header(EXRContext *s, AVFrame *frame)
|
||||
ymax = bytestream2_get_le32(gb);
|
||||
|
||||
if (xmin > xmax || ymin > ymax ||
|
||||
ymax == INT_MAX || xmax == INT_MAX ||
|
||||
(unsigned)xmax - xmin >= INT_MAX ||
|
||||
(unsigned)ymax - ymin >= INT_MAX) {
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
@@ -1831,8 +1817,8 @@ static int decode_header(EXRContext *s, AVFrame *frame)
|
||||
dx = bytestream2_get_le32(gb);
|
||||
dy = bytestream2_get_le32(gb);
|
||||
|
||||
s->w = (unsigned)dx - sx + 1;
|
||||
s->h = (unsigned)dy - sy + 1;
|
||||
s->w = dx - sx + 1;
|
||||
s->h = dy - sy + 1;
|
||||
|
||||
continue;
|
||||
} else if ((var_size = check_header_variable(s, "lineOrder",
|
||||
@@ -1947,12 +1933,9 @@ static int decode_header(EXRContext *s, AVFrame *frame)
|
||||
"preview", 16)) >= 0) {
|
||||
uint32_t pw = bytestream2_get_le32(gb);
|
||||
uint32_t ph = bytestream2_get_le32(gb);
|
||||
uint64_t psize = pw * ph;
|
||||
if (psize > INT64_MAX / 4)
|
||||
return AVERROR_INVALIDDATA;
|
||||
psize *= 4;
|
||||
int64_t psize = 4LL * pw * ph;
|
||||
|
||||
if ((int64_t)psize >= bytestream2_get_bytes_left(gb))
|
||||
if (psize >= bytestream2_get_bytes_left(gb))
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
bytestream2_skip(gb, psize);
|
||||
|
||||
@@ -144,8 +144,6 @@ static int decode_uncompressed(AVCodecContext *avctx, GetBitContext *gb,
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
cwi = 10 - av_log2(cwi);
|
||||
if (get_bits_left(gb) < cwi + 1)
|
||||
return AVERROR_INVALIDDATA;
|
||||
skip_bits(gb, cwi + 1);
|
||||
if (cwi > 5) {
|
||||
newmode = get_bits1(gb);
|
||||
@@ -211,8 +209,6 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
|
||||
unsigned int run = 0;
|
||||
unsigned int t;
|
||||
for (;;) {
|
||||
if (get_bits_left(gb) <= 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2);
|
||||
run += t;
|
||||
if (t < 64) {
|
||||
@@ -231,7 +227,7 @@ static int decode_group3_1d_line(AVCodecContext *avctx, GetBitContext *gb,
|
||||
run = 0;
|
||||
mode = !mode;
|
||||
} else if ((int)t == -1) {
|
||||
if (get_bits_left(gb) > 12 && show_bits(gb, 12) == 15) {
|
||||
if (show_bits(gb, 12) == 15) {
|
||||
int ret;
|
||||
skip_bits(gb, 12);
|
||||
ret = decode_uncompressed(avctx, gb, &pix_left, &runs, runend, &mode);
|
||||
@@ -258,10 +254,7 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
|
||||
unsigned int offs = 0, run = 0;
|
||||
|
||||
while (offs < width) {
|
||||
int cmode;
|
||||
if (get_bits_left(gb) <= 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1);
|
||||
int cmode = get_vlc2(gb, ccitt_group3_2d_vlc.table, 9, 1);
|
||||
if (cmode == -1) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Incorrect mode VLC\n");
|
||||
return AVERROR_INVALIDDATA;
|
||||
@@ -283,8 +276,6 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
|
||||
for (k = 0; k < 2; k++) {
|
||||
run = 0;
|
||||
for (;;) {
|
||||
if (get_bits_left(gb) <= 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2);
|
||||
if (t == -1) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Incorrect code\n");
|
||||
@@ -308,10 +299,7 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb,
|
||||
mode = !mode;
|
||||
}
|
||||
} else if (cmode == 9 || cmode == 10) {
|
||||
int xxx;
|
||||
if (get_bits_left(gb) < 3)
|
||||
return AVERROR_INVALIDDATA;
|
||||
xxx = get_bits(gb, 3);
|
||||
int xxx = get_bits(gb, 3);
|
||||
if (cmode == 9 && xxx == 7) {
|
||||
int ret;
|
||||
int pix_left = width - offs;
|
||||
|
||||
@@ -166,34 +166,24 @@ static int decode_slice_header(FFV1Context *f, FFV1Context *fs)
|
||||
RangeCoder *c = &fs->c;
|
||||
uint8_t state[CONTEXT_SIZE];
|
||||
unsigned ps, i, context_count;
|
||||
int sx, sy, sw, sh;
|
||||
|
||||
memset(state, 128, sizeof(state));
|
||||
sx = get_symbol(c, state, 0);
|
||||
sy = get_symbol(c, state, 0);
|
||||
sw = get_symbol(c, state, 0) + 1U;
|
||||
sh = get_symbol(c, state, 0) + 1U;
|
||||
|
||||
av_assert0(f->version > 2);
|
||||
|
||||
fs->slice_x = get_symbol(c, state, 0) * f->width ;
|
||||
fs->slice_y = get_symbol(c, state, 0) * f->height;
|
||||
fs->slice_width = (get_symbol(c, state, 0) + 1) * f->width + fs->slice_x;
|
||||
fs->slice_height = (get_symbol(c, state, 0) + 1) * f->height + fs->slice_y;
|
||||
|
||||
if (sx < 0 || sy < 0 || sw <= 0 || sh <= 0)
|
||||
return AVERROR_INVALIDDATA;
|
||||
if (sx > f->num_h_slices - sw || sy > f->num_v_slices - sh)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
fs->slice_x = sx * (int64_t)f->width / f->num_h_slices;
|
||||
fs->slice_y = sy * (int64_t)f->height / f->num_v_slices;
|
||||
fs->slice_width = (sx + sw) * (int64_t)f->width / f->num_h_slices - fs->slice_x;
|
||||
fs->slice_height = (sy + sh) * (int64_t)f->height / f->num_v_slices - fs->slice_y;
|
||||
|
||||
av_assert0((unsigned)fs->slice_width <= f->width &&
|
||||
(unsigned)fs->slice_height <= f->height);
|
||||
av_assert0 ( (unsigned)fs->slice_x + (uint64_t)fs->slice_width <= f->width
|
||||
&& (unsigned)fs->slice_y + (uint64_t)fs->slice_height <= f->height);
|
||||
|
||||
if (fs->ac == AC_GOLOMB_RICE && fs->slice_width >= (1<<23))
|
||||
return AVERROR_INVALIDDATA;
|
||||
fs->slice_x /= f->num_h_slices;
|
||||
fs->slice_y /= f->num_v_slices;
|
||||
fs->slice_width = fs->slice_width /f->num_h_slices - fs->slice_x;
|
||||
fs->slice_height = fs->slice_height/f->num_v_slices - fs->slice_y;
|
||||
if ((unsigned)fs->slice_width > f->width || (unsigned)fs->slice_height > f->height)
|
||||
return -1;
|
||||
if ( (unsigned)fs->slice_x + (uint64_t)fs->slice_width > f->width
|
||||
|| (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height)
|
||||
return -1;
|
||||
|
||||
for (i = 0; i < f->plane_count; i++) {
|
||||
PlaneContext * const p = &fs->plane[i];
|
||||
@@ -308,11 +298,8 @@ static int decode_slice(AVCodecContext *c, void *arg)
|
||||
}
|
||||
if ((ret = ff_ffv1_init_slice_state(f, fs)) < 0)
|
||||
return ret;
|
||||
if (f->cur->key_frame || fs->slice_reset_contexts) {
|
||||
if (f->cur->key_frame || fs->slice_reset_contexts)
|
||||
ff_ffv1_clear_slice_state(f, fs);
|
||||
} else if (fs->slice_damaged) {
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
width = fs->slice_width;
|
||||
height = fs->slice_height;
|
||||
@@ -475,11 +462,6 @@ static int read_extra_header(FFV1Context *f)
|
||||
return AVERROR_INVALIDDATA;
|
||||
}
|
||||
|
||||
if (f->num_h_slices > MAX_SLICES / f->num_v_slices) {
|
||||
av_log(f->avctx, AV_LOG_ERROR, "slice count unsupported\n");
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
f->quant_table_count = get_symbol(c, state, 0);
|
||||
if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES || !f->quant_table_count) {
|
||||
av_log(f->avctx, AV_LOG_ERROR, "quant table count %d is invalid\n", f->quant_table_count);
|
||||
@@ -782,25 +764,21 @@ static int read_header(FFV1Context *f)
|
||||
fs->slice_damaged = 0;
|
||||
|
||||
if (f->version == 2) {
|
||||
int sx = get_symbol(c, state, 0);
|
||||
int sy = get_symbol(c, state, 0);
|
||||
int sw = get_symbol(c, state, 0) + 1U;
|
||||
int sh = get_symbol(c, state, 0) + 1U;
|
||||
fs->slice_x = get_symbol(c, state, 0) * f->width ;
|
||||
fs->slice_y = get_symbol(c, state, 0) * f->height;
|
||||
fs->slice_width = (get_symbol(c, state, 0) + 1) * f->width + fs->slice_x;
|
||||
fs->slice_height = (get_symbol(c, state, 0) + 1) * f->height + fs->slice_y;
|
||||
|
||||
if (sx < 0 || sy < 0 || sw <= 0 || sh <= 0)
|
||||
fs->slice_x /= f->num_h_slices;
|
||||
fs->slice_y /= f->num_v_slices;
|
||||
fs->slice_width = fs->slice_width / f->num_h_slices - fs->slice_x;
|
||||
fs->slice_height = fs->slice_height / f->num_v_slices - fs->slice_y;
|
||||
if ((unsigned)fs->slice_width > f->width ||
|
||||
(unsigned)fs->slice_height > f->height)
|
||||
return AVERROR_INVALIDDATA;
|
||||
if (sx > f->num_h_slices - sw || sy > f->num_v_slices - sh)
|
||||
if ( (unsigned)fs->slice_x + (uint64_t)fs->slice_width > f->width
|
||||
|| (unsigned)fs->slice_y + (uint64_t)fs->slice_height > f->height)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
fs->slice_x = sx * (int64_t)f->width / f->num_h_slices;
|
||||
fs->slice_y = sy * (int64_t)f->height / f->num_v_slices;
|
||||
fs->slice_width = (sx + sw) * (int64_t)f->width / f->num_h_slices - fs->slice_x;
|
||||
fs->slice_height = (sy + sh) * (int64_t)f->height / f->num_v_slices - fs->slice_y;
|
||||
|
||||
av_assert0((unsigned)fs->slice_width <= f->width &&
|
||||
(unsigned)fs->slice_height <= f->height);
|
||||
av_assert0 ( (unsigned)fs->slice_x + (uint64_t)fs->slice_width <= f->width
|
||||
&& (unsigned)fs->slice_y + (uint64_t)fs->slice_height <= f->height);
|
||||
}
|
||||
|
||||
for (i = 0; i < f->plane_count; i++) {
|
||||
|
||||
@@ -93,11 +93,11 @@ static av_always_inline int RENAME(decode_line)(FFV1Context *s, int w,
|
||||
run_count--;
|
||||
}
|
||||
} else {
|
||||
while (run_count > 1 && w-x > 1) {
|
||||
sample[1][x] = RENAME(predict)(sample[1] + x, sample[0] + x);
|
||||
x++;
|
||||
run_count--;
|
||||
}
|
||||
while (run_count > 1 && w-x > 1) {
|
||||
sample[1][x] = RENAME(predict)(sample[1] + x, sample[0] + x);
|
||||
x++;
|
||||
run_count--;
|
||||
}
|
||||
}
|
||||
run_count--;
|
||||
if (run_count < 0) {
|
||||
|
||||
@@ -188,7 +188,7 @@ static uint64_t frac64(uint64_t a, uint64_t b)
|
||||
|
||||
static uint64_t phi_at(struct ws_interval *in, int64_t ts)
|
||||
{
|
||||
uint64_t dt = ts - (uint64_t)in->ts_start;
|
||||
uint64_t dt = ts - in->ts_start;
|
||||
uint64_t dt2 = dt & 1 ? /* dt * (dt - 1) / 2 without overflow */
|
||||
dt * ((dt - 1) >> 1) : (dt >> 1) * (dt - 1);
|
||||
return in->phi0 + dt * in->dphi0 + dt2 * in->ddphi;
|
||||
|
||||
@@ -55,7 +55,6 @@
|
||||
|
||||
/** largest possible size of flac header */
|
||||
#define MAX_FRAME_HEADER_SIZE 16
|
||||
#define MAX_FRAME_VERIFY_SIZE (MAX_FRAME_HEADER_SIZE)
|
||||
|
||||
typedef struct FLACHeaderMarker {
|
||||
int offset; /**< byte offset from start of FLACParseContext->buffer */
|
||||
@@ -171,7 +170,7 @@ static int find_headers_search_validate(FLACParseContext *fpc, int offset)
|
||||
uint8_t *header_buf;
|
||||
int size = 0;
|
||||
header_buf = flac_fifo_read_wrap(fpc, offset,
|
||||
MAX_FRAME_VERIFY_SIZE + AV_INPUT_BUFFER_PADDING_SIZE,
|
||||
MAX_FRAME_HEADER_SIZE,
|
||||
&fpc->wrap_buf,
|
||||
&fpc->wrap_buf_allocated_size);
|
||||
if (frame_header_is_valid(fpc->avctx, header_buf, &fi)) {
|
||||
|
||||
@@ -1513,5 +1513,4 @@ AVCodec ff_flac_encoder = {
|
||||
AV_SAMPLE_FMT_S32,
|
||||
AV_SAMPLE_FMT_NONE },
|
||||
.priv_class = &flac_encoder_class,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
|
||||
};
|
||||
|
||||
@@ -159,7 +159,7 @@ static void init_blocks(FlashSV2Context * s, Block * blocks,
|
||||
b->enc = encbuf;
|
||||
b->data = databuf;
|
||||
encbuf += b->width * b->height * 3;
|
||||
databuf = databuf ? databuf + b->width * b->height * 6 : NULL;
|
||||
databuf += !databuf ? 0 : b->width * b->height * 6;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -735,8 +735,6 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
|
||||
bytestream2_skip(&g2, chunk_size - 6);
|
||||
} else {
|
||||
|
||||
if (bytestream2_get_bytes_left(&g2) < 2 * s->avctx->width * s->avctx->height )
|
||||
return AVERROR_INVALIDDATA;
|
||||
for (y_ptr = 0; y_ptr < s->frame->linesize[0] * s->avctx->height;
|
||||
y_ptr += s->frame->linesize[0]) {
|
||||
|
||||
|
||||
@@ -401,17 +401,20 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
||||
PutByteContext *pb = &s->pb;
|
||||
AVFrame *frame = data;
|
||||
int ret, y, x;
|
||||
int key_frame;
|
||||
|
||||
if (avpkt->size < 8)
|
||||
return AVERROR_INVALIDDATA;
|
||||
|
||||
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
|
||||
return ret;
|
||||
|
||||
bytestream2_init(gb, avpkt->data, avpkt->size);
|
||||
bytestream2_skip(gb, 2);
|
||||
|
||||
key_frame = !!bytestream2_get_le16(gb);
|
||||
frame->key_frame = !!bytestream2_get_le16(gb);
|
||||
frame->pict_type = frame->key_frame ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P;
|
||||
|
||||
if (key_frame) {
|
||||
if (frame->key_frame) {
|
||||
const uint8_t *src;
|
||||
unsigned type, size;
|
||||
uint8_t *dst;
|
||||
@@ -431,12 +434,6 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
|
||||
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
|
||||
return ret;
|
||||
|
||||
frame->key_frame = 1;
|
||||
frame->pict_type = AV_PICTURE_TYPE_I;
|
||||
|
||||
src = s->buffer;
|
||||
dst = frame->data[0] + (avctx->height - 1) * frame->linesize[0];
|
||||
for (y = 0; y < avctx->height; y++) {
|
||||
@@ -517,12 +514,6 @@ static int decode_frame(AVCodecContext *avctx, void *data,
|
||||
dst = &rect[block_h * s->stride];
|
||||
}
|
||||
|
||||
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
|
||||
return ret;
|
||||
|
||||
frame->key_frame = 0;
|
||||
frame->pict_type = AV_PICTURE_TYPE_P;
|
||||
|
||||
ssrc = s->buffer;
|
||||
ddst = frame->data[0] + (avctx->height - 1) * frame->linesize[0];
|
||||
for (y = 0; y < avctx->height; y++) {
|
||||
|
||||
@@ -124,7 +124,7 @@ end:
|
||||
int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
|
||||
int i=0;
|
||||
ThreadContext *c;
|
||||
AVCodecContext *thread_avctx = NULL;
|
||||
|
||||
|
||||
if( !(avctx->thread_type & FF_THREAD_FRAME)
|
||||
|| !(avctx->codec->capabilities & AV_CODEC_CAP_FRAME_THREADS))
|
||||
@@ -205,17 +205,16 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
|
||||
AVDictionary *tmp = NULL;
|
||||
int ret;
|
||||
void *tmpv;
|
||||
thread_avctx = avcodec_alloc_context3(avctx->codec);
|
||||
AVCodecContext *thread_avctx = avcodec_alloc_context3(avctx->codec);
|
||||
if(!thread_avctx)
|
||||
goto fail;
|
||||
tmpv = thread_avctx->priv_data;
|
||||
*thread_avctx = *avctx;
|
||||
thread_avctx->priv_data = tmpv;
|
||||
thread_avctx->internal = NULL;
|
||||
thread_avctx->hw_frames_ctx = NULL;
|
||||
ret = av_opt_copy(thread_avctx, avctx);
|
||||
if (ret < 0)
|
||||
goto fail;
|
||||
thread_avctx->priv_data = tmpv;
|
||||
thread_avctx->internal = NULL;
|
||||
if (avctx->codec->priv_class) {
|
||||
int ret = av_opt_copy(thread_avctx->priv_data, avctx->priv_data);
|
||||
if (ret < 0)
|
||||
@@ -244,8 +243,6 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){
|
||||
|
||||
return 0;
|
||||
fail:
|
||||
avcodec_close(thread_avctx);
|
||||
av_freep(&thread_avctx);
|
||||
avctx->thread_count = i;
|
||||
av_log(avctx, AV_LOG_ERROR, "ff_frame_thread_encoder_init failed\n");
|
||||
ff_frame_thread_encoder_free(avctx);
|
||||
|
||||
@@ -23,10 +23,6 @@
|
||||
|
||||
#include "avcodec.h"
|
||||
|
||||
/**
|
||||
* Initialize frame thread encoder.
|
||||
* @note hardware encoders are not supported
|
||||
*/
|
||||
int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options);
|
||||
void ff_frame_thread_encoder_free(AVCodecContext *avctx);
|
||||
int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
|
||||
|
||||
@@ -1029,7 +1029,7 @@ static int kempf_restore_buf(const uint8_t *src, int len,
|
||||
else if (npal <= 16) nb = 4;
|
||||
else nb = 8;
|
||||
|
||||
for (j = 0; j < height; j++, dst += stride, jpeg_tile = FF_PTR_ADD(jpeg_tile, tile_stride)) {
|
||||
for (j = 0; j < height; j++, dst += stride, jpeg_tile += tile_stride) {
|
||||
if (get_bits(&gb, 8))
|
||||
continue;
|
||||
for (i = 0; i < width; i++) {
|
||||
|
||||
@@ -49,9 +49,6 @@ static int g729_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
|
||||
s->block_size = (avctx->bit_rate < 8000) ? G729D_6K4_BLOCK_SIZE : G729_8K_BLOCK_SIZE;
|
||||
if (avctx->codec_id == AV_CODEC_ID_ACELP_KELVIN)
|
||||
s->block_size++;
|
||||
// channels > 2 is invalid, we pass the packet on unchanged
|
||||
if (avctx->channels > 2)
|
||||
s->block_size = 0;
|
||||
s->block_size *= avctx->channels;
|
||||
s->duration = avctx->frame_size;
|
||||
}
|
||||
|
||||
@@ -678,6 +678,6 @@ AVCodec ff_h261_decoder = {
|
||||
.close = h261_decode_end,
|
||||
.decode = h261_decode_frame,
|
||||
.capabilities = AV_CODEC_CAP_DR1,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
|
||||
.max_lowres = 3,
|
||||
};
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
#include "libavutil/thread.h"
|
||||
#include "avcodec.h"
|
||||
#include "mpegvideo.h"
|
||||
#include "h263.h"
|
||||
@@ -39,17 +38,6 @@
|
||||
#include "flv.h"
|
||||
#include "mpeg4video.h"
|
||||
|
||||
static av_cold void h263_init_rl_inter(void)
|
||||
{
|
||||
static uint8_t h263_rl_inter_table[2][2 * MAX_RUN + MAX_LEVEL + 3];
|
||||
ff_rl_init(&ff_h263_rl_inter, h263_rl_inter_table);
|
||||
}
|
||||
|
||||
av_cold void ff_h263_init_rl_inter(void)
|
||||
{
|
||||
static AVOnce init_static_once = AV_ONCE_INIT;
|
||||
ff_thread_once(&init_static_once, h263_init_rl_inter);
|
||||
}
|
||||
|
||||
void ff_h263_update_motion_val(MpegEncContext * s){
|
||||
const int mb_xy = s->mb_y * s->mb_stride + s->mb_x;
|
||||
|
||||
@@ -66,7 +66,6 @@ int16_t *ff_h263_pred_motion(MpegEncContext * s, int block, int dir,
|
||||
int *px, int *py);
|
||||
void ff_h263_encode_init(MpegEncContext *s);
|
||||
void ff_h263_decode_init_vlc(void);
|
||||
void ff_h263_init_rl_inter(void);
|
||||
int ff_h263_decode_picture_header(MpegEncContext *s);
|
||||
int ff_h263_decode_gob_header(MpegEncContext *s);
|
||||
void ff_h263_update_motion_val(MpegEncContext * s);
|
||||
@@ -100,16 +99,15 @@ void ff_h263_encode_motion(PutBitContext *pb, int val, int f_code);
|
||||
|
||||
|
||||
static inline int h263_get_motion_length(int val, int f_code){
|
||||
int bit_size, code, sign;
|
||||
int l, bit_size, code;
|
||||
|
||||
if (val == 0) {
|
||||
return ff_mvtab[0][1];
|
||||
} else {
|
||||
bit_size = f_code - 1;
|
||||
/* modulo encoding */
|
||||
val = sign_extend(val, 6 + bit_size);
|
||||
sign = val >> 31;
|
||||
val = (val ^ sign) - sign; /* val = FFABS(val) */
|
||||
l= INT_BIT - 6 - bit_size;
|
||||
val = (val<<l)>>l;
|
||||
val--;
|
||||
code = (val >> bit_size) + 1;
|
||||
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#include "libavutil/thread.h"
|
||||
|
||||
#include "h263data.h"
|
||||
#include "mpegvideo.h"
|
||||
|
||||
@@ -288,3 +290,15 @@ const AVRational ff_h263_pixel_aspect[16] = {
|
||||
{ 0, 1 },
|
||||
{ 0, 1 },
|
||||
};
|
||||
|
||||
static av_cold void h263_init_rl_inter(void)
|
||||
{
|
||||
static uint8_t h263_rl_inter_table[2][2 * MAX_RUN + MAX_LEVEL + 3];
|
||||
ff_rl_init(&ff_h263_rl_inter, h263_rl_inter_table);
|
||||
}
|
||||
|
||||
av_cold void ff_h263_init_rl_inter(void)
|
||||
{
|
||||
static AVOnce init_static_once = AV_ONCE_INIT;
|
||||
ff_thread_once(&init_static_once, h263_init_rl_inter);
|
||||
}
|
||||
|
||||
@@ -61,6 +61,7 @@ extern const int8_t ff_inter_run[102];
|
||||
|
||||
extern RLTable ff_h263_rl_inter;
|
||||
extern RLTable ff_rl_intra_aic;
|
||||
void ff_h263_init_rl_inter(void);
|
||||
|
||||
extern const uint16_t ff_h263_format[8][2];
|
||||
|
||||
|
||||
@@ -545,8 +545,6 @@ retry:
|
||||
avctx->has_b_frames = !s->low_delay;
|
||||
|
||||
if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) {
|
||||
if (s->pict_type != AV_PICTURE_TYPE_B && s->mb_num/2 > get_bits_left(&s->gb))
|
||||
return AVERROR_INVALIDDATA;
|
||||
if (ff_mpeg4_workaround_bugs(avctx) == 1)
|
||||
goto retry;
|
||||
if (s->studio_profile != (s->idsp.idct == NULL))
|
||||
@@ -773,7 +771,7 @@ AVCodec ff_h263_decoder = {
|
||||
.decode = ff_h263_decode_frame,
|
||||
.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
|
||||
AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY,
|
||||
.caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
|
||||
.caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP,
|
||||
.flush = ff_mpeg_flush,
|
||||
.max_lowres = 3,
|
||||
.pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
|
||||
@@ -791,7 +789,7 @@ AVCodec ff_h263p_decoder = {
|
||||
.decode = ff_h263_decode_frame,
|
||||
.capabilities = AV_CODEC_CAP_DRAW_HORIZ_BAND | AV_CODEC_CAP_DR1 |
|
||||
AV_CODEC_CAP_TRUNCATED | AV_CODEC_CAP_DELAY,
|
||||
.caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
|
||||
.caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_CLEANUP,
|
||||
.flush = ff_mpeg_flush,
|
||||
.max_lowres = 3,
|
||||
.pix_fmts = ff_h263_hwaccel_pixfmt_list_420,
|
||||
|
||||
@@ -466,7 +466,7 @@ static int h264_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt,
|
||||
if (ctx->aud == BSF_ELEMENT_REMOVE)
|
||||
ff_cbs_delete_unit(au, 0);
|
||||
} else {
|
||||
if (pkt && ctx->aud == BSF_ELEMENT_INSERT) {
|
||||
if (ctx->aud == BSF_ELEMENT_INSERT) {
|
||||
err = h264_metadata_insert_aud(bsf, au);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
@@ -304,8 +304,9 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
|
||||
if (dst == src)
|
||||
return 0;
|
||||
|
||||
if (inited && !h1->ps.sps)
|
||||
return AVERROR_INVALIDDATA;
|
||||
// We can't fail if SPS isn't set at it breaks current skip_frame code
|
||||
//if (!h1->ps.sps)
|
||||
// return AVERROR_INVALIDDATA;
|
||||
|
||||
if (inited &&
|
||||
(h->width != h1->width ||
|
||||
@@ -921,11 +922,6 @@ static int h264_slice_header_init(H264Context *h)
|
||||
const SPS *sps = h->ps.sps;
|
||||
int i, ret;
|
||||
|
||||
if (!sps) {
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
ff_set_sar(h->avctx, sps->sar);
|
||||
av_pix_fmt_get_chroma_sub_sample(h->avctx->pix_fmt,
|
||||
&h->chroma_x_shift, &h->chroma_y_shift);
|
||||
@@ -1831,8 +1827,6 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
|
||||
if (nal->type == H264_NAL_IDR_SLICE)
|
||||
get_ue_golomb_long(&sl->gb); /* idr_pic_id */
|
||||
|
||||
sl->poc_lsb = 0;
|
||||
sl->delta_poc_bottom = 0;
|
||||
if (sps->poc_type == 0) {
|
||||
sl->poc_lsb = get_bits(&sl->gb, sps->log2_max_poc_lsb);
|
||||
|
||||
@@ -1840,7 +1834,6 @@ static int h264_slice_header_parse(const H264Context *h, H264SliceContext *sl,
|
||||
sl->delta_poc_bottom = get_se_golomb(&sl->gb);
|
||||
}
|
||||
|
||||
sl->delta_poc[0] = sl->delta_poc[1] = 0;
|
||||
if (sps->poc_type == 1 && !sps->delta_pic_order_always_zero_flag) {
|
||||
sl->delta_poc[0] = get_se_golomb(&sl->gb);
|
||||
|
||||
|
||||
@@ -654,10 +654,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
|
||||
avpriv_request_sample(avctx, "data partitioning");
|
||||
break;
|
||||
case H264_NAL_SEI:
|
||||
if (h->setup_finished) {
|
||||
avpriv_request_sample(avctx, "Late SEI");
|
||||
break;
|
||||
}
|
||||
ret = ff_h264_sei_decode(&h->sei, &nal->gb, &h->ps, avctx);
|
||||
h->has_recovery_point = h->has_recovery_point || h->sei.recovery_point.recovery_frame_cnt != -1;
|
||||
if (avctx->debug & FF_DEBUG_GREEN_MD)
|
||||
@@ -918,7 +914,7 @@ static int finalize_frame(H264Context *h, AVFrame *dst, H264Picture *out, int *g
|
||||
out->qscale_table,
|
||||
out->motion_val,
|
||||
NULL,
|
||||
out->mb_width, out->mb_height, out->mb_stride, 1);
|
||||
h->mb_width, h->mb_height, h->mb_stride, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -335,7 +335,7 @@ static int h265_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt,
|
||||
int err, i;
|
||||
|
||||
// If an AUD is present, it must be the first NAL unit.
|
||||
if (au->nb_units && au->units[0].type == HEVC_NAL_AUD) {
|
||||
if (au->units[0].type == HEVC_NAL_AUD) {
|
||||
if (ctx->aud == BSF_ELEMENT_REMOVE)
|
||||
ff_cbs_delete_unit(au, 0);
|
||||
} else {
|
||||
|
||||
@@ -145,22 +145,11 @@ int i, j;
|
||||
|
||||
if (((intptr_t)dst | (intptr_t)src | stride_dst | stride_src) & 15) {
|
||||
for (i = 0; i < height; i++) {
|
||||
for (j = 0; j < width - 7; j+=8)
|
||||
for (j = 0; j < width; j+=8)
|
||||
AV_COPY64U(dst+j, src+j);
|
||||
dst += stride_dst;
|
||||
src += stride_src;
|
||||
}
|
||||
if (width&7) {
|
||||
dst += ((width>>3)<<3) - stride_dst * height;
|
||||
src += ((width>>3)<<3) - stride_src * height;
|
||||
width &= 7;
|
||||
for (i = 0; i < height; i++) {
|
||||
for (j = 0; j < width; j++)
|
||||
dst[j] = src[j];
|
||||
dst += stride_dst;
|
||||
src += stride_src;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < height; i++) {
|
||||
for (j = 0; j < width; j+=16)
|
||||
|
||||
@@ -386,7 +386,7 @@ static int decode_nal_sei_timecode(HEVCSEITimeCode *s, GetBitContext *gb)
|
||||
|
||||
s->time_offset_length[i] = get_bits(gb, 5);
|
||||
if (s->time_offset_length[i] > 0) {
|
||||
s->time_offset_value[i] = get_bits_long(gb, s->time_offset_length[i]);
|
||||
s->time_offset_value[i] = get_bits(gb, s->time_offset_length[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3338,7 +3338,7 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
|
||||
}
|
||||
} else {
|
||||
/* verify the SEI checksum */
|
||||
if (avctx->err_recognition & AV_EF_CRCCHECK && s->ref && s->is_decoded &&
|
||||
if (avctx->err_recognition & AV_EF_CRCCHECK && s->is_decoded &&
|
||||
s->sei.picture_hash.is_md5) {
|
||||
ret = verify_md5(s, s->ref->frame);
|
||||
if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) {
|
||||
|
||||
@@ -313,7 +313,7 @@ static void FUNC(sao_band_filter)(uint8_t *_dst, uint8_t *_src,
|
||||
offset_table[(k + sao_left_class) & 31] = sao_offset_val[k + 1];
|
||||
for (y = 0; y < height; y++) {
|
||||
for (x = 0; x < width; x++)
|
||||
dst[x] = av_clip_pixel(src[x] + offset_table[(src[x] >> shift) & 31]);
|
||||
dst[x] = av_clip_pixel(src[x] + offset_table[src[x] >> shift]);
|
||||
dst += stride_dst;
|
||||
src += stride_src;
|
||||
}
|
||||
|
||||
@@ -1848,8 +1848,7 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
buf += s->planesize;
|
||||
}
|
||||
}
|
||||
if (avctx->pix_fmt == AV_PIX_FMT_PAL8)
|
||||
memcpy(frame->data[1], s->pal, 256 * 4);
|
||||
memcpy(frame->data[1], s->pal, 256 * 4);
|
||||
} else if (s->ham) {
|
||||
int i, count = 1 << s->ham;
|
||||
|
||||
|
||||
@@ -78,11 +78,6 @@
|
||||
* Codec handles avctx->thread_count == 0 (auto) internally.
|
||||
*/
|
||||
#define FF_CODEC_CAP_AUTO_THREADS (1 << 7)
|
||||
/**
|
||||
* Codec handles output frame properties internally instead of letting the
|
||||
* internal logic derive them from AVCodecInternal.last_pkt_props.
|
||||
*/
|
||||
#define FF_CODEC_CAP_SETS_FRAME_PROPS (1 << 8)
|
||||
|
||||
/**
|
||||
* AVCodec.codec_tags termination value
|
||||
|
||||
@@ -1679,7 +1679,7 @@ static int parse_layer_rates(Jpeg2000EncoderContext *s)
|
||||
}
|
||||
|
||||
token = av_strtok(s->lr_str, ",", &saveptr);
|
||||
if (token && (rate = strtol(token, NULL, 10))) {
|
||||
if (rate = strtol(token, NULL, 10)) {
|
||||
s->layer_rates[0] = rate <= 1 ? 0:rate;
|
||||
nlayers++;
|
||||
} else {
|
||||
|
||||
@@ -2361,8 +2361,6 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
|
||||
atom_size >= 16) {
|
||||
uint32_t atom2_size, atom2, atom2_end;
|
||||
do {
|
||||
if (bytestream2_get_bytes_left(&s->g) < 8)
|
||||
break;
|
||||
atom2_size = bytestream2_get_be32u(&s->g);
|
||||
atom2 = bytestream2_get_be32u(&s->g);
|
||||
atom2_end = bytestream2_tell(&s->g) + atom2_size - 8;
|
||||
|
||||
@@ -67,7 +67,7 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
|
||||
s->t3 = get_bits(&s->gb, 16);
|
||||
s->reset = get_bits(&s->gb, 16);
|
||||
|
||||
if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
|
||||
if(s->avctx->debug & FF_DEBUG_PICT_INFO) {
|
||||
av_log(s->avctx, AV_LOG_DEBUG, "Coding parameters maxval:%d T1:%d T2:%d T3:%d reset:%d\n",
|
||||
s->maxval, s->t1, s->t2, s->t3, s->reset);
|
||||
}
|
||||
@@ -96,7 +96,7 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
|
||||
else
|
||||
maxtab = 65530/wt - 1;
|
||||
|
||||
if (s->avctx->debug & FF_DEBUG_PICT_INFO) {
|
||||
if(s->avctx->debug & FF_DEBUG_PICT_INFO) {
|
||||
av_log(s->avctx, AV_LOG_DEBUG, "LSE palette %d tid:%d wt:%d maxtab:%d\n", id, tid, wt, maxtab);
|
||||
}
|
||||
if (maxtab >= 256) {
|
||||
@@ -122,7 +122,7 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
|
||||
s->avctx->pix_fmt = AV_PIX_FMT_PAL8;
|
||||
for (i=s->palette_index; i<=maxtab; i++) {
|
||||
uint8_t k = i << shift;
|
||||
pal[k] = wt < 4 ? 0xFF000000 : 0;
|
||||
pal[k] = 0;
|
||||
for (j=0; j<wt; j++) {
|
||||
pal[k] |= get_bits(&s->gb, 8) << (8*(wt-j-1));
|
||||
}
|
||||
@@ -186,7 +186,7 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state,
|
||||
if (RItype)
|
||||
temp += state->N[Q] >> 1;
|
||||
|
||||
for (k = 0; ((unsigned)state->N[Q] << k) < temp; k++)
|
||||
for (k = 0; (state->N[Q] << k) < temp; k++)
|
||||
;
|
||||
|
||||
#ifdef JLS_BROKEN
|
||||
@@ -195,8 +195,6 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state,
|
||||
#endif
|
||||
ret = get_ur_golomb_jpegls(gb, k, state->limit - limit_add - 1,
|
||||
state->qbpp);
|
||||
if (ret < 0)
|
||||
return -0x10000;
|
||||
|
||||
/* decode mapped error */
|
||||
map = 0;
|
||||
@@ -211,7 +209,7 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state,
|
||||
ret = ret >> 1;
|
||||
}
|
||||
|
||||
if (FFABS(ret) > 0xFFFF)
|
||||
if(FFABS(ret) > 0xFFFF)
|
||||
return -0x10000;
|
||||
/* update state */
|
||||
state->A[Q] += FFABS(ret) - RItype;
|
||||
@@ -478,19 +476,19 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
|
||||
for (i = 0; i < s->height; i++) {
|
||||
switch(s->xfrm) {
|
||||
case 1:
|
||||
for (x = off; x + 2 < w; x += 3) {
|
||||
for (x = off; x < w; x += 3) {
|
||||
src[x ] += src[x+1] + 128;
|
||||
src[x+2] += src[x+1] + 128;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
for (x = off; x + 2 < w; x += 3) {
|
||||
for (x = off; x < w; x += 3) {
|
||||
src[x ] += src[x+1] + 128;
|
||||
src[x+2] += ((src[x ] + src[x+1])>>1) + 128;
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
for (x = off; x + 2 < w; x += 3) {
|
||||
for (x = off; x < w; x += 3) {
|
||||
int g = src[x+0] - ((src[x+2]+src[x+1])>>2) + 64;
|
||||
src[x+0] = src[x+2] + g + 128;
|
||||
src[x+2] = src[x+1] + g + 128;
|
||||
@@ -498,7 +496,7 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
for (x = off; x + 2 < w; x += 3) {
|
||||
for (x = off; x < w; x += 3) {
|
||||
int r = src[x+0] - (( 359 * (src[x+2]-128) + 490) >> 8);
|
||||
int g = src[x+0] - (( 88 * (src[x+1]-128) - 183 * (src[x+2]-128) + 30) >> 8);
|
||||
int b = src[x+0] + ((454 * (src[x+1]-128) + 574) >> 8);
|
||||
|
||||
@@ -408,9 +408,6 @@ output_zeros:
|
||||
if (zero_run) {
|
||||
zero_run = 0;
|
||||
i += esc_count;
|
||||
if (i > end - dst ||
|
||||
i >= src_end - src)
|
||||
return AVERROR_INVALIDDATA;
|
||||
memcpy(dst, src, i);
|
||||
dst += i;
|
||||
l->zeros_rem = lag_calc_zero_run(src[i]);
|
||||
|
||||
@@ -173,7 +173,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
|
||||
int uqvq, ret;
|
||||
unsigned int mthread_inlen, mthread_outlen;
|
||||
unsigned int len = buf_size;
|
||||
int linesize, offset;
|
||||
int linesize;
|
||||
|
||||
if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0)
|
||||
return ret;
|
||||
@@ -373,10 +373,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
|
||||
|
||||
/* Convert colorspace */
|
||||
y_out = frame->data[0] + (height - 1) * frame->linesize[0];
|
||||
offset = (height - 1) * frame->linesize[1];
|
||||
u_out = FF_PTR_ADD(frame->data[1], offset);
|
||||
offset = (height - 1) * frame->linesize[2];
|
||||
v_out = FF_PTR_ADD(frame->data[2], offset);
|
||||
u_out = frame->data[1] + (height - 1) * frame->linesize[1];
|
||||
v_out = frame->data[2] + (height - 1) * frame->linesize[2];
|
||||
switch (c->imgtype) {
|
||||
case IMGTYPE_YUV111:
|
||||
for (row = 0; row < height; row++) {
|
||||
|
||||
@@ -33,9 +33,6 @@
|
||||
#include "decode.h"
|
||||
#include "internal.h"
|
||||
|
||||
#define FF_DAV1D_VERSION_AT_LEAST(x,y) \
|
||||
(DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y))
|
||||
|
||||
typedef struct Libdav1dContext {
|
||||
AVClass *class;
|
||||
Dav1dContext *c;
|
||||
@@ -127,11 +124,7 @@ static av_cold int libdav1d_init(AVCodecContext *c)
|
||||
{
|
||||
Libdav1dContext *dav1d = c->priv_data;
|
||||
Dav1dSettings s;
|
||||
#if FF_DAV1D_VERSION_AT_LEAST(6,0)
|
||||
int threads = c->thread_count;
|
||||
#else
|
||||
int threads = (c->thread_count ? c->thread_count : av_cpu_count()) * 3 / 2;
|
||||
#endif
|
||||
int res;
|
||||
|
||||
av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version());
|
||||
@@ -152,15 +145,6 @@ static av_cold int libdav1d_init(AVCodecContext *c)
|
||||
if (dav1d->operating_point >= 0)
|
||||
s.operating_point = dav1d->operating_point;
|
||||
|
||||
#if FF_DAV1D_VERSION_AT_LEAST(6,0)
|
||||
if (dav1d->frame_threads || dav1d->tile_threads)
|
||||
s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads);
|
||||
else
|
||||
s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS);
|
||||
s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : 0;
|
||||
av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n",
|
||||
s.n_threads, s.max_frame_delay);
|
||||
#else
|
||||
s.n_tile_threads = dav1d->tile_threads
|
||||
? dav1d->tile_threads
|
||||
: FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
|
||||
@@ -169,7 +153,6 @@ static av_cold int libdav1d_init(AVCodecContext *c)
|
||||
: FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
|
||||
av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n",
|
||||
s.n_frame_threads, s.n_tile_threads);
|
||||
#endif
|
||||
|
||||
res = dav1d_open(&dav1d->c, &s);
|
||||
if (res < 0)
|
||||
@@ -248,10 +231,8 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
|
||||
if (res < 0) {
|
||||
if (res == AVERROR(EINVAL))
|
||||
res = AVERROR_INVALIDDATA;
|
||||
if (res != AVERROR(EAGAIN)) {
|
||||
dav1d_data_unref(data);
|
||||
if (res != AVERROR(EAGAIN))
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
res = dav1d_get_picture(dav1d->c, p);
|
||||
@@ -475,13 +456,6 @@ static av_cold int libdav1d_close(AVCodecContext *c)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifndef DAV1D_MAX_FRAME_THREADS
|
||||
#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS
|
||||
#endif
|
||||
#ifndef DAV1D_MAX_TILE_THREADS
|
||||
#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS
|
||||
#endif
|
||||
|
||||
#define OFFSET(x) offsetof(Libdav1dContext, x)
|
||||
#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
|
||||
static const AVOption libdav1d_options[] = {
|
||||
|
||||
@@ -210,19 +210,13 @@ static int libkvazaar_encode(AVCodecContext *avctx,
|
||||
|
||||
// Copy pixels from frame to input_pic.
|
||||
{
|
||||
uint8_t *dst[4] = {
|
||||
input_pic->data[0],
|
||||
input_pic->data[1],
|
||||
input_pic->data[2],
|
||||
NULL,
|
||||
};
|
||||
int dst_linesizes[4] = {
|
||||
frame->width,
|
||||
frame->width / 2,
|
||||
frame->width / 2,
|
||||
0
|
||||
};
|
||||
av_image_copy(dst, dst_linesizes,
|
||||
av_image_copy(input_pic->data, dst_linesizes,
|
||||
(const uint8_t **)frame->data, frame->linesize,
|
||||
frame->format, frame->width, frame->height);
|
||||
}
|
||||
|
||||
@@ -91,8 +91,8 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data,
|
||||
{
|
||||
SVCContext *s = avctx->priv_data;
|
||||
SBufferInfo info = { 0 };
|
||||
uint8_t *ptrs[4] = { NULL };
|
||||
int ret, linesize[4];
|
||||
uint8_t* ptrs[3];
|
||||
int ret, linesize[3];
|
||||
AVFrame *avframe = data;
|
||||
DECODING_STATE state;
|
||||
#if OPENH264_VER_AT_LEAST(1, 7)
|
||||
@@ -140,7 +140,6 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data,
|
||||
|
||||
linesize[0] = info.UsrData.sSystemBuffer.iStride[0];
|
||||
linesize[1] = linesize[2] = info.UsrData.sSystemBuffer.iStride[1];
|
||||
linesize[3] = 0;
|
||||
av_image_copy(avframe->data, avframe->linesize, (const uint8_t **) ptrs, linesize, avctx->pix_fmt, avctx->width, avctx->height);
|
||||
|
||||
avframe->pts = info.uiOutYuvTimeStamp;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user