diff options
Diffstat (limited to 'libavcodec/dnxhd_parser.c')
| -rw-r--r-- | libavcodec/dnxhd_parser.c | 102 |
1 files changed, 87 insertions, 15 deletions
diff --git a/libavcodec/dnxhd_parser.c b/libavcodec/dnxhd_parser.c index 0de3561fc3..4f9bbceeeb 100644 --- a/libavcodec/dnxhd_parser.c +++ b/libavcodec/dnxhd_parser.c @@ -2,20 +2,20 @@ * DNxHD/VC-3 parser * Copyright (c) 2008 Baptiste Coudurier <baptiste.coudurier@free.fr> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -25,41 +25,112 @@ */ #include "parser.h" +#include "dnxhddata.h" -#define DNXHD_HEADER_PREFIX 0x0000028001 +typedef struct { + ParseContext pc; + int interlaced; + int cur_field; /* first field is 0, second is 1 */ + int cur_byte; + int remaining; + int w, h; +} DNXHDParserContext; -static int dnxhd_find_frame_end(ParseContext *pc, +static int dnxhd_get_hr_frame_size(int cid, int w, int h) +{ + int result, i = ff_dnxhd_get_cid_table(cid); + + if (i < 0) + return i; + + result = ((h + 15) / 16) * ((w + 15) / 16) * ff_dnxhd_cid_table[i].packet_scale.num / ff_dnxhd_cid_table[i].packet_scale.den; + result = (result + 2048) / 4096 * 4096; + + return FFMAX(result, 8192); +} + +static int dnxhd_find_frame_end(DNXHDParserContext *dctx, const uint8_t *buf, int buf_size) { + ParseContext *pc = &dctx->pc; uint64_t state = pc->state64; int pic_found = pc->frame_start_found; int i = 0; + int interlaced = dctx->interlaced; + int cur_field = dctx->cur_field; if (!pic_found) { for (i = 0; i < buf_size; i++) { state = (state << 8) | buf[i]; - if ((state & 0xffffffffffLL) == DNXHD_HEADER_PREFIX) { + if (ff_dnxhd_check_header_prefix(state & 0xffffffffff00LL) != 0) { i++; pic_found = 1; + interlaced = (state&2)>>1; /* byte following the 5-byte header prefix */ + cur_field = state&1; + dctx->cur_byte = 0; + dctx->remaining = 0; break; } } } - if (pic_found) { + if (pic_found && !dctx->remaining) { if (!buf_size) /* EOF considered as end of frame */ return 0; for (; i < buf_size; i++) { + dctx->cur_byte++; state = (state << 8) | buf[i]; - if ((state & 0xffffffffffLL) == DNXHD_HEADER_PREFIX) { - pc->frame_start_found = 0; - pc->state64 = -1; - return i - 4; + + if (dctx->cur_byte == 24) { + dctx->h = (state >> 32) & 0xFFFF; + } else if (dctx->cur_byte == 26) { + dctx->w = (state >> 32) & 0xFFFF; + } else if (dctx->cur_byte == 42) { + int cid = (state >> 32) & 0xFFFFFFFF; + + if (cid <= 0) + continue; + + dctx->remaining = avpriv_dnxhd_get_frame_size(cid); + if (dctx->remaining <= 0) { + dctx->remaining = dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h); + if (dctx->remaining <= 0) + return dctx->remaining; + } + if (buf_size - i >= dctx->remaining && (!dctx->interlaced || dctx->cur_field)) { + int remaining = dctx->remaining; + + pc->frame_start_found = 0; + pc->state64 = -1; + dctx->interlaced = interlaced; + dctx->cur_field = 0; + dctx->cur_byte = 0; + dctx->remaining = 0; + return remaining; + } else { + dctx->remaining -= buf_size; + } } } + } else if (pic_found) { + if (dctx->remaining > buf_size) { + dctx->remaining -= buf_size; + } else { + int remaining = dctx->remaining; + + pc->frame_start_found = 0; + pc->state64 = -1; + dctx->interlaced = interlaced; + dctx->cur_field = 0; + dctx->cur_byte = 0; + dctx->remaining = 0; + return remaining; + } } pc->frame_start_found = pic_found; pc->state64 = state; + dctx->interlaced = interlaced; + dctx->cur_field = cur_field; return END_NOT_FOUND; } @@ -68,13 +139,14 @@ static int dnxhd_parse(AVCodecParserContext *s, const uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size) { - ParseContext *pc = s->priv_data; + DNXHDParserContext *dctx = s->priv_data; + ParseContext *pc = &dctx->pc; int next; if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { next = buf_size; } else { - next = dnxhd_find_frame_end(pc, buf, buf_size); + next = dnxhd_find_frame_end(dctx, buf, buf_size); if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { *poutbuf = NULL; *poutbuf_size = 0; @@ -88,7 +160,7 @@ static int dnxhd_parse(AVCodecParserContext *s, AVCodecParser ff_dnxhd_parser = { .codec_ids = { AV_CODEC_ID_DNXHD }, - .priv_data_size = sizeof(ParseContext), + .priv_data_size = sizeof(DNXHDParserContext), .parser_parse = dnxhd_parse, .parser_close = ff_parse_close, }; |