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_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) * (int64_t)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)
{
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++) {
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;
dctx->remaining = avpriv_dnxhd_get_frame_size(cid);
if (dctx->remaining <= 0) {
- dctx->remaining = dnxhd_get_hr_frame_size(cid, dctx->w, dctx->h);
+ dctx->remaining = ff_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)) {
+ if (buf_size - i + 47 >= dctx->remaining) {
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 = 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;
}