X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmdec.c;h=a4e202031789321bc56cd2bf6428cd7c87a4d3fd;hb=dcd2b55e1a7d1f88dc893c04cc86181fc7f11cc4;hp=4a346ef60927cf6f825a5df441bda8bff04f60ea;hpb=f038fe8b4a023351c82afcc901891097fa9b0d29;p=ffmpeg diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 4a346ef6092..a4e20203178 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -1,42 +1,42 @@ /* - * PSX MDEC codec + * Sony PlayStation MDEC (Motion DECoder) * Copyright (c) 2003 Michael Niedermayer * - * This library is free software; you can redistribute it and/or + * based upon code from Sebastian Jedruszkiewicz + * + * This file is part of Libav. + * + * Libav 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * Libav 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 this library; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * based upon code from Sebastian Jedruszkiewicz */ /** - * @file mdec.c - * PSX MDEC codec. - * This is very similar to intra only MPEG1. + * @file + * Sony PlayStation MDEC (Motion DECoder) + * This is very similar to intra-only MPEG-1. */ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" - -//#undef NDEBUG -//#include +#include "mpeg12.h" +#include "thread.h" typedef struct MDECContext{ AVCodecContext *avctx; DSPContext dsp; AVFrame picture; - PutBitContext pb; GetBitContext gb; ScanTable scantable; int version; @@ -45,25 +45,23 @@ typedef struct MDECContext{ int mb_width; int mb_height; int mb_x, mb_y; - DCTELEM __align8 block[6][64]; - uint16_t __align8 intra_matrix[64]; - int __align8 q_intra_matrix[64]; + DECLARE_ALIGNED(16, DCTELEM, block)[6][64]; uint8_t *bitstream_buffer; unsigned int bitstream_buffer_size; int block_last_index[6]; } MDECContext; -//very similar to mpeg1 +//very similar to MPEG-1 static inline int mdec_decode_block_intra(MDECContext *a, DCTELEM *block, int n) { int level, diff, i, j, run; int component; - RLTable *rl = &rl_mpeg1; + RLTable *rl = &ff_rl_mpeg1; uint8_t * const scantable= a->scantable.permutated; const uint16_t *quant_matrix= ff_mpeg1_default_intra_matrix; const int qscale= a->qscale; - /* DC coef */ + /* DC coefficient */ if(a->version==2){ block[0]= 2*get_sbits(&a->gb, 10) + 1024; }else{ @@ -78,7 +76,7 @@ static inline int mdec_decode_block_intra(MDECContext *a, DCTELEM *block, int n) i = 0; { OPEN_READER(re, &a->gb); - /* now quantify & encode AC coefs */ + /* now quantify & encode AC coefficients */ for(;;) { UPDATE_CACHE(re, &a->gb); GET_RL_VLC(level, run, re, &a->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0); @@ -89,7 +87,6 @@ static inline int mdec_decode_block_intra(MDECContext *a, DCTELEM *block, int n) 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 { @@ -129,7 +126,8 @@ static inline int decode_mb(MDECContext *a, DCTELEM block[6][64]){ a->dsp.clear_blocks(block[0]); for(i=0; i<6; i++){ - if( mdec_decode_block_intra(a, block[ block_index[i] ], block_index[i]) < 0) + if( mdec_decode_block_intra(a, block[ block_index[i] ], block_index[i]) < 0 || + get_bits_left(&a->gb) < 0) return -1; } return 0; @@ -156,28 +154,29 @@ static inline void idct_put(MDECContext *a, int mb_x, int mb_y){ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; 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]) - avctx->release_buffer(avctx, p); + ff_thread_release_buffer(avctx, p); p->reference= 0; - if(avctx->get_buffer(avctx, p) < 0){ + if(ff_thread_get_buffer(avctx, p) < 0){ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } - p->pict_type= I_TYPE; + p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; - a->last_dc[0]= - a->last_dc[1]= - a->last_dc[2]= 0; - a->bitstream_buffer= av_fast_realloc(a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); + av_fast_malloc(&a->bitstream_buffer, &a->bitstream_buffer_size, buf_size + FF_INPUT_BUFFER_PADDING_SIZE); + if (!a->bitstream_buffer) + return AVERROR(ENOMEM); for(i=0; ibitstream_buffer[i] = buf[i+1]; a->bitstream_buffer[i+1]= buf[i ]; @@ -190,7 +189,9 @@ static int decode_frame(AVCodecContext *avctx, a->qscale= get_bits(&a->gb, 16); a->version= get_bits(&a->gb, 16); -// printf("qscale:%d (0x%X), version:%d (0x%X)\n", a->qscale, a->qscale, a->version, a->version); + a->last_dc[0]= + a->last_dc[1]= + a->last_dc[2]= 128; for(a->mb_x=0; a->mb_xmb_width; a->mb_x++){ for(a->mb_y=0; a->mb_ymb_height; a->mb_y++){ @@ -201,18 +202,16 @@ static int decode_frame(AVCodecContext *avctx, } } -// 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, a->mb_width); - *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); @@ -220,33 +219,44 @@ static void mdec_common_init(AVCodecContext *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_mpeg12_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; + + if( avctx->idct_algo == FF_IDCT_AUTO ) + avctx->idct_algo = FF_IDCT_SIMPLE; + p->qstride= 0; + p->qscale_table= av_mallocz(a->mb_width); + avctx->pix_fmt= PIX_FMT_YUVJ420P; return 0; } -static int decode_end(AVCodecContext *avctx){ +static av_cold int decode_init_thread_copy(AVCodecContext *avctx){ MDECContext * const a = avctx->priv_data; + AVFrame *p = (AVFrame*)&a->picture; + + avctx->coded_frame = p; + a->avctx= avctx; + + p->qscale_table = av_mallocz( a->mb_width); + return 0; +} + +static av_cold int decode_end(AVCodecContext *avctx){ + MDECContext * const a = avctx->priv_data; + + if(a->picture.data[0]) + avctx->release_buffer(avctx, &a->picture); av_freep(&a->bitstream_buffer); av_freep(&a->picture.qscale_table); a->bitstream_buffer_size=0; @@ -254,15 +264,15 @@ static int decode_end(AVCodecContext *avctx){ return 0; } -AVCodec mdec_decoder = { - "mdec", - CODEC_TYPE_VIDEO, - CODEC_ID_MDEC, - sizeof(MDECContext), - decode_init, - NULL, - decode_end, - decode_frame, - CODEC_CAP_DR1, +AVCodec ff_mdec_decoder = { + .name = "mdec", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_MDEC, + .priv_data_size = sizeof(MDECContext), + .init = decode_init, + .close = decode_end, + .decode = decode_frame, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, + .long_name= NULL_IF_CONFIG_SMALL("Sony PlayStation MDEC (Motion DECoder)"), + .init_thread_copy= ONLY_IF_THREADS_ENABLED(decode_init_thread_copy) }; -