a0b6df0a39
Up until now, ff_avc_decode_sps would parse a SPS and return some properties from it in a freshly allocated structure. Yet said structure is very small and completely internal to libavformat, so there is no reason to use the heap for it. This commit therefore changes the function to return an int and to modify a caller-provided structure. This will also allow ff_avc_decode_sps to return better error codes in the future. It also fixes a memleak in mxfenc: If a packet contained multiple SPS, only the SPS structure belonging to the last SPS would be freed, the other ones would leak when the pointer is overwritten to point to the new SPS structure. Of course, without allocations there are no leaks. This is Coverity issue #1445194. Furthermore, the SPS structure has been renamed from H264SequenceParameterSet to H264SPS in order to avoid overlong lines. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
54 lines
2.0 KiB
C
54 lines
2.0 KiB
C
/*
|
|
* AVC helper functions for muxers
|
|
* Copyright (c) 2008 Aurelien Jacobs <aurel@gnuage.org>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef AVFORMAT_AVC_H
|
|
#define AVFORMAT_AVC_H
|
|
|
|
#include <stdint.h>
|
|
#include "avio.h"
|
|
|
|
int ff_avc_parse_nal_units(AVIOContext *s, const uint8_t *buf, int size);
|
|
int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size);
|
|
int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len);
|
|
const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end);
|
|
int ff_avc_write_annexb_extradata(const uint8_t *in, uint8_t **buf, int *size);
|
|
const uint8_t *ff_avc_mp4_find_startcode(const uint8_t *start,
|
|
const uint8_t *end,
|
|
int nal_length_size);
|
|
uint8_t *ff_nal_unit_extract_rbsp(const uint8_t *src, uint32_t src_len,
|
|
uint32_t *dst_len, int header_len);
|
|
|
|
typedef struct {
|
|
uint8_t id;
|
|
uint8_t profile_idc;
|
|
uint8_t level_idc;
|
|
uint8_t constraint_set_flags;
|
|
uint8_t chroma_format_idc;
|
|
uint8_t bit_depth_luma;
|
|
uint8_t bit_depth_chroma;
|
|
uint8_t frame_mbs_only_flag;
|
|
AVRational sar;
|
|
} H264SPS;
|
|
|
|
int ff_avc_decode_sps(H264SPS *sps, const uint8_t *buf, int buf_size);
|
|
|
|
#endif /* AVFORMAT_AVC_H */
|