diff options
| author | Martin Storsjö <martin@martin.st> | 2015-02-19 22:22:55 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-02-21 11:32:44 +0200 |
| commit | 10e2d8b5562d8729e4eefbcec63a11eb8a0c502c (patch) | |
| tree | 11fd2e0b480f69547288612ab5c76ec2fb1f5236 | |
| parent | 0de07510844517b615ef2a2e2916f6391ad88687 (diff) | |
| download | ffmpeg-10e2d8b5562d8729e4eefbcec63a11eb8a0c502c.tar.gz | |
rtpdec_hevc: Use a shared function for parsing parameter sets
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtpdec_hevc.c | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 3ed7cac8f6..13df942cc7 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -25,6 +25,7 @@ #include "avformat.h" #include "rtpdec.h" +#include "rtpdec_formats.h" #define RTP_HEVC_PAYLOAD_HEADER_SIZE 2 #define RTP_HEVC_FU_HEADER_SIZE 1 @@ -106,41 +107,8 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s, size_ptr = &hevc_data->sei_size; } - while (*value) { - char base64packet[1024]; - uint8_t decoded_packet[1024]; - int decoded_packet_size; - char *dst = base64packet; - - while (*value && *value != ',' && - (dst - base64packet) < sizeof(base64packet) - 1) { - *dst++ = *value++; - } - *dst++ = '\0'; - - if (*value == ',') - value++; - - decoded_packet_size = av_base64_decode(decoded_packet, base64packet, - sizeof(decoded_packet)); - if (decoded_packet_size > 0) { - uint8_t *tmp = av_realloc(*data_ptr, decoded_packet_size + - sizeof(start_sequence) + *size_ptr); - if (!tmp) { - av_log(s, AV_LOG_ERROR, - "Unable to allocate memory for extradata!\n"); - return AVERROR(ENOMEM); - } - *data_ptr = tmp; - - memcpy(*data_ptr + *size_ptr, start_sequence, - sizeof(start_sequence)); - memcpy(*data_ptr + *size_ptr + sizeof(start_sequence), - decoded_packet, decoded_packet_size); - - *size_ptr += sizeof(start_sequence) + decoded_packet_size; - } - } + ff_h264_parse_sprop_parameter_sets(s, data_ptr, + size_ptr, value); } /* max-lsr, max-lps, max-cpb, max-dpb, max-br, max-tr, max-tc */ |