highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mpegvideo: Factor ff_mpv_decode_init() out

Browse Source 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-05 16:57:57 +02:00
parent 0b890425e3
commit 4dee4a4470
7 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h261dec.c
View File

@ -76,14 +76,11 @@ static av_cold int h261_decode_init(AVCodecContext *avctx)
// set defaults // set defaults
ff_mpv_decode_defaults(s); ff_mpv_decode_defaults(s);
s->avctx = avctx; ff_mpv_decode_init(s, avctx);
s->width = s->avctx->coded_width;
s->height = s->avctx->coded_height;
s->codec_id = s->avctx->codec->id;
s->out_format = FMT_H261; s->out_format = FMT_H261;
s->low_delay = 1; s->low_delay = 1;
avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
s->codec_id = avctx->codec->id;
ff_h261_common_init(); ff_h261_common_init();
h261_decode_init_vlc(h); h261_decode_init_vlc(h);

6
libavcodec/h263dec.c
View File

@ -48,14 +48,12 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
MpegEncContext *s = avctx->priv_data; MpegEncContext *s = avctx->priv_data;
int ret; int ret;
s->avctx = avctx;
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->width = avctx->coded_width;
s->height = avctx->coded_height;
s->workaround_bugs = avctx->workaround_bugs;
// set defaults // set defaults
ff_mpv_decode_defaults(s); ff_mpv_decode_defaults(s);
ff_mpv_decode_init(s, avctx);
s->quant_precision = 5; s->quant_precision = 5;
s->decode_mb = ff_h263_decode_mb; s->decode_mb = ff_h263_decode_mb;
s->low_delay = 1; s->low_delay = 1;

3
libavcodec/mpeg12dec.c
View File

@ -1120,10 +1120,9 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx)
MpegEncContext *s2 = &s->mpeg_enc_ctx; MpegEncContext *s2 = &s->mpeg_enc_ctx;
ff_mpv_decode_defaults(s2); ff_mpv_decode_defaults(s2);
ff_mpv_decode_init(s2, avctx);
s->mpeg_enc_ctx.avctx = avctx; s->mpeg_enc_ctx.avctx = avctx;
s->mpeg_enc_ctx.flags = avctx->flags;
s->mpeg_enc_ctx.flags2 = avctx->flags2;
/* we need some permutation to store matrices, /* we need some permutation to store matrices,
* until the decoder sets the real permutation. */ * until the decoder sets the real permutation. */

12
libavcodec/mpegvideo.c
View File

@ -1109,6 +1109,18 @@ void ff_mpv_decode_defaults(MpegEncContext *s)
ff_mpv_common_defaults(s); ff_mpv_common_defaults(s);
} }
void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx)
{
s->avctx = avctx;
s->width = avctx->coded_width;
s->height = avctx->coded_height;
s->codec_id = avctx->codec->id;
s->workaround_bugs = avctx->workaround_bugs;
s->flags = avctx->flags;
s->flags2 = avctx->flags2;
}
static int init_er(MpegEncContext *s) static int init_er(MpegEncContext *s)
{ {
ERContext *er = &s->er; ERContext *er = &s->er;

1
libavcodec/mpegvideo.h
View File

@ -726,6 +726,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s);
void ff_mpv_common_end(MpegEncContext *s); void ff_mpv_common_end(MpegEncContext *s);
void ff_mpv_decode_defaults(MpegEncContext *s); void ff_mpv_decode_defaults(MpegEncContext *s);
void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx);
void ff_mpv_decode_mb(MpegEncContext *s, int16_t block[12][64]); void ff_mpv_decode_mb(MpegEncContext *s, int16_t block[12][64]);
void ff_mpv_report_decode_progress(MpegEncContext *s); void ff_mpv_report_decode_progress(MpegEncContext *s);

3
libavcodec/rv10.c
View File

@ -475,10 +475,9 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
return ret; return ret;
ff_mpv_decode_defaults(s); ff_mpv_decode_defaults(s);
ff_mpv_decode_init(s, avctx);
s->avctx = avctx;
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->codec_id = avctx->codec_id;
rv->orig_width = rv->orig_width =
s->width = avctx->coded_width; s->width = avctx->coded_width;

7
libavcodec/rv34.c
View File

@ -1490,14 +1490,9 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx)
int ret; int ret;
ff_mpv_decode_defaults(s); ff_mpv_decode_defaults(s);
s->avctx = avctx; ff_mpv_decode_init(s, avctx);
s->out_format = FMT_H263; s->out_format = FMT_H263;
s->codec_id = avctx->codec_id;
s->width = avctx->width;
s->height = avctx->height;
r->s.avctx = avctx;
avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->pix_fmt = AV_PIX_FMT_YUV420P;
avctx->has_b_frames = 1; avctx->has_b_frames = 1;
s->low_delay = 0; s->low_delay = 0;