diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-10 22:37:36 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-05-10 22:37:36 +0000 |
commit | b16560a3892be5faa5efc7c8bec172985831bd53 (patch) | |
tree | 7b345247c5ab030aa7e262f5b8e36caf7c5e0294 /libavcodec/mjpeg.c | |
parent | 87acdd539158e1130570514b8691ef0c35d9db9c (diff) | |
download | ffmpeg-b16560a3892be5faa5efc7c8bec172985831bd53.tar.gz |
move mjpeg parser in its own file
Originally committed as revision 8987 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpeg.c')
-rw-r--r-- | libavcodec/mjpeg.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 214fc08a9e..5fa2059be3 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -962,68 +962,6 @@ static int mjpeg_decode_init(AVCodecContext *avctx) } -/** - * 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 @@ AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them }; #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, |