#include "dsputil.h"
#include "mpegvideo.h"
-//#undef NDEBUG
-//#include <assert.h>
-
typedef struct MDECContext{
AVCodecContext *avctx;
DSPContext dsp;
AVFrame picture;
- PutBitContext pb;
GetBitContext gb;
ScanTable scantable;
int version;
int mb_width;
int mb_height;
int mb_x, mb_y;
- DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
+ DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]);
DECLARE_ALIGNED_8(int, q_intra_matrix[64]);
uint8_t *bitstream_buffer;
i += run;
j = scantable[i];
level= (level*qscale*quant_matrix[j])>>3;
-// level= (level-1)|1;
level = (level ^ SHOW_SBITS(re, &a->gb, 1)) - SHOW_SBITS(re, &a->gb, 1);
LAST_SKIP_BITS(re, &a->gb, 1);
} else {
{
MDECContext * const a = avctx->priv_data;
AVFrame *picture = data;
- AVFrame * const p= (AVFrame*)&a->picture;
+ AVFrame * const p= &a->picture;
int i;
if(p->data[0])
a->last_dc[1]=
a->last_dc[2]= 128;
-// printf("qscale:%d (0x%X), version:%d (0x%X)\n", a->qscale, a->qscale, a->version, a->version);
-
for(a->mb_x=0; a->mb_x<a->mb_width; a->mb_x++){
for(a->mb_y=0; a->mb_y<a->mb_height; a->mb_y++){
if( decode_mb(a, a->block) <0)
}
}
-// p->quality= (32 + a->inv_qscale/2)/a->inv_qscale;
-// memset(p->qscale_table, p->quality, p->qstride*a->mb_height);
+ p->quality= a->qscale * FF_QP2LAMBDA;
+ memset(p->qscale_table, a->qscale, p->qstride*a->mb_height);
- *picture= *(AVFrame*)&a->picture;
+ *picture = a->picture;
*data_size = sizeof(AVPicture);
- emms_c();
-
return (get_bits_count(&a->gb)+31)/32*4;
}
-static void mdec_common_init(AVCodecContext *avctx){
+static av_cold void mdec_common_init(AVCodecContext *avctx){
MDECContext * const a = avctx->priv_data;
dsputil_init(&a->dsp, avctx);
a->mb_width = (avctx->coded_width + 15) / 16;
a->mb_height = (avctx->coded_height + 15) / 16;
- avctx->coded_frame= (AVFrame*)&a->picture;
+ avctx->coded_frame= &a->picture;
a->avctx= avctx;
}
-static int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
MDECContext * const a = avctx->priv_data;
- AVFrame *p= (AVFrame*)&a->picture;
+ AVFrame *p= &a->picture;
mdec_common_init(avctx);
init_vlcs();
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct);
-/*
- for(i=0; i<64; i++){
- int index= ff_zigzag_direct[i];
- a->intra_matrix[i]= 64*ff_mpeg1_default_intra_matrix[index] / a->inv_qscale;
- }
-*/
+
p->qstride= a->mb_width;
p->qscale_table= av_mallocz( p->qstride * a->mb_height);
avctx->pix_fmt= PIX_FMT_YUV420P;
return 0;
}
-static int decode_end(AVCodecContext *avctx){
+static av_cold int decode_end(AVCodecContext *avctx){
MDECContext * const a = avctx->priv_data;
av_freep(&a->bitstream_buffer);
decode_end,
decode_frame,
CODEC_CAP_DR1,
+ .long_name= NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"),
};