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

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

73
libavcodec/h264_mp4toannexb_bsf.c
View File

@ -31,26 +31,28 @@ typedef struct H264BSFContext {
int extradata_parsed;
} 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 *in, uint32_t in_size) {
uint32_t offset = *poutbuf_size;
const uint8_t *in, uint32_t in_size)
{
uint32_t offset = *poutbuf_size;
uint8_t nal_header_size = offset ? 3 : 4;
void *tmp;
*poutbuf_size += sps_pps_size+in_size+nal_header_size;
*poutbuf_size += sps_pps_size + in_size + nal_header_size;
tmp = av_realloc(*poutbuf, *poutbuf_size);
if (!tmp)
return AVERROR(ENOMEM);
*poutbuf = tmp;
if (sps_pps)
memcpy(*poutbuf+offset, sps_pps, sps_pps_size);
memcpy(*poutbuf+sps_pps_size+nal_header_size+offset, in, in_size);
memcpy(*poutbuf + offset, sps_pps, sps_pps_size);
memcpy(*poutbuf + sps_pps_size + nal_header_size + offset, in, in_size);
if (!offset) {
AV_WB32(*poutbuf+sps_pps_size, 1);
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)[2] = 1;
(*poutbuf + offset + sps_pps_size)[0] =
(*poutbuf + offset + sps_pps_size)[1] = 0;
(*poutbuf + offset + sps_pps_size)[2] = 1;
}
return 0;
@ -58,20 +60,21 @@ static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size,
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) {
uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size,
int keyframe)
{
H264BSFContext *ctx = bsfc->priv_data;
int i;
uint8_t unit_type;
int32_t nal_size;
uint32_t cumul_size = 0;
uint32_t cumul_size = 0;
const uint8_t *buf_end = buf + buf_size;
int ret = AVERROR(EINVAL);
/* nothing to filter */
if (!avctx->extradata || avctx->extradata_size < 6) {
*poutbuf = (uint8_t*) buf;
*poutbuf = (uint8_t *)buf;
*poutbuf_size = buf_size;
return 0;
}
@ -79,10 +82,11 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
/* retrieve sps and pps NAL units from extradata */
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;
const uint8_t *extradata = avctx->extradata+4;
static const uint8_t nalu_header[4] = {0, 0, 0, 1};
uint64_t total_size = 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 };
/* retrieve length coded size */
ctx->length_size = (*extradata++ & 0x3) + 1;
@ -98,10 +102,11 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
while (unit_nb--) {
void *tmp;
unit_size = AV_RB16(extradata);
total_size += unit_size+4;
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);
}
@ -111,9 +116,9 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc,
return AVERROR(ENOMEM);
}
out = tmp;
memcpy(out+total_size-unit_size-4, nalu_header, 4);
memcpy(out+total_size-unit_size, extradata+2, unit_size);
extradata += 2+unit_size;
memcpy(out + total_size - unit_size - 4, nalu_header, 4);
memcpy(out + total_size - unit_size, extradata + 2, unit_size);
extradata += 2 + unit_size;
pps:
if (!unit_nb && !sps_done++) {
unit_nb = *extradata++; /* number of pps unit(s) */
@ -122,13 +127,18 @@ pps:
}
}
if(out)
if (out)
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;
@ -138,7 +148,7 @@ pps:
}
*poutbuf_size = 0;
*poutbuf = NULL;
*poutbuf = NULL;
do {
ret= AVERROR(EINVAL);
if (buf + ctx->length_size > buf_end)
@ -147,7 +157,7 @@ pps:
for (nal_size = 0, i = 0; i<ctx->length_size; i++)
nal_size = (nal_size << 8) | buf[i];
buf += ctx->length_size;
buf += ctx->length_size;
unit_type = *buf & 0x1f;
if (buf + nal_size > buf_end || nal_size < 0)
@ -162,14 +172,13 @@ 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;
}
buf += nal_size;
buf += nal_size;
cumul_size += nal_size + ctx->length_size;
} while (cumul_size < buf_size);