Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

parser: K&R formatting cosmetics

Browse source 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Luca Barbato 2014-02-23 23:59:25 +01:00 • committed by Diego Biurrun
parent ed61f3ca8a
commit a1c699659d
1 changed files with 105 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
libavcodec/parser.c
View file

@ -23,14 +23,18 @@
#include <stdint.h>
#include <string.h>
#include "parser.h"
#include "libavutil/mem.h"
#include "parser.h"
static AVCodecParser *av_first_parser = NULL;
AVCodecParser* av_parser_next(AVCodecParser *p){
if(p) return p->next;
else return av_first_parser;
AVCodecParser *av_parser_next(AVCodecParser *p)
{
if (p)
return p->next;
else
return av_first_parser;
}
void av_register_codec_parser(AVCodecParser *parser)
@ -57,6 +61,7 @@ AVCodecParserContext *av_parser_init(int codec_id)
goto found;
}
return NULL;
found:
s = av_mallocz(sizeof(AVCodecParserContext));
if (!s)
@ -87,17 +92,19 @@ AVCodecParserContext *av_parser_init(int codec_id)
return s;
}
void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove)
{
int i;
s->dts= s->pts= AV_NOPTS_VALUE;
s->dts =
s->pts = AV_NOPTS_VALUE;
s->pos = -1;
s->offset = 0;
for (i = 0; i < AV_PARSER_PTS_NB; i++) {
if ( s->cur_offset + off >= s->cur_frame_offset[i]
&& (s->frame_offset < s->cur_frame_offset[i] ||
(!s->frame_offset && !s->next_frame_offset)) // first field/frame
&& s->cur_frame_end[i]) {
if (s->cur_offset + off >= s->cur_frame_offset[i] &&
(s->frame_offset < s->cur_frame_offset[i] ||
(!s->frame_offset && !s->next_frame_offset)) &&
s->cur_frame_end[i]) {
s->dts = s->cur_frame_dts[i];
s->pts = s->cur_frame_pts[i];
s->pos = s->cur_frame_pos[i];
@ -110,12 +117,10 @@ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove){
}
}
int av_parser_parse2(AVCodecParserContext *s,
AVCodecContext *avctx,
int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size,
int64_t pts, int64_t dts,
int64_t pos)
int64_t pts, int64_t dts, int64_t pos)
{
int index, i;
uint8_t dummy_buf[FF_INPUT_BUFFER_PADDING_SIZE];
@ -130,8 +135,7 @@ int av_parser_parse2(AVCodecParserContext *s,
/* padding is always necessary even if EOF, so we add it here */
memset(dummy_buf, 0, sizeof(dummy_buf));
buf = dummy_buf;
} else if (s->cur_offset + buf_size !=
s->cur_frame_end[s->cur_frame_start_index]) { /* skip remainder packets */
} else if (s->cur_offset + buf_size != s->cur_frame_end[s->cur_frame_start_index]) { /* skip remainder packets */
/* add a new packet descriptor */
i = (s->cur_frame_start_index + 1) & (AV_PARSER_PTS_NB - 1);
s->cur_frame_start_index = i;
@ -149,9 +153,9 @@ int av_parser_parse2(AVCodecParserContext *s,
s->last_pos = s->pos;
ff_fetch_timestamp(s, 0, 0);
}
/* WARNING: the returned index can be negative */
index = s->parser->parser_parse(s, avctx, (const uint8_t **)poutbuf, poutbuf_size, buf, buf_size);
index = s->parser->parser_parse(s, avctx, (const uint8_t **) poutbuf,
poutbuf_size, buf, buf_size);
/* update the file pointer */
if (*poutbuf_size) {
/* fill the data for the current frame */
@ -167,13 +171,13 @@ int av_parser_parse2(AVCodecParserContext *s,
return index;
}
int av_parser_change(AVCodecParserContext *s,
AVCodecContext *avctx,
int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size, int keyframe){
const uint8_t *buf, int buf_size, int keyframe)
{
if (s && s->parser->split) {
if((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) || (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)){
if ((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) ||
(avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) {
int i = s->parser->split(avctx, buf, buf_size);
buf += i;
buf_size -= i;
@ -186,11 +190,13 @@ int av_parser_change(AVCodecParserContext *s,
if (avctx->extradata) {
if ((keyframe && (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER))) {
int size = buf_size + avctx->extradata_size;
*poutbuf_size = size;
*poutbuf = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
memcpy(*poutbuf, avctx->extradata, avctx->extradata_size);
memcpy((*poutbuf) + avctx->extradata_size, buf, buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
memcpy((*poutbuf) + avctx->extradata_size, buf,
buf_size + FF_INPUT_BUFFER_PADDING_SIZE);
return 1;
}
}
@ -208,29 +214,31 @@ void av_parser_close(AVCodecParserContext *s)
}
}
int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size)
int ff_combine_frame(ParseContext *pc, int next,
const uint8_t **buf, int *buf_size)
{
if (pc->overread) {
av_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n",
pc->overread, pc->state, next, pc->index, pc->overread_index);
av_dlog(NULL, "%X %X %X %X\n", (*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
av_dlog(NULL, "%X %X %X %X\n",
(*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
}
/* Copy overread bytes from last frame into buffer. */
for(; pc->overread>0; pc->overread--){
for (; pc->overread > 0; pc->overread--)
pc->buffer[pc->index++] = pc->buffer[pc->overread_index++];
}
/* flush remaining if EOF */
if(!*buf_size && next == END_NOT_FOUND){
if (!*buf_size && next == END_NOT_FOUND)
next = 0;
}
pc->last_index = pc->index;
/* copy into buffer end return */
if (next == END_NOT_FOUND) {
void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size,
(*buf_size) + pc->index +
FF_INPUT_BUFFER_PADDING_SIZE);
if (!new_buffer)
return AVERROR(ENOMEM);
@ -245,7 +253,9 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
/* append to buffer */
if (pc->index) {
void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size,
next + pc->index +
FF_INPUT_BUFFER_PADDING_SIZE);
if (!new_buffer)
return AVERROR(ENOMEM);
@ -267,7 +277,8 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
if (pc->overread) {
av_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n",
pc->overread, pc->state, next, pc->index, pc->overread_index);
av_dlog(NULL, "%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
av_dlog(NULL, "%X %X %X %X\n",
(*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]);
}
return 0;
@ -280,8 +291,7 @@ void ff_parse_close(AVCodecParserContext *s)
av_freep(&pc->buffer);
}
int ff_mpeg4video_split(AVCodecContext *avctx,
const uint8_t *buf, int buf_size)
int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size)
{
int i;
uint32_t state = -1;