virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'

Browse Source 
* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

Conflicts:
	libavcodec/h264_mp4toannexb_bsf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-16 22:40:43 +02:00
commit 46a5003a4a
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,
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;
uint8_t nal_header_size = offset ? 3 : 4;
void *tmp;
@ -49,7 +50,8 @@ static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
if (!offset) {
AV_WB32(*poutbuf + sps_pps_size, 1);
} 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;
}
@ -60,7 +62,8 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
AVCodecContext *avctx, const char *args,
uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size,
int keyframe) {
int keyframe)
{
H264BSFContext *ctx = bsfc->priv_data;
int i;
uint8_t unit_type;
@ -80,7 +83,8 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
if (!ctx->extradata_parsed) {
uint16_t unit_size;
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;
static const uint8_t nalu_header[4] = { 0, 0, 0, 1 };
@ -101,7 +105,8 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
unit_size = AV_RB16(extradata);
total_size += unit_size + 4;
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);
return AVERROR(EINVAL);
}
@ -126,9 +131,14 @@ pps:
memset(out + total_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
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)
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);
avctx->extradata = out;
@ -162,8 +172,7 @@ pps:
ctx->first_idr = 0;
} else {
if ((ret=alloc_and_copy(poutbuf, poutbuf_size,
NULL, 0,
buf, nal_size)) < 0)
NULL, 0, buf, nal_size)) < 0)
goto fail;
if (!ctx->first_idr && unit_type == 1)
ctx->first_idr = 1;