X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmdec.c;h=3741549b22fd427760156e9a6087e6f20d86852c;hb=3a2ddf7c2c4d27b595a601c55af23129a5a8be0d;hp=8b1384e30df85504576624e8c83faa375883f78c;hpb=054480a57b9b5cc751f482aa8b22c100ffc340d1;p=ffmpeg diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 8b1384e30df..3741549b22f 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -4,25 +4,25 @@ * * based upon code from Sebastian Jedruszkiewicz * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * 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.1 of the License, or (at your option) any later version. * - * FFmpeg 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 FFmpeg; 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 */ /** - * @file mdec.c + * @file * Sony PlayStation MDEC (Motion DECoder) * This is very similar to intra-only MPEG-1. */ @@ -31,6 +31,7 @@ #include "dsputil.h" #include "mpegvideo.h" #include "mpeg12.h" +#include "thread.h" typedef struct MDECContext{ AVCodecContext *avctx; @@ -44,9 +45,7 @@ typedef struct MDECContext{ int mb_width; int mb_height; int mb_x, mb_y; - DECLARE_ALIGNED_16(DCTELEM, block[6][64]); - DECLARE_ALIGNED_8(uint16_t, intra_matrix[64]); - DECLARE_ALIGNED_8(int, 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]; @@ -127,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; @@ -154,25 +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, - const 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= &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= FF_I_TYPE; + p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; - 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 ]; @@ -199,7 +203,7 @@ static int decode_frame(AVCodecContext *avctx, } p->quality= a->qscale * FF_QP2LAMBDA; - memset(p->qscale_table, a->qscale, p->qstride*a->mb_height); + memset(p->qscale_table, a->qscale, a->mb_width); *picture = a->picture; *data_size = sizeof(AVPicture); @@ -224,12 +228,26 @@ static av_cold int decode_init(AVCodecContext *avctx){ AVFrame *p= &a->picture; mdec_common_init(avctx); - ff_init_vlcs(); + ff_mpeg12_init_vlcs(); ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct); - 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 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; } @@ -237,6 +255,8 @@ static av_cold int decode_init(AVCodecContext *avctx){ 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; @@ -244,16 +264,16 @@ static av_cold 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) };