* Copyright (c) 2007-2008 Marco Gerards <marco@gnu.org>
* Copyright (c) 2008 BBC, Anuradha Suraparaju <asuraparaju@gmail.com>
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file libavcodec/dirac_parser.c
+ * @file
* Dirac Parser
* @author Marco Gerards <marco@gnu.org>
*/
+#include <string.h>
+
#include "libavutil/intreadwrite.h"
+#include "libavutil/mem.h"
+
#include "parser.h"
#define DIRAC_PARSE_INFO_PREFIX 0x42424344
/**
- * Finds the end of the current frame in the bitstream.
+ * Find the end of the current frame in the bitstream.
* @return the position of the first byte of the next frame or -1
*/
typedef struct DiracParseContext {
pc->sync_offset = 0;
for (; i < buf_size; i++) {
if (state == DIRAC_PARSE_INFO_PREFIX) {
- if ((buf_size-i) >= pc->header_bytes_needed) {
+ if ((buf_size - i) >= pc->header_bytes_needed) {
pc->state = -1;
return i + pc->header_bytes_needed;
} else {
- pc->header_bytes_needed = 9-(buf_size-i);
+ pc->header_bytes_needed = 9 - (buf_size - i);
break;
}
} else
- state = (state << 8) | buf[i];
+ state = (state << 8) | buf[i];
}
}
pc->state = state;
return -1;
}
-typedef struct DiracParseUnit
-{
+typedef struct DiracParseUnit {
int next_pu_offset;
int prev_pu_offset;
uint8_t pu_type;
{
uint8_t *start = pc->buffer + offset;
uint8_t *end = pc->buffer + pc->index;
- if (start < pc->buffer || (start+13 > end))
+ if (start < pc->buffer || (start + 13 > end))
return 0;
pu->pu_type = start[4];
- pu->next_pu_offset = AV_RB32(start+5);
- pu->prev_pu_offset = AV_RB32(start+9);
+ pu->next_pu_offset = AV_RB32(start + 5);
+ pu->prev_pu_offset = AV_RB32(start + 9);
if (pu->pu_type == 0x10 && pu->next_pu_offset == 0)
pu->next_pu_offset = 13;
if (pc->overread_index) {
memcpy(pc->buffer, pc->buffer + pc->overread_index,
pc->index - pc->overread_index);
- pc->index -= pc->overread_index;
+ pc->index -= pc->overread_index;
pc->overread_index = 0;
if (*buf_size == 0 && pc->buffer[4] == 0x10) {
*buf = pc->buffer;
}
}
- if ( next == -1) {
+ if (next == -1) {
/* Found a possible frame start but not a frame end */
- void *new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size,
- pc->index + (*buf_size -
- pc->sync_offset));
+ void *new_buffer =
+ av_fast_realloc(pc->buffer, &pc->buffer_size,
+ pc->index + (*buf_size - pc->sync_offset));
pc->buffer = new_buffer;
- memcpy(pc->buffer+pc->index, (*buf + pc->sync_offset),
+ memcpy(pc->buffer + pc->index, (*buf + pc->sync_offset),
*buf_size - pc->sync_offset);
pc->index += *buf_size - pc->sync_offset;
return -1;
if (!unpack_parse_unit(&pu1, pc, pc->index - 13) ||
!unpack_parse_unit(&pu, pc, pc->index - 13 - pu1.prev_pu_offset) ||
pu.next_pu_offset != pu1.prev_pu_offset) {
- pc->index -= 9;
- *buf_size = next-9;
+ pc->index -= 9;
+ *buf_size = next - 9;
pc->header_bytes_needed = 9;
return -1;
}
pc->dirac_unit_size += pu.next_pu_offset;
- if ((pu.pu_type&0x08) != 0x08) {
+ if ((pu.pu_type & 0x08) != 0x08) {
pc->header_bytes_needed = 9;
- *buf_size = next;
+ *buf_size = next;
return -1;
}
if (parse_timing_info) {
uint8_t *cur_pu = pc->buffer +
pc->index - 13 - pu1.prev_pu_offset;
- int pts = AV_RB32(cur_pu + 13);
+ int pts = AV_RB32(cur_pu + 13);
if (s->last_pts == 0 && s->last_dts == 0)
s->dts = pts - 1;
else
- s->dts = s->last_dts+1;
+ s->dts = s->last_dts + 1;
s->pts = pts;
if (!avctx->has_b_frames && (cur_pu[4] & 0x03))
avctx->has_b_frames = 1;
}
if (avctx->has_b_frames && s->pts == s->dts)
- s->pict_type = FF_B_TYPE;
+ s->pict_type = AV_PICTURE_TYPE_B;
/* Finally have a complete Dirac data unit */
*buf = pc->dirac_unit;
*buf_size = pc->dirac_unit_size;
pc->dirac_unit_size = 0;
- pc->overread_index = pc->index-13;
+ pc->overread_index = pc->index - 13;
pc->header_bytes_needed = 9;
}
return next;
DiracParseContext *pc = s->priv_data;
int next;
- *poutbuf = NULL;
+ *poutbuf = NULL;
*poutbuf_size = 0;
if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) {
- next = buf_size;
- *poutbuf = buf;
+ next = buf_size;
+ *poutbuf = buf;
*poutbuf_size = buf_size;
/* Assume that data has been packetized into an encapsulation unit. */
} else {
next = find_frame_end(pc, buf, buf_size);
- if (!pc->is_synced && next == -1) {
+ if (!pc->is_synced && next == -1)
/* No frame start found yet. So throw away the entire buffer. */
return buf_size;
- }
- if (dirac_combine_frame(s, avctx, next, &buf, &buf_size) < 0) {
+ if (dirac_combine_frame(s, avctx, next, &buf, &buf_size) < 0)
return buf_size;
- }
}
- *poutbuf = buf;
+ *poutbuf = buf;
*poutbuf_size = buf_size;
return next;
}
av_free(pc->buffer);
}
-AVCodecParser dirac_parser = {
- { CODEC_ID_DIRAC },
- sizeof(DiracParseContext),
- NULL,
- dirac_parse,
- dirac_parse_close,
+AVCodecParser ff_dirac_parser = {
+ .codec_ids = { AV_CODEC_ID_DIRAC },
+ .priv_data_size = sizeof(DiracParseContext),
+ .parser_parse = dirac_parse,
+ .parser_close = dirac_parse_close,
};
projects / ffmpeg / blobdiff