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_slice.c
AgeCommit message (Collapse)Author
2016-08-04Merge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857'Timothy Gu
* commit '58640fe89ec4f2a3d67c0a2585fca8de34440857': h264: handle frame recovery in h264_field_start() Conflicts: libavcodec/h264dec.c Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-04Merge commit 'e26c64148be8a20ace7512d96503172fb5e9753b'Timothy Gu
* commit 'e26c64148be8a20ace7512d96503172fb5e9753b': h264: discard slices of redundant pictures right after parsing the slice header Conflicts: libavcodec/h264_slice.c libavcodec/h264dec.c TODO: fix indentation Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-04Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'Timothy Gu
* commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0': h264: always set redundant_pic_count during slice header parsing Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-04Revert "Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'""Timothy Gu
This reverts commit e4af9be0f45c8f2ca148fb971f1e0c6782530e8c and redoes 796027f22154c799e0063e2457b31e0cfd1dddae. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-04Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"Timothy Gu
This reverts commit 796027f22154c799e0063e2457b31e0cfd1dddae, reversing changes made to bca30ed2b67f095fd31e07319a622ac30ad22978. Preemptive revert before further testing has been done.
2016-08-04Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'Timothy Gu
* commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22': h264: fix the check for mixed IDR/non-IDR slices Conflicts: libavcodec/h264_slice.c libavcodec/h264dec.c Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-04Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'Timothy Gu
* commit 'b13fc1e344011949929975a3451f78f226aa1de3': h264: do not pass H264Context to h264_slice_header_parse() Conflicts: libavcodec/h264dec.h Did not merge the h264_slice_header_parse() part. We use a few other members of H264Context for error checking in that function. Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-02Merge commit '996f13413b0415097e2a184d161462ffb3ceb647'James Almer
* commit '996f13413b0415097e2a184d161462ffb3ceb647': h264: fix warnings in fill_filter_caches_inter() Conflicts: libavcodec/h264_slice.c See ef8f6464a55db730cab8c48a1a51fa4e6ca12107 Merged-by: James Almer <jamrial@gmail.com>
2016-08-02Merge commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1'James Almer
* commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1': h264: drop tests whether the codec id is AV_CODEC_ID_H264 Conflicts: libavcodec/h264dec.c Merged-by: James Almer <jamrial@gmail.com>
2016-08-01Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c'James Almer
* commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c': h264: add H264_ prefix to the NAL unit types Conflicts: libavcodec/h264_parse.c libavcodec/h264_parser.c libavcodec/h264_slice.c libavcodec/h264dec.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 '251cbb44003caf179fb17afbb8a6c56643c2a646'Clément Bœsch
* commit '251cbb44003caf179fb17afbb8a6c56643c2a646': h264: create a new header for common h264 definitions Merged-by: Clément Bœsch <u@pkh.me>
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-29Merge commit 'f651c6a259d4bc78f25db11d25df9256d5110bd3'Clément Bœsch
* commit 'f651c6a259d4bc78f25db11d25df9256d5110bd3': h264: factor out setting frame properties / side data Merged-by: Clément Bœsch <u@pkh.me>
2016-07-29Merge commit 'bcd91f1644b46dd142c5355c8b742b27d9028903'Clément Bœsch
* commit 'bcd91f1644b46dd142c5355c8b742b27d9028903': h264: move a per-field block from decode_slice_header() to field_start() Merged-by: Clément Bœsch <u@pkh.me>
2016-07-27avcodec/h264_slice: Make setup_finished check cover more casesMichael Niedermayer
2016-07-27Merge commit 'debca90863e4ee53447efd02483c500f89766384'Clément Bœsch
* commit 'debca90863e4ee53447efd02483c500f89766384': h264: store {curr,max}_pic_num in the per-slice context Merged-by: Clément Bœsch <u@pkh.me>
2016-07-27Merge commit 'f966498e433fead2f5e6b5b66fad2ac062146d22'Clément Bœsch
* commit 'f966498e433fead2f5e6b5b66fad2ac062146d22': h264: decode the poc values from the slice header into the per-slice context Merged-by: Clément Bœsch <u@pkh.me>
2016-07-27lavc/h264_slice: adjust a few line breaks to reduce diff with LibavClément Bœsch
2016-07-27Merge commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b'Clément Bœsch
* commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b': h264: set mb_aff_frame in frame_start() h264: move the block starting a new field out of slice_header_parse() Both commits are merged at the same time in order to prevent a regression with Ticket #4440 (see 38660128). Merged-by: Clément Bœsch <u@pkh.me>
2016-07-20avcodec/h264_slice: Move h264_init_ps() call into h264_field_start()Michael Niedermayer
This was missing from f512e4a39037ef798ec78170f734c7733abe3231 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-14Merge commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc'Clément Bœsch
* commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc': h264: pass a H2645NAL to slice header decoding Merged-by: Clément Bœsch <u@pkh.me>
2016-07-09Merge commit '61f168ae348f94f39e7afc6971654455a5de0e4d'Clément Bœsch
* commit '61f168ae348f94f39e7afc6971654455a5de0e4d': h264: factor out setting the parameter sets for a frame Michael's changes on top of the merge undo parts of the original diff that are not factorization: "The call point is left where it was before. Such a change should be in a separate commit and has multiple issues, one being null pointer dereferences the other is that some safety checks would become conditional. I tried to split the PPS init between the new and old functions similarly to the SPS code." Merged-by: Clément Bœsch <u@pkh.me> Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-03lavc/h264_slice: use sps directly when checking for invalid 8x8 inferenceClément Bœsch
2016-07-01avcodec/h264_slice: Only call ff_h264_flush_change() on initialized contextsJames Almer
Changed by committer to ensure context_initialized is reset Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-01Merge commit '6e92181bf836f48627a4733b6fd240a99fd36365'Clément Bœsch
* commit '6e92181bf836f48627a4733b6fd240a99fd36365': h264: pass just the PPS to get_chroma_qp() Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-07-01Merge commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf'Clément Bœsch
* commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf': h264: merge the two reinit blocks in slice_header_parse() Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-07-01Merge commit '3fba16ecd978d5bed338b8da643c3435e62b3437'Clément Bœsch
* commit '3fba16ecd978d5bed338b8da643c3435e62b3437': h264: factor starting a new field out of parsing the slice header Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-30Merge commit 'bec993381cfec72051b0d9f12ac9d9bb9c750983'Clément Bœsch
* commit 'bec993381cfec72051b0d9f12ac9d9bb9c750983': h264: postpone generating the implicit MMCOs Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-30Merge commit '2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85'Clément Bœsch
* commit '2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85': h264: decode the MMCOs into per-slice contexts Merged-by: Clément Bœsch <clement@stupeflix.com>
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-29Merge commit '39ab2ea53121b9976a619cd545fbd3464b908696'Clément Bœsch
* commit '39ab2ea53121b9976a619cd545fbd3464b908696': h264: rename mmco_index to nb_mmco Merged-by: Clément Bœsch <u@pkh.me>
2016-06-29Merge commit '7ab5d577a9affe3397c08b032f983f9bf7101865'Clément Bœsch
* commit '7ab5d577a9affe3397c08b032f983f9bf7101865': h264: move initializing the slice start out of h264_slice_header_parse() Merged-by: Clément Bœsch <u@pkh.me>
2016-06-29Merge commit '4cec43a9eeb58eb9e581a2d9d25f78e5bfbb0960'Clément Bœsch
* commit '4cec43a9eeb58eb9e581a2d9d25f78e5bfbb0960': h264: move calculating the POC out of h264_slice_header_parse() Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29Merge commit '6dd996c7c81575a1e4969987ab175a6df7beab3d'Clément Bœsch
* commit '6dd996c7c81575a1e4969987ab175a6df7beab3d': h264: move building the reference list out of h264_slice_header_parse() Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29Merge commit '0bad254300356005af4aef00a706bf2e8eee96bc'Clément Bœsch
* commit '0bad254300356005af4aef00a706bf2e8eee96bc': h264: move initing the implicit pred weight table out of h264_slice_header_parse() Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29Merge commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c' into merge-libav-newClément Bœsch
* commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c': h264: split reading the ref list modifications and actually building the ref list ref_modifications.val are read as u32 instead of u8 in FFmpeg. Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29lavc/h264_slice: properly forward positive "error" codeClément Bœsch
Fixes ./ffmpeg -skip_frame nokey -i h264/h264_intra_first-small.ts Regression since c54e2740e1f4a8fb7fa4e521755bf4158c4cda51
2016-06-29Merge commit 'fa57059079190242517701120cfdccad93c866da'Clément Bœsch
* commit 'fa57059079190242517701120cfdccad93c866da': h264: move initialising the implicit pred weight table for MBAFF Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29Merge commit '7b50d60442af8d9527e9da46818011fe15a5265a'Clément Bœsch
* commit '7b50d60442af8d9527e9da46818011fe15a5265a': h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29Merge commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e'Clément Bœsch
* commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e': h264: move direct mode inits out of h264_slice_header_parse() Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29Merge commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74'Clément Bœsch
* commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74': h264: start splitting decode_slice_header() Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-29avcodec/h264: Remove au_pps_idMichael Niedermayer
This should not be needed anymore and simplifies the next merge Requested-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-29avcodec/h264: Remove current_sps_idMichael Niedermayer
This should not be needed anymore and simplifies the next merge Requested-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
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: handle frame recovery in h264_field_start()Anton Khirnov
This is a more appropriate place for this. H264Context.recovery_frame is shared between frame threads, so modifying it where it is right now is invalid.
2016-06-21h264: discard slices of redundant pictures right after parsing the slice headerAnton Khirnov
Going through the whole decoder initialization process for a slice we are not going to decode is unnecessary and potentially dangerous.
2016-06-21h264: always set redundant_pic_count during slice header parsingAnton Khirnov
It is always checked in the surrounding code, so this make sure we don't see a value from an old slice.
2016-06-21h264: call the hwaccel frame_start() from h264_field_start()Anton Khirnov
This is a more appropriate place for it.
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-11 08:25:31 +0300