virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

h264_mp4toannexb_bsf: K&R formatting cosmetics

Browse Source
This commit is contained in:
Luca Barbato 2013-06-11 16:12:01 +02:00
parent 59d7bb99b6
commit 5d21ca4559
1 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/h264_mp4toannexb_bsf.c
View File

@ -33,7 +33,8 @@ typedef struct H264BSFContext {
static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size, static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *sps_pps, uint32_t sps_pps_size, const uint8_t *sps_pps, uint32_t sps_pps_size,
const uint8_t *in, uint32_t in_size) { const uint8_t *in, uint32_t in_size)
{
uint32_t offset = *poutbuf_size; uint32_t offset = *poutbuf_size;
uint8_t nal_header_size = offset ? 3 : 4; uint8_t nal_header_size = offset ? 3 : 4;
void *tmp; void *tmp;
@ -49,7 +50,8 @@ static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
if (!offset) { if (!offset) {
AV_WB32(*poutbuf + sps_pps_size, 1); AV_WB32(*poutbuf + sps_pps_size, 1);
} else { } else {
(*poutbuf+offset+sps_pps_size)[0] = (*poutbuf+offset+sps_pps_size)[1] = 0; (*poutbuf + offset + sps_pps_size)[0] =
(*poutbuf + offset + sps_pps_size)[1] = 0;
(*poutbuf + offset + sps_pps_size)[2] = 1; (*poutbuf + offset + sps_pps_size)[2] = 1;
} }
@ -60,7 +62,8 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
AVCodecContext *avctx, const char *args, AVCodecContext *avctx, const char *args,
uint8_t **poutbuf, int *poutbuf_size, uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size, const uint8_t *buf, int buf_size,
int keyframe) { int keyframe)
{
H264BSFContext *ctx = bsfc->priv_data; H264BSFContext *ctx = bsfc->priv_data;
uint8_t unit_type; uint8_t unit_type;
int32_t nal_size; int32_t nal_size;
@ -78,7 +81,8 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
if (!ctx->extradata_parsed) { if (!ctx->extradata_parsed) {
uint16_t unit_size; uint16_t unit_size;
uint64_t total_size = 0; uint64_t total_size = 0;
uint8_t *out = NULL, unit_nb, sps_done = 0, sps_seen = 0, pps_seen = 0; uint8_t *out = NULL, unit_nb, sps_done = 0,
sps_seen = 0, pps_seen = 0;
const uint8_t *extradata = avctx->extradata + 4; const uint8_t *extradata = avctx->extradata + 4;
static const uint8_t nalu_header[4] = { 0, 0, 0, 1 }; static const uint8_t nalu_header[4] = { 0, 0, 0, 1 };
@ -105,7 +109,8 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
unit_size = AV_RB16(extradata); unit_size = AV_RB16(extradata);
total_size += unit_size + 4; total_size += unit_size + 4;
if (total_size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE || if (total_size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE ||
extradata+2+unit_size > avctx->extradata+avctx->extradata_size) { extradata + 2 + unit_size > avctx->extradata +
avctx->extradata_size) {
av_free(out); av_free(out);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@ -130,9 +135,14 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
memset(out + total_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(out + total_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
if (!sps_seen) if (!sps_seen)
av_log(avctx, AV_LOG_WARNING, "Warning: SPS NALU missing or invalid. The resulting stream may not play.\n"); av_log(avctx, AV_LOG_WARNING,
"Warning: SPS NALU missing or invalid. "
"The resulting stream may not play.\n");
if (!pps_seen) if (!pps_seen)
av_log(avctx, AV_LOG_WARNING, "Warning: PPS NALU missing or invalid. The resulting stream may not play.\n"); av_log(avctx, AV_LOG_WARNING,
"Warning: PPS NALU missing or invalid. "
"The resulting stream may not play.\n");
av_free(avctx->extradata); av_free(avctx->extradata);
avctx->extradata = out; avctx->extradata = out;
@ -169,8 +179,7 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
ctx->first_idr = 0; ctx->first_idr = 0;
} else { } else {
if (alloc_and_copy(poutbuf, poutbuf_size, if (alloc_and_copy(poutbuf, poutbuf_size,
NULL, 0, NULL, 0, buf, nal_size) < 0)
buf, nal_size) < 0)
goto fail; goto fail;
if (!ctx->first_idr && unit_type == 1) if (!ctx->first_idr && unit_type == 1)
ctx->first_idr = 1; ctx->first_idr = 1;