Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/h264_ps.c
AgeCommit message (Collapse)Author
2016-08-01Merge commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4'James Almer
* commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4': h264: tighten the valid range for ref_frame_count Conflicts: libavcodec/h264_ps.c Merged-by: James Almer <jamrial@gmail.com>
2016-08-01Merge commit 'f638b67e5790735f34620bf82025c9b9d6fc7216'James Almer
* commit 'f638b67e5790735f34620bf82025c9b9d6fc7216': h264: move the parameter set definitions to a new header file Conflicts: libavcodec/h264_parse.h libavcodec/h264_ps.c libavcodec/h264dec.h Merged-by: James Almer <jamrial@gmail.com>
2016-07-29Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'Clément Bœsch
* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa': h264: rename h264.[ch] to h264dec.[ch] Merged-by: Clément Bœsch <u@pkh.me>
2016-07-24lavc/h264_ps: Be more verbose when truncating likely oversized PPS.Carl Eugen Hoyos
2016-07-09Merge commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703'Clément Bœsch
* commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703': h264: Fix decoding delay for Intra only streams Merged-by: Clément Bœsch <u@pkh.me>
2016-06-30h264: make H264ParamSets sps constBenoit Fouet
2016-06-30h264: straighten dimensions check ff_h264_decode_seq_parameter_setBenoit Fouet
The MBS only flag was not taken into account when checking macroblock dimensions. Also removes the unneeded check in init_dimensions for slices.
2016-06-30h264_ps: change decode_scaling_matrices so that it takes const {s,p}psBenoit Fouet
In order to be able to make SPS const in H264ParamSets, modify decode_scaling_matrices so that it returns if the scaling matrix are present in the SPS, instead of altering the input SPS structure.
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21h264: tighten the valid range for ref_frame_countAnton Khirnov
This field (which the spec calls max_num_ref_frames) must be less than or equal to MaxDpbFrames, which is at most 16.
2016-06-21h264: move the parameter set definitions to a new header fileAnton Khirnov
The PS parsing code is independent from the decoder, so it makes more sense for it to have its own separate header.
2016-06-21h264: rename h264.[ch] to h264dec.[ch]Anton Khirnov
This is more consistent with the naming of other decoders.
2016-06-20lavc/h264_ps: add ff_h264_ps_uninit and use itMatthieu Bouron
2016-06-12h264: Fix decoding delay for Intra only streamsAnton Mitrofanov
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-06-12Merge commit '3176217c60ca7828712985092d9102d331ea4f3d'Clément Bœsch
* commit '3176217c60ca7828712985092d9102d331ea4f3d': h264: decouple h264_ps from the h264 decoder Main changes: - a local GetBitContext is created for the various ff_h264_decode_seq_parameter_set() attempts - just like the old code, remove_sps() is adjusted so it doesn't remove the pps. Fixes decode with Ticket #631 http://ffmpeg.org/pipermail/ffmpeg-user/attachments/20111108/dae58f17/attachment.mp4 but see next point as well. - ff_h264_update_thread_context() is updated to work even when SPS isn't set as it breaks current skip_frame code. This makes sure we can still decode the sample from ticket #631 without the need for -flags2 +chunks. (Thanks to Michael) - keep {sps,pps}_ref pointers that stay alive even when the active pps/sps get removed from the available lists (patch by michaelni with additionnal frees in ff_h264_free_context() from mateo) - added a check on sps in avpriv_h264_has_num_reorder_frames() to fix crashes with mpegts_with_dvbsubs.ts from Ticket #4074 http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket4074/mpegts_with_dvbsubs.ts - in h264_parser.c:h264_parse(), after the ff_h264_decode_extradata() is called, the pps and sps from the local parser context are updated with the pps and sps from the used h264context. This fixes fate-flv-demux. - in h264_slice.c, "PPS changed between slices" error is not triggered anymore in one condition as it makes fate-h264-xavc-4389 fails with THREADS=N (Thanks to Michael) Merged-by: Clément Bœsch <clement@stupeflix.com> Merged-by: Michael Niedermayer <michael@niedermayer.cc> Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-05-03Merge commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe'Derek Buitenhuis
* commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe': svq3: drop the build dependency on the h264 decoder Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24Merge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'Derek Buitenhuis
* commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef': lavc: Deduplicate zigzag_scan table Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24h264: decouple h264_ps from the h264 decoderAnton Khirnov
Make the SPS/PPS parsing independent of the H264Context, to allow decoupling the parser from the decoder. The change is modelled after the one done earlier for HEVC. Move the dequant buffers to the PPS to avoid complex checks whether they changed and an expensive copy for frame threads.
2016-03-28svq3: drop the build dependency on the h264 decoderAnton Khirnov
2016-03-25lavc: Deduplicate zigzag_scan tableDiego Biurrun
2015-12-17Merge commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48'Hendrik Leppkes
* commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48': h264: derive the delay from the level when it's not present Merged without changing the strict_std_compliance check, as it breaks FATE and changes decoding behavior. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-06h264: derive the delay from the level when it's not presentAnton Khirnov
Fall back to maximum DPB size if the level is unknown. This should be more spec-compliant and does not depend on the caller setting has_b_frames before opening the decoder. The old behaviour, when the delay is supplied by the caller setting has_b_frames, can still be obtained by setting strict_std_compliance below normal.
2015-10-03avcodec/h264_ps: Fix copying oversized pps&sps dataMichael Niedermayer
Fixes: https://trac.ffmpeg.org/attachment/ticket/685/movie.264 In the available testcase the actual PPS only uses a few bits while there are 7kbyte of apparently random data after it Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-02avcodec/h264: keep SPS and PPS bitstream datawm4
We assume an upper bound of 4096 bytes for each raw SPS/PPS. It's hard to determine an exact maximum size, but this value was was considered high enough and safe. Needed for the following VideotoolBox commit.
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec flagsVittorio Giovara
Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-20Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'Michael Niedermayer
* commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf': h264_ps: Return meaningful error codes and address a memory leak Conflicts: libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20h264_ps: Return meaningful error codes and address a memory leakVittorio Giovara
Bug-Id: CID 1026763
2015-04-16avcodec/h264_ps: Validate num_units_in_tick/time_scale before setting them ↵Michael Niedermayer
in the context This probably makes no big difference but it is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-16h264: Do not fail on unsupported timing infoVittorio Giovara
The spec madandate both time_scale and num_units_in_tick greater than 0, however since they are not essential for decoding, just ignore the whole block and try to finish parsing the VUI. Related to Ticket4445. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-10avcodec/h264: Do not fail with randomly truncated VUIsMichael Niedermayer
Fixes Ticket4445 Tested-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-08avcodec/h264_ps: Move truncation check from VUI to SPSMichael Niedermayer
This more completely checks for truncation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05Merge commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76'Michael Niedermayer
* commit '84f226a3bcd8b39801a4c9051c033ab7d61aaf76': h264: use the correct SPS during PPS parsing Conflicts: libavcodec/h264_ps.c See: dc35b77b28f40c99d27c073fe2c22219ba600202 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05h264: use the correct SPS during PPS parsingAnton Khirnov
There is in general no reason for the currently active SPS to be the one referenced by the PPS being parsed.
2015-03-21Merge commit 'd8a45d2d49f54fde042b195f9d5859251252493d'Michael Niedermayer
* commit 'd8a45d2d49f54fde042b195f9d5859251252493d': h264_ps: properly check cropping parameters against overflow Conflicts: libavcodec/h264_ps.c See: c3bd306e78f9e3ca2f136f5b30cbe49fa0884f82 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21h264_ps: properly check cropping parameters against overflowAnton Khirnov
CC: libav-stable@libav.org
2015-02-06avcodec/h264_ps: More completely check the bit depthsMichael Niedermayer
Fixes out of array read Fixes: asan_static-oob_30328b6_719_cov_3325483287_H264_artifacts_motion.h264 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30h264_ps: move and export aspect_ratioChristophe Gisquet
Needed for filters that may need it, like an SPS bsf. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-02Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'Michael Niedermayer
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e': More correct printf format specifiers Conflicts: libavcodec/h264_ps.c libavcodec/h264_refs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02More correct printf format specifiersDiego Biurrun
This avoids compiler warnings about argument and specifier type mismatch.
2014-03-22Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer
* commit 'cc8163e1a3601a56f722a4720516e860bf1c6198': avcodec: more correct printf specifiers Conflicts: libavcodec/4xm.c libavcodec/alsdec.c libavcodec/dfa.c libavcodec/h264_ps.c libavcodec/jpeg2000dec.c libavcodec/lagarith.c libavcodec/mpeg12dec.c libavcodec/rv10.c libavcodec/svq3.c libavcodec/wmaprodec.c libavcodec/xwddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22avcodec: more correct printf specifiersDiego Biurrun
2014-03-17Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'Michael Niedermayer
* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27': h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define Conflicts: libavcodec/h264.c libavcodec/h264_ps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private defineVittorio Giovara
2014-03-01Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'Michael Niedermayer
* commit 'ee6280ca12696a67535ce2245c77190edc513794': h264: parse two additional constraint flags Conflicts: libavcodec/h264_ps.c See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-01Merge commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2'n2.3-devMichael Niedermayer
* commit 'e70ab7c1f5005041bba0e4efc1165410f83495b2': h264: add MVCD to the list of High profiles in SPS Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-28h264: parse two additional constraint flagsVittorio Giovara
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 15:03:06 +0300