Skip to content

F
ffmpeg-mt
Commit 33c83fba authored by aurel's avatar aurel
Browse files
Options

move mjpeg-b decoder in its own file 

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@9073 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 44e2e68f
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 134 deletions
libavcodec/Makefile
View file @ 33c83fba
...@@ -106,7 +106,7 @@ OBJS-$(CONFIG_MACE3_DECODER) += mace.o ...@@ -106,7 +106,7 @@ OBJS-$(CONFIG_MACE3_DECODER) += mace.o
OBJS-$(CONFIG_MACE6_DECODER) += mace.o OBJS-$(CONFIG_MACE6_DECODER) += mace.o
OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o
OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o mpegvideo.o OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o mpegvideo.o
OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegdec.o mjpeg.o OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MP2_ENCODER) += mpegaudio.o mpegaudiodata.o
OBJS-$(CONFIG_MPC7_DECODER) += mpc.o OBJS-$(CONFIG_MPC7_DECODER) += mpc.o
......
libavcodec/mjpegbdec.c 0 → 100644
View file @ 33c83fba
/*
* Apple MJPEG-B decoder
* Copyright (c) 2002 Alex Beregszaszi
*
* This file is part of FFmpeg.
*
* 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.
*
* 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 FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file mjpegbdec.c
* Apple MJPEG-B decoder.
*/
#include "avcodec.h"
#include "mjpeg.h"
#include "mjpegdec.h"
static int mjpegb_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
uint8_t *buf, int buf_size)
{
MJpegDecodeContext *s = avctx->priv_data;
uint8_t *buf_end, *buf_ptr;
AVFrame *picture = data;
GetBitContext hgb; /* for the header */
uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs;
uint32_t field_size, sod_offs;
buf_ptr = buf;
buf_end = buf + buf_size;
read_header:
/* reset on every SOI */
s->restart_interval = 0;
s->restart_count = 0;
s->mjpb_skiptosod = 0;
init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8);
skip_bits(&hgb, 32); /* reserved zeros */
if (get_bits_long(&hgb, 32) != MKBETAG('m','j','p','g'))
{
av_log(avctx, AV_LOG_WARNING, "not mjpeg-b (bad fourcc)\n");
return 0;
}
field_size = get_bits_long(&hgb, 32); /* field size */
av_log(avctx, AV_LOG_DEBUG, "field size: 0x%x\n", field_size);
skip_bits(&hgb, 32); /* padded field size */
second_field_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "second field offs: 0x%x\n", second_field_offs);
dqt_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "dqt offs: 0x%x\n", dqt_offs);
if (dqt_offs)
{
init_get_bits(&s->gb, buf+dqt_offs, (buf_end - (buf+dqt_offs))*8);
s->start_code = DQT;
ff_mjpeg_decode_dqt(s);
}
dht_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "dht offs: 0x%x\n", dht_offs);
if (dht_offs)
{
init_get_bits(&s->gb, buf+dht_offs, (buf_end - (buf+dht_offs))*8);
s->start_code = DHT;
ff_mjpeg_decode_dht(s);
}
sof_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "sof offs: 0x%x\n", sof_offs);
if (sof_offs)
{
init_get_bits(&s->gb, buf+sof_offs, (buf_end - (buf+sof_offs))*8);
s->start_code = SOF0;
if (ff_mjpeg_decode_sof(s) < 0)
return -1;
}
sos_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "sos offs: 0x%x\n", sos_offs);
sod_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "sod offs: 0x%x\n", sod_offs);
if (sos_offs)
{
// init_get_bits(&s->gb, buf+sos_offs, (buf_end - (buf+sos_offs))*8);
init_get_bits(&s->gb, buf+sos_offs, field_size*8);
s->mjpb_skiptosod = (sod_offs - sos_offs - show_bits(&s->gb, 16));
s->start_code = SOS;
ff_mjpeg_decode_sos(s);
}
if (s->interlaced) {
s->bottom_field ^= 1;
/* if not bottom field, do not output image yet */
if (s->bottom_field && second_field_offs)
{
buf_ptr = buf + second_field_offs;
second_field_offs = 0;
goto read_header;
}
}
//XXX FIXME factorize, this looks very similar to the EOI code
*picture= s->picture;
*data_size = sizeof(AVFrame);
if(!s->lossless){
picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]);
picture->qstride= 0;
picture->qscale_table= s->qscale_table;
memset(picture->qscale_table, picture->quality, (s->width+15)/16);
if(avctx->debug & FF_DEBUG_QP)
av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
picture->quality*= FF_QP2LAMBDA;
}
return buf_ptr - buf;
}
AVCodec mjpegb_decoder = {
"mjpegb",
CODEC_TYPE_VIDEO,
CODEC_ID_MJPEGB,
sizeof(MJpegDecodeContext),
ff_mjpeg_decode_init,
NULL,
ff_mjpeg_decode_end,
mjpegb_decode_frame,
CODEC_CAP_DR1,
NULL
};
libavcodec/mjpegdec.c
View file @ 33c83fba
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#include "jpeglsdec.h" #include "jpeglsdec.h"
static int mjpeg_decode_dht(MJpegDecodeContext *s);
static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table, static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table,
int nb_codes, int use_static, int is_ac) int nb_codes, int use_static, int is_ac)
{ {
...@@ -90,7 +88,7 @@ int ff_mjpeg_decode_init(AVCodecContext *avctx) ...@@ -90,7 +88,7 @@ int ff_mjpeg_decode_init(AVCodecContext *avctx)
{ {
av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n"); av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n");
init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8); init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
mjpeg_decode_dht(s); ff_mjpeg_decode_dht(s);
/* should check for error - but dunno */ /* should check for error - but dunno */
} }
if (avctx->extradata_size > 9 && if (avctx->extradata_size > 9 &&
...@@ -106,7 +104,7 @@ int ff_mjpeg_decode_init(AVCodecContext *avctx) ...@@ -106,7 +104,7 @@ int ff_mjpeg_decode_init(AVCodecContext *avctx)
/* quantize tables */ /* quantize tables */
static int mjpeg_decode_dqt(MJpegDecodeContext *s) int ff_mjpeg_decode_dqt(MJpegDecodeContext *s)
{ {
int len, index, i, j; int len, index, i, j;
...@@ -141,7 +139,7 @@ static int mjpeg_decode_dqt(MJpegDecodeContext *s) ...@@ -141,7 +139,7 @@ static int mjpeg_decode_dqt(MJpegDecodeContext *s)
} }
/* decode huffman tables and build VLC decoders */ /* decode huffman tables and build VLC decoders */
static int mjpeg_decode_dht(MJpegDecodeContext *s) int ff_mjpeg_decode_dht(MJpegDecodeContext *s)
{ {
int len, index, i, class, n, v, code_max; int len, index, i, class, n, v, code_max;
uint8_t bits_table[17]; uint8_t bits_table[17];
...@@ -187,7 +185,7 @@ static int mjpeg_decode_dht(MJpegDecodeContext *s) ...@@ -187,7 +185,7 @@ static int mjpeg_decode_dht(MJpegDecodeContext *s)
return 0; return 0;
} }
static int mjpeg_decode_sof(MJpegDecodeContext *s) int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
{ {
int len, nb_components, i, width, height, pix_fmt_id; int len, nb_components, i, width, height, pix_fmt_id;
...@@ -708,7 +706,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int ss, i ...@@ -708,7 +706,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int ss, i
return 0; return 0;
} }
static int mjpeg_decode_sos(MJpegDecodeContext *s) int ff_mjpeg_decode_sos(MJpegDecodeContext *s)
{ {
int len, nb_components, i, h, v, predictor, point_transform; int len, nb_components, i, h, v, predictor, point_transform;
int vmax, hmax, index, id; int vmax, hmax, index, id;
...@@ -1201,10 +1199,10 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, ...@@ -1201,10 +1199,10 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
/* nothing to do on SOI */ /* nothing to do on SOI */
break; break;
case DQT: case DQT:
mjpeg_decode_dqt(s); ff_mjpeg_decode_dqt(s);
break; break;
case DHT: case DHT:
if(mjpeg_decode_dht(s) < 0){ if(ff_mjpeg_decode_dht(s) < 0){
av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n"); av_log(avctx, AV_LOG_ERROR, "huffman table decode error\n");
return -1; return -1;
} }
...@@ -1213,28 +1211,28 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx, ...@@ -1213,28 +1211,28 @@ int ff_mjpeg_decode_frame(AVCodecContext *avctx,
s->lossless=0; s->lossless=0;
s->ls=0; s->ls=0;
s->progressive=0; s->progressive=0;
if (mjpeg_decode_sof(s) < 0) if (ff_mjpeg_decode_sof(s) < 0)
return -1; return -1;
break; break;
case SOF2: case SOF2:
s->lossless=0; s->lossless=0;
s->ls=0; s->ls=0;
s->progressive=1; s->progressive=1;
if (mjpeg_decode_sof(s) < 0) if (ff_mjpeg_decode_sof(s) < 0)
return -1; return -1;
break; break;
case SOF3: case SOF3:
s->lossless=1; s->lossless=1;
s->ls=0; s->ls=0;
s->progressive=0; s->progressive=0;
if (mjpeg_decode_sof(s) < 0) if (ff_mjpeg_decode_sof(s) < 0)
return -1; return -1;
break; break;
case SOF48: case SOF48:
s->lossless=1; s->lossless=1;
s->ls=1; s->ls=1;
s->progressive=0; s->progressive=0;
if (mjpeg_decode_sof(s) < 0) if (ff_mjpeg_decode_sof(s) < 0)
return -1; return -1;
break; break;
case LSE: case LSE:
...@@ -1270,7 +1268,7 @@ eoi_parser: ...@@ -1270,7 +1268,7 @@ eoi_parser:
} }
break; break;
case SOS: case SOS:
mjpeg_decode_sos(s); ff_mjpeg_decode_sos(s);
/* buggy avid puts EOI every 10-20th frame */ /* buggy avid puts EOI every 10-20th frame */
/* if restart period is over process EOI */ /* if restart period is over process EOI */
if ((s->buggy_avid && !s->interlaced) || s->restart_interval) if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
...@@ -1311,112 +1309,6 @@ the_end: ...@@ -1311,112 +1309,6 @@ the_end:
return buf_ptr - buf; return buf_ptr - buf;
} }
static int mjpegb_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
uint8_t *buf, int buf_size)
{
MJpegDecodeContext *s = avctx->priv_data;
uint8_t *buf_end, *buf_ptr;
AVFrame *picture = data;
GetBitContext hgb; /* for the header */
uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs;
uint32_t field_size, sod_offs;
buf_ptr = buf;
buf_end = buf + buf_size;
read_header:
/* reset on every SOI */
s->restart_interval = 0;
s->restart_count = 0;
s->mjpb_skiptosod = 0;
init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8);
skip_bits(&hgb, 32); /* reserved zeros */
if (get_bits_long(&hgb, 32) != MKBETAG('m','j','p','g'))
{
av_log(avctx, AV_LOG_WARNING, "not mjpeg-b (bad fourcc)\n");
return 0;
}
field_size = get_bits_long(&hgb, 32); /* field size */
av_log(avctx, AV_LOG_DEBUG, "field size: 0x%x\n", field_size);
skip_bits(&hgb, 32); /* padded field size */
second_field_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "second field offs: 0x%x\n", second_field_offs);
dqt_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "dqt offs: 0x%x\n", dqt_offs);
if (dqt_offs)
{
init_get_bits(&s->gb, buf+dqt_offs, (buf_end - (buf+dqt_offs))*8);
s->start_code = DQT;
mjpeg_decode_dqt(s);
}
dht_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "dht offs: 0x%x\n", dht_offs);
if (dht_offs)
{
init_get_bits(&s->gb, buf+dht_offs, (buf_end - (buf+dht_offs))*8);
s->start_code = DHT;
mjpeg_decode_dht(s);
}
sof_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "sof offs: 0x%x\n", sof_offs);
if (sof_offs)
{
init_get_bits(&s->gb, buf+sof_offs, (buf_end - (buf+sof_offs))*8);
s->start_code = SOF0;
if (mjpeg_decode_sof(s) < 0)
return -1;
}
sos_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "sos offs: 0x%x\n", sos_offs);
sod_offs = get_bits_long(&hgb, 32);
av_log(avctx, AV_LOG_DEBUG, "sod offs: 0x%x\n", sod_offs);
if (sos_offs)
{
// init_get_bits(&s->gb, buf+sos_offs, (buf_end - (buf+sos_offs))*8);
init_get_bits(&s->gb, buf+sos_offs, field_size*8);
s->mjpb_skiptosod = (sod_offs - sos_offs - show_bits(&s->gb, 16));
s->start_code = SOS;
mjpeg_decode_sos(s);
}
if (s->interlaced) {
s->bottom_field ^= 1;
/* if not bottom field, do not output image yet */
if (s->bottom_field && second_field_offs)
{
buf_ptr = buf + second_field_offs;
second_field_offs = 0;
goto read_header;
}
}
//XXX FIXME factorize, this looks very similar to the EOI code
*picture= s->picture;
*data_size = sizeof(AVFrame);
if(!s->lossless){
picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]);
picture->qstride= 0;
picture->qscale_table= s->qscale_table;
memset(picture->qscale_table, picture->quality, (s->width+15)/16);
if(avctx->debug & FF_DEBUG_QP)
av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
picture->quality*= FF_QP2LAMBDA;
}
return buf_ptr - buf;
}
int ff_mjpeg_decode_end(AVCodecContext *avctx) int ff_mjpeg_decode_end(AVCodecContext *avctx)
{ {
MJpegDecodeContext *s = avctx->priv_data; MJpegDecodeContext *s = avctx->priv_data;
...@@ -1457,16 +1349,3 @@ AVCodec thp_decoder = { ...@@ -1457,16 +1349,3 @@ AVCodec thp_decoder = {
CODEC_CAP_DR1, CODEC_CAP_DR1,
NULL NULL
}; };
AVCodec mjpegb_decoder = {
"mjpegb",
CODEC_TYPE_VIDEO,
CODEC_ID_MJPEGB,
sizeof(MJpegDecodeContext),
ff_mjpeg_decode_init,
NULL,
ff_mjpeg_decode_end,
mjpegb_decode_frame,
CODEC_CAP_DR1,
NULL
};
libavcodec/mjpegdec.h
View file @ 33c83fba
...@@ -36,5 +36,9 @@ int ff_mjpeg_decode_end(AVCodecContext *avctx); ...@@ -36,5 +36,9 @@ int ff_mjpeg_decode_end(AVCodecContext *avctx);
int ff_mjpeg_decode_frame(AVCodecContext *avctx, int ff_mjpeg_decode_frame(AVCodecContext *avctx,
void *data, int *data_size, void *data, int *data_size,
uint8_t *buf, int buf_size); uint8_t *buf, int buf_size);
int ff_mjpeg_decode_dqt(MJpegDecodeContext *s);
int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
int ff_mjpeg_decode_sos(MJpegDecodeContext *s);
#endif /* MJPEGDEC_H */ #endif /* MJPEGDEC_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment