virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avcodec/h264_slice: use av_buffer_replace() to simplify code

Browse Source 
Based on eff289ce9f.

Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2020-09-28 11:25:41 -03:00
parent 290de64759
commit 0b6541368d
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/h264_slice.c
View File

@ -325,29 +325,22 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
// SPS/PPS
for (i = 0; i < FF_ARRAY_ELEMS(h->ps.sps_list); i++) {
av_buffer_unref(&h->ps.sps_list[i]);
if (h1->ps.sps_list[i]) {
h->ps.sps_list[i] = av_buffer_ref(h1->ps.sps_list[i]);
if (!h->ps.sps_list[i])
return AVERROR(ENOMEM);
}
ret = av_buffer_replace(&h->ps.sps_list[i], h1->ps.sps_list[i]);
if (ret < 0)
return ret;
}
for (i = 0; i < FF_ARRAY_ELEMS(h->ps.pps_list); i++) {
av_buffer_unref(&h->ps.pps_list[i]);
if (h1->ps.pps_list[i]) {
h->ps.pps_list[i] = av_buffer_ref(h1->ps.pps_list[i]);
if (!h->ps.pps_list[i])
return AVERROR(ENOMEM);
}
ret = av_buffer_replace(&h->ps.pps_list[i], h1->ps.pps_list[i]);
if (ret < 0)
return ret;
}
av_buffer_unref(&h->ps.pps_ref);
ret = av_buffer_replace(&h->ps.pps_ref, h1->ps.pps_ref);
if (ret < 0)
return ret;
h->ps.pps = NULL;
h->ps.sps = NULL;
if (h1->ps.pps_ref) {
h->ps.pps_ref = av_buffer_ref(h1->ps.pps_ref);
if (!h->ps.pps_ref)
return AVERROR(ENOMEM);
h->ps.pps = (const PPS*)h->ps.pps_ref->data;
h->ps.sps = h->ps.pps->sps;
}
@ -432,12 +425,9 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
h->frame_recovered = h1->frame_recovered;
av_buffer_unref(&h->sei.a53_caption.buf_ref);
if (h1->sei.a53_caption.buf_ref) {
h->sei.a53_caption.buf_ref = av_buffer_ref(h1->sei.a53_caption.buf_ref);
if (!h->sei.a53_caption.buf_ref)
return AVERROR(ENOMEM);
}
ret = av_buffer_replace(&h->sei.a53_caption.buf_ref, h1->sei.a53_caption.buf_ref);
if (ret < 0)
return ret;
for (i = 0; i < h->sei.unregistered.nb_buf_ref; i++)
av_buffer_unref(&h->sei.unregistered.buf_ref[i]);