| @@ -27,11 +27,13 @@ · 26 unmodified lines |
| 27 | 27 | #include "libavutil/mem.h" |
| 28 | 28 | #include "avcodec.h" |
| 29 | 29 | #include "codec_par.h" |
| 30 | +#include "packet.h" |
| 30 | 31 | |
| 31 | 32 | static void codec_parameters_reset(AVCodecParameters *par) |
| 32 | 33 | { |
| 33 | 34 | av_freep(&par->extradata); |
| 34 | 35 | av_channel_layout_uninit(&par->ch_layout); |
| 36 | + av_packet_side_data_free(&par->coded_side_data, &par->nb_coded_side_data); |
| 35 | 37 | |
| 36 | 38 | memset(par, 0, sizeof(*par)); |
| 37 | 39 | |
| @@ -72,6 +74,35 @@ void avcodec_parameters_free(AVCodecParameters **ppar) · 34 unmodified lines |
| 72 | 74 | av_freep(ppar); |
| 73 | 75 | } |
| 74 | 76 | |
| 77 | +static int codec_parameters_copy_side_data(AVPacketSideData **pdst, int *pnb_dst, |
| 78 | + const AVPacketSideData *src, int nb_src) |
| 79 | +{ |
| 80 | + AVPacketSideData *dst; |
| 81 | + int nb_dst = *pnb_dst; |
| 82 | + |
| 83 | + if (!src) |
| 84 | + return 0; |
| 85 | + |
| 86 | + *pdst = dst = av_calloc(nb_src, sizeof(*dst)); |
| 87 | + if (!dst) |
| 88 | + return AVERROR(ENOMEM); |
| 89 | + |
| 90 | + for (int i = 0; i < nb_src; i++) { |
| 91 | + const AVPacketSideData *src_sd = &src[i]; |
| 92 | + AVPacketSideData *dst_sd = &dst[i]; |
| 93 | + |
| 94 | + dst_sd->data = av_memdup(src_sd->data, src_sd->size); |
| 95 | + if (!dst_sd->data) |
| 96 | + return AVERROR(ENOMEM); |
| 97 | + |
| 98 | + dst_sd->type = src_sd->type; |
| 99 | + dst_sd->size = src_sd->size; |
| 100 | + *pnb_dst = ++nb_dst; |
| 101 | + } |
| 102 | + |
| 103 | + return 0; |
| 104 | +} |
| 105 | + |
| 75 | 106 | int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src) |
| 76 | 107 | { |
| 77 | 108 | int ret; |
| @@ -82,6 +113,8 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src · 4 unmodified lines |
| 82 | 113 | dst->ch_layout = (AVChannelLayout){0}; |
| 83 | 114 | dst->extradata = NULL; |
| 84 | 115 | dst->extradata_size = 0; |
| 116 | + dst->coded_side_data = NULL; |
| 117 | + dst->nb_coded_side_data = 0; |
| 85 | 118 | if (src->extradata) { |
| 86 | 119 | dst->extradata = av_mallocz(src->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); |
| 87 | 120 | if (!dst->extradata) |
| @@ -89,6 +122,10 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src · 1 unmodified line |
| 89 | 122 | memcpy(dst->extradata, src->extradata, src->extradata_size); |
| 90 | 123 | dst->extradata_size = src->extradata_size; |
| 91 | 124 | } |
| 125 | + ret = codec_parameters_copy_side_data(&dst->coded_side_data, &dst->nb_coded_side_data, |
| 126 | + src->coded_side_data, src->nb_coded_side_data); |
| 127 | + if (ret < 0) |
| 128 | + return ret; |
| 92 | 129 | |
| 93 | 130 | ret = av_channel_layout_copy(&dst->ch_layout, &src->ch_layout); |
| 94 | 131 | if (ret < 0) |
| @@ -178,6 +215,11 @@ FF_ENABLE_DEPRECATION_WARNINGS · 83 unmodified lines |
| 178 | 215 | par->extradata_size = codec->extradata_size; |
| 179 | 216 | } |
| 180 | 217 | |
| 218 | + ret = codec_parameters_copy_side_data(&par->coded_side_data, &par->nb_coded_side_data, |
| 219 | + codec->coded_side_data, codec->nb_coded_side_data); |
| 220 | + if (ret < 0) |
| 221 | + return ret; |
| 222 | + |
| 181 | 223 | return 0; |
| 182 | 224 | } |
| 183 | 225 | |
| @@ -262,5 +304,11 @@ FF_ENABLE_DEPRECATION_WARNINGS · 78 unmodified lines |
| 262 | 304 | codec->extradata_size = par->extradata_size; |
| 263 | 305 | } |
| 264 | 306 | |
| 307 | + av_packet_side_data_free(&codec->coded_side_data, &codec->nb_coded_side_data); |
| 308 | + ret = codec_parameters_copy_side_data(&codec->coded_side_data, &codec->nb_coded_side_data, |
| 309 | + par->coded_side_data, par->nb_coded_side_data); |
| 310 | + if (ret < 0) |
| 311 | + return ret; |
| 312 | + |
| 265 | 313 | return 0; |
| 266 | 314 | } |