RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/rtpdec_h261: code aligned to the HEVC code 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Thomas Volkert 2014-11-01 13:01:53 +01:00 committed by Michael Niedermayer
parent 46353759cb
commit 8d9277c3c0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/rtpdec_h261.c
View File

@ -32,7 +32,7 @@ struct PayloadContext {
uint32_t timestamp; uint32_t timestamp;
}; };
static PayloadContext *h261_new_context(void) static av_cold PayloadContext *h261_new_context(void)
{ {
return av_mallocz(sizeof(PayloadContext)); return av_mallocz(sizeof(PayloadContext));
} }
@ -45,7 +45,7 @@ static void h261_free_dyn_buffer(AVIOContext **dyn_buf)
*dyn_buf = NULL; *dyn_buf = NULL;
} }
static void h261_free_context(PayloadContext *pl_ctx) static av_cold void h261_free_context(PayloadContext *pl_ctx)
{ {
/* return if context is invalid */ /* return if context is invalid */
if (!pl_ctx) if (!pl_ctx)
@ -80,16 +80,14 @@ int ff_h261_handle_packet(AVFormatContext *ctx, PayloadContext *data,
int sbit, ebit, gobn, mbap, quant; int sbit, ebit, gobn, mbap, quant;
int res; int res;
//av_log(ctx, AV_LOG_DEBUG, "got h261 RTP packet with time: %u\n", timestamp);
/* drop data of previous packets in case of non-continuous (loss) packet stream */ /* drop data of previous packets in case of non-continuous (loss) packet stream */
if (data->buf && data->timestamp != *timestamp) { if (data->buf && data->timestamp != *timestamp) {
h261_free_dyn_buffer(&data->buf); h261_free_dyn_buffer(&data->buf);
} }
/* sanity check for size of input packet */ /* sanity check for size of input packet: 1 byte payload at least */
if (len < 5 /* 4 bytes header and 1 byte payload at least */) { if (len < RTP_H261_PAYLOAD_HEADER_SIZE + 1) {
av_log(ctx, AV_LOG_ERROR, "Too short H.261 RTP packet\n"); av_log(ctx, AV_LOG_ERROR, "Too short RTP/H.261 packet, got %d bytes\n", len);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }