Mercurial > libavcodec.hg
diff mjpeg.c @ 4977:9d7c1fbd3359 libavcodec
move mjpeg parser in its own file
author | aurel |
---|---|
date | Thu, 10 May 2007 22:37:36 +0000 |
parents | 0d1cc37d9430 |
children | 3fa689636240 |
line wrap: on
line diff
--- a/mjpeg.c Thu May 10 22:28:23 2007 +0000 +++ b/mjpeg.c Thu May 10 22:37:36 2007 +0000 @@ -962,68 +962,6 @@ } -/** - * finds the end of the current frame in the bitstream. - * @return the position of the first byte of the next frame, or -1 - */ -static int find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){ - int vop_found, i; - uint16_t state; - - vop_found= pc->frame_start_found; - state= pc->state; - - i=0; - if(!vop_found){ - for(i=0; i<buf_size; i++){ - state= (state<<8) | buf[i]; - if(state == 0xFFD8){ - i++; - vop_found=1; - break; - } - } - } - - if(vop_found){ - /* EOF considered as end of frame */ - if (buf_size == 0) - return 0; - for(; i<buf_size; i++){ - state= (state<<8) | buf[i]; - if(state == 0xFFD8){ - pc->frame_start_found=0; - pc->state=0; - return i-1; - } - } - } - pc->frame_start_found= vop_found; - pc->state= state; - return END_NOT_FOUND; -} - -static int jpeg_parse(AVCodecParserContext *s, - AVCodecContext *avctx, - const uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size) -{ - ParseContext *pc = s->priv_data; - int next; - - next= find_frame_end(pc, buf, buf_size); - - if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size; - } - - *poutbuf = buf; - *poutbuf_size = buf_size; - return next; -} - /* quantize tables */ static int mjpeg_decode_dqt(MJpegDecodeContext *s) { @@ -2626,16 +2564,6 @@ }; #endif -#ifdef CONFIG_MJPEG_PARSER -AVCodecParser mjpeg_parser = { - { CODEC_ID_MJPEG }, - sizeof(ParseContext), - NULL, - jpeg_parse, - ff_parse_close, -}; -#endif - AVBitStreamFilter mjpega_dump_header_bsf = { "mjpegadump", 0,