summaryrefslogtreecommitdiff
path: root/libavcodec/mdec.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/mdec.c')
-rw-r--r--libavcodec/mdec.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index afe122cfe8..903f165a26 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -18,13 +18,13 @@
*
* based upon code from Sebastian Jedruszkiewicz <elf@frogger.rules.pl>
*/
-
+
/**
* @file mdec.c
* PSX MDEC codec.
* This is very similar to intra only MPEG1.
*/
-
+
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
@@ -74,15 +74,15 @@ static inline int mdec_decode_block_intra(MDECContext *a, DCTELEM *block, int n)
a->last_dc[component]+= diff;
block[0] = a->last_dc[component]<<3;
}
-
+
i = 0;
{
- OPEN_READER(re, &a->gb);
+ OPEN_READER(re, &a->gb);
/* now quantify & encode AC coefs */
for(;;) {
UPDATE_CACHE(re, &a->gb);
GET_RL_VLC(level, run, re, &a->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
-
+
if(level == 127){
break;
} else if(level != 0) {
@@ -127,9 +127,9 @@ static inline int decode_mb(MDECContext *a, DCTELEM block[6][64]){
const int block_index[6]= {5,4,0,1,2,3};
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)
return -1;
}
return 0;
@@ -138,7 +138,7 @@ static inline int decode_mb(MDECContext *a, DCTELEM block[6][64]){
static inline void idct_put(MDECContext *a, int mb_x, int mb_y){
DCTELEM (*block)[64]= a->block;
int linesize= a->picture.linesize[0];
-
+
uint8_t *dest_y = a->picture.data[0] + (mb_y * 16* linesize ) + mb_x * 16;
uint8_t *dest_cb = a->picture.data[1] + (mb_y * 8 * a->picture.linesize[1]) + mb_x * 8;
uint8_t *dest_cr = a->picture.data[2] + (mb_y * 8 * a->picture.linesize[2]) + mb_x * 8;
@@ -154,7 +154,7 @@ static inline void idct_put(MDECContext *a, int mb_x, int mb_y){
}
}
-static int decode_frame(AVCodecContext *avctx,
+static int decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
uint8_t *buf, int buf_size)
{
@@ -183,32 +183,32 @@ static int decode_frame(AVCodecContext *avctx,
a->bitstream_buffer[i+1]= buf[i ];
}
init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8);
-
+
/* skip over 4 preamble bytes in stream (typically 0xXX 0xXX 0x00 0x38) */
skip_bits(&a->gb, 32);
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);
-
+
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)
return -1;
-
+
idct_put(a, a->mb_x, a->mb_y);
}
}
// p->quality= (32 + a->inv_qscale/2)/a->inv_qscale;
// memset(p->qscale_table, p->quality, p->qstride*a->mb_height);
-
+
*picture= *(AVFrame*)&a->picture;
*data_size = sizeof(AVPicture);
emms_c();
-
+
return (get_bits_count(&a->gb)+31)/32*4;
}
@@ -227,7 +227,7 @@ static void mdec_common_init(AVCodecContext *avctx){
static int decode_init(AVCodecContext *avctx){
MDECContext * const a = avctx->priv_data;
AVFrame *p= (AVFrame*)&a->picture;
-
+
mdec_common_init(avctx);
init_vlcs();
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct);
@@ -250,7 +250,7 @@ static int decode_end(AVCodecContext *avctx){
av_freep(&a->bitstream_buffer);
av_freep(&a->picture.qscale_table);
a->bitstream_buffer_size=0;
-
+
return 0;
}