diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-12 13:24:27 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-12 13:26:52 +0200 |
| commit | 1534ef87c74cc66a117bf61c467641c2129bc964 (patch) | |
| tree | 68e36bf8432b8a5bd1cd9cc6187d874e0978b1a4 /libavcodec/videotoolbox.c | |
| parent | 1a57b464cf1687d4571a075c99b6ac36a60f4480 (diff) | |
| parent | 3176217c60ca7828712985092d9102d331ea4f3d (diff) | |
| download | ffmpeg-1534ef87c74cc66a117bf61c467641c2129bc964.tar.gz | |
Merge commit '3176217c60ca7828712985092d9102d331ea4f3d'
* 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>
Diffstat (limited to 'libavcodec/videotoolbox.c')
| -rw-r--r-- | libavcodec/videotoolbox.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index 2f4d531601..4dc843dd27 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -84,7 +84,7 @@ CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx) H264Context *h = avctx->priv_data; CFDataRef data = NULL; uint8_t *p; - int vt_extradata_size = 6 + 3 + h->sps.data_size + 4 + h->pps.data_size; + int vt_extradata_size = 6 + 3 + h->ps.sps->data_size + 4 + h->ps.sps->data_size; uint8_t *vt_extradata = av_malloc(vt_extradata_size); if (!vt_extradata) return NULL; @@ -92,15 +92,15 @@ CFDataRef ff_videotoolbox_avcc_extradata_create(AVCodecContext *avctx) p = vt_extradata; AV_W8(p + 0, 1); /* version */ - AV_W8(p + 1, h->sps.data[0]); /* profile */ - AV_W8(p + 2, h->sps.data[1]); /* profile compat */ - AV_W8(p + 3, h->sps.data[2]); /* level */ + AV_W8(p + 1, h->ps.sps->data[0]); /* profile */ + AV_W8(p + 2, h->ps.sps->data[1]); /* profile compat */ + AV_W8(p + 3, h->ps.sps->data[2]); /* level */ AV_W8(p + 4, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 3 (11) */ AV_W8(p + 5, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */ - AV_WB16(p + 6, h->sps.data_size + 1); + AV_WB16(p + 6, h->ps.sps->data_size + 1); AV_W8(p + 8, NAL_SPS | (3 << 5)); // NAL unit header - memcpy(p + 9, h->sps.data, h->sps.data_size); - p += 9 + h->sps.data_size; + memcpy(p + 9, h->ps.sps->data, h->ps.sps->data_size); + p += 9 + h->ps.sps->data_size; AV_W8(p + 0, 1); /* number of pps */ AV_WB16(p + 1, h->pps.data_size + 1); AV_W8(p + 3, NAL_PPS | (3 << 5)); // NAL unit header |