CrystalHD: Fix usage of h264 parser.

I was using the wrong value to track the position of the parser in the
stream. For an error-free stream, the size of the frame and number of
bytes consumed will be the same, but in an error situation they can
diverge.

Signed-off-by: Philip Langdale <philipl@overt.org>
This commit is contained in:
Philip Langdale 2011-04-13 22:00:18 -07:00
parent 09a1416db7
commit bd9430db69
1 changed files with 11 additions and 5 deletions

View File

@ -796,13 +796,19 @@ static int decode(AVCodecContext *avctx, void *data, int *data_size, AVPacket *a
if (priv->parser) {
uint8_t *pout;
int psize = len;
int psize;
const uint8_t *in_data = avpkt->data;
int in_len = len;
H264Context *h = priv->parser->priv_data;
while (psize)
ret = av_parser_parse2(priv->parser, avctx, &pout, &psize,
avpkt->data, len, avctx->pkt->pts,
avctx->pkt->dts, len - psize);
while (in_len) {
int index;
index = av_parser_parse2(priv->parser, avctx, &pout, &psize,
in_data, in_len, avctx->pkt->pts,
avctx->pkt->dts, 0);
in_data += index;
in_len -= index;
}
av_log(avctx, AV_LOG_VERBOSE,
"CrystalHD: parser picture type %d\n",
h->s.picture_structure);