X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fasv1.c;h=2b85d0421dcb4bec9dd2cb25ed31a7c3a6a22906;hb=5f000d5f386601e2316a243c3e41536dfbbccf4d;hp=e07880e4f6fcf92a093c7a65773d952f48eb0764;hpb=44608ac7cd52152d64a5af1a9a2927d91252421d;p=ffmpeg

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index e07880e4f6f..2b85d0421dc 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -2,36 +2,40 @@
  * ASUS V1/V2 codec
  * Copyright (c) 2003 Michael Niedermayer
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * FFmpeg 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
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
 /**
- * @file asv1.c
+ * @file libavcodec/asv1.c
  * ASUS V1/V2 codec.
  */
- 
+
 #include "avcodec.h"
+#include "libavutil/common.h"
+#include "put_bits.h"
 #include "dsputil.h"
-#include "mpegvideo.h"
+#include "mpeg12data.h"
 
 //#undef NDEBUG
 //#include <assert.h>
 
 #define VLC_BITS 6
 #define ASV2_LEVEL_VLC_BITS 10
- 
+
 typedef struct ASV1Context{
     AVCodecContext *avctx;
     DSPContext dsp;
@@ -44,11 +48,11 @@ typedef struct ASV1Context{
     int mb_height;
     int mb_width2;
     int mb_height2;
-    DCTELEM __align8 block[6][64];
-    uint16_t __align8 intra_matrix[64];
-    int __align8 q_intra_matrix[64];
+    DECLARE_ALIGNED_16(DCTELEM, block[6][64]);
+    uint16_t intra_matrix[64];
+    int q_intra_matrix[64];
     uint8_t *bitstream_buffer;
-    int bitstream_buffer_size;
+    unsigned int bitstream_buffer_size;
 } ASV1Context;
 
 static const uint8_t scantab[64]={
@@ -66,7 +70,7 @@ static const uint8_t scantab[64]={
 static const uint8_t ccp_tab[17][2]={
     {0x2,2}, {0x7,5}, {0xB,5}, {0x3,5},
     {0xD,5}, {0x5,5}, {0x9,5}, {0x1,5},
-    {0xE,5}, {0x6,5}, {0xA,5}, {0x2,5}, 
+    {0xE,5}, {0x6,5}, {0xA,5}, {0x2,5},
     {0xC,5}, {0x4,5}, {0x8,5}, {0x3,2},
     {0xF,5}, //EOB
 };
@@ -110,37 +114,37 @@ static VLC dc_ccp_vlc;
 static VLC ac_ccp_vlc;
 static VLC asv2_level_vlc;
 
-static void init_vlcs(ASV1Context *a){
+static av_cold void init_vlcs(ASV1Context *a){
     static int done = 0;
 
     if (!done) {
         done = 1;
 
-        init_vlc(&ccp_vlc, VLC_BITS, 17, 
+        INIT_VLC_STATIC(&ccp_vlc, VLC_BITS, 17,
                  &ccp_tab[0][1], 2, 1,
-                 &ccp_tab[0][0], 2, 1, 1);
-        init_vlc(&dc_ccp_vlc, VLC_BITS, 8, 
+                 &ccp_tab[0][0], 2, 1, 64);
+        INIT_VLC_STATIC(&dc_ccp_vlc, VLC_BITS, 8,
                  &dc_ccp_tab[0][1], 2, 1,
-                 &dc_ccp_tab[0][0], 2, 1, 1);
-        init_vlc(&ac_ccp_vlc, VLC_BITS, 16, 
+                 &dc_ccp_tab[0][0], 2, 1, 64);
+        INIT_VLC_STATIC(&ac_ccp_vlc, VLC_BITS, 16,
                  &ac_ccp_tab[0][1], 2, 1,
-                 &ac_ccp_tab[0][0], 2, 1, 1);
-        init_vlc(&level_vlc,  VLC_BITS, 7, 
+                 &ac_ccp_tab[0][0], 2, 1, 64);
+        INIT_VLC_STATIC(&level_vlc,  VLC_BITS, 7,
                  &level_tab[0][1], 2, 1,
-                 &level_tab[0][0], 2, 1, 1);
-        init_vlc(&asv2_level_vlc, ASV2_LEVEL_VLC_BITS, 63, 
+                 &level_tab[0][0], 2, 1, 64);
+        INIT_VLC_STATIC(&asv2_level_vlc, ASV2_LEVEL_VLC_BITS, 63,
                  &asv2_level_tab[0][1], 2, 1,
-                 &asv2_level_tab[0][0], 2, 1, 1);
+                 &asv2_level_tab[0][0], 2, 1, 1024);
     }
 }
 
 //FIXME write a reversed bitstream reader to avoid the double reverse
 static inline int asv2_get_bits(GetBitContext *gb, int n){
-    return ff_reverse[ get_bits(gb, n) << (8-n) ];
+    return av_reverse[ get_bits(gb, n) << (8-n) ];
 }
 
 static inline void asv2_put_bits(PutBitContext *pb, int n, int v){
-    put_bits(pb, n, ff_reverse[ v << (8-n) ]);
+    put_bits(pb, n, av_reverse[ v << (8-n) ]);
 }
 
 static inline int asv1_get_level(GetBitContext *gb){
@@ -163,7 +167,7 @@ static inline void asv1_put_level(PutBitContext *pb, int level){
     if(index <= 6) put_bits(pb, level_tab[index][1], level_tab[index][0]);
     else{
         put_bits(pb, level_tab[3][1], level_tab[3][0]);
-        put_bits(pb, 8, level&0xFF);
+        put_sbits(pb, 8, level);
     }
 }
 
@@ -181,7 +185,7 @@ static inline int asv1_decode_block(ASV1Context *a, DCTELEM block[64]){
     int i;
 
     block[0]= 8*get_bits(&a->gb, 8);
-    
+
     for(i=0; i<11; i++){
         const int ccp= get_vlc2(&a->gb, ccp_vlc.table, VLC_BITS, 1);
 
@@ -206,9 +210,9 @@ static inline int asv2_decode_block(ASV1Context *a, DCTELEM block[64]){
     int i, count, ccp;
 
     count= asv2_get_bits(&a->gb, 4);
-    
+
     block[0]= 8*asv2_get_bits(&a->gb, 8);
-    
+
     ccp= get_vlc2(&a->gb, dc_ccp_vlc.table, VLC_BITS, 1);
     if(ccp){
         if(ccp&4) block[a->scantable.permutated[1]]= (asv2_get_level(&a->gb) * a->intra_matrix[1])>>4;
@@ -226,17 +230,17 @@ static inline int asv2_decode_block(ASV1Context *a, DCTELEM block[64]){
             if(ccp&1) block[a->scantable.permutated[4*i+3]]= (asv2_get_level(&a->gb) * a->intra_matrix[4*i+3])>>4;
         }
     }
-    
+
     return 0;
 }
 
 static inline void asv1_encode_block(ASV1Context *a, DCTELEM block[64]){
     int i;
     int nc_count=0;
-    
+
     put_bits(&a->pb, 8, (block[0] + 32)>>6);
     block[0]= 0;
-    
+
     for(i=0; i<10; i++){
         const int index= scantab[4*i];
         int ccp=0;
@@ -247,11 +251,11 @@ static inline void asv1_encode_block(ASV1Context *a, DCTELEM block[64]){
         if( (block[index + 9] = (block[index + 9]*a->q_intra_matrix[index + 9] + (1<<15))>>16) ) ccp |= 1;
 
         if(ccp){
-            for(;nc_count; nc_count--) 
+            for(;nc_count; nc_count--)
                 put_bits(&a->pb, ccp_tab[0][1], ccp_tab[0][0]);
 
             put_bits(&a->pb, ccp_tab[ccp][1], ccp_tab[ccp][0]);
-            
+
             if(ccp&8) asv1_put_level(&a->pb, block[index + 0]);
             if(ccp&4) asv1_put_level(&a->pb, block[index + 8]);
             if(ccp&2) asv1_put_level(&a->pb, block[index + 1]);
@@ -266,20 +270,20 @@ static inline void asv1_encode_block(ASV1Context *a, DCTELEM block[64]){
 static inline void asv2_encode_block(ASV1Context *a, DCTELEM block[64]){
     int i;
     int count=0;
-    
+
     for(count=63; count>3; count--){
         const int index= scantab[count];
 
-        if( (block[index]*a->q_intra_matrix[index] + (1<<15))>>16 ) 
+        if( (block[index]*a->q_intra_matrix[index] + (1<<15))>>16 )
             break;
     }
-    
+
     count >>= 2;
 
     asv2_put_bits(&a->pb, 4, count);
     asv2_put_bits(&a->pb, 8, (block[0] + 32)>>6);
     block[0]= 0;
-    
+
     for(i=0; i<=count; i++){
         const int index= scantab[4*i];
         int ccp=0;
@@ -289,6 +293,7 @@ static inline void asv2_encode_block(ASV1Context *a, DCTELEM block[64]){
         if( (block[index + 1] = (block[index + 1]*a->q_intra_matrix[index + 1] + (1<<15))>>16) ) ccp |= 2;
         if( (block[index + 9] = (block[index + 9]*a->q_intra_matrix[index + 9] + (1<<15))>>16) ) ccp |= 1;
 
+        assert(i || ccp<8);
         if(i) put_bits(&a->pb, ac_ccp_tab[ccp][1], ac_ccp_tab[ccp][0]);
         else  put_bits(&a->pb, dc_ccp_tab[ccp][1], dc_ccp_tab[ccp][0]);
 
@@ -305,15 +310,15 @@ static inline int decode_mb(ASV1Context *a, DCTELEM block[6][64]){
     int i;
 
     a->dsp.clear_blocks(block[0]);
-    
+
     if(a->avctx->codec_id == CODEC_ID_ASV1){
         for(i=0; i<6; i++){
-            if( asv1_decode_block(a, block[i]) < 0) 
+            if( asv1_decode_block(a, block[i]) < 0)
                 return -1;
         }
     }else{
         for(i=0; i<6; i++){
-            if( asv2_decode_block(a, block[i]) < 0) 
+            if( asv2_decode_block(a, block[i]) < 0)
                 return -1;
         }
     }
@@ -322,7 +327,7 @@ static inline int decode_mb(ASV1Context *a, DCTELEM block[6][64]){
 
 static inline int encode_mb(ASV1Context *a, DCTELEM block[6][64]){
     int i;
-    
+
     if(a->pb.buf_end - a->pb.buf - (put_bits_count(&a->pb)>>3) < 30*16*16*3/2/8){
         av_log(a->avctx, AV_LOG_ERROR, "encoded frame too large\n");
         return -1;
@@ -341,7 +346,7 @@ static inline int encode_mb(ASV1Context *a, DCTELEM block[6][64]){
 static inline void idct_put(ASV1Context *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;
@@ -361,7 +366,7 @@ static inline void dct_get(ASV1Context *a, int mb_x, int mb_y){
     DCTELEM (*block)[64]= a->block;
     int linesize= a->picture.linesize[0];
     int i;
-    
+
     uint8_t *ptr_y  = a->picture.data[0] + (mb_y * 16* linesize              ) + mb_x * 16;
     uint8_t *ptr_cb = a->picture.data[1] + (mb_y * 8 * a->picture.linesize[1]) + mb_x * 8;
     uint8_t *ptr_cr = a->picture.data[2] + (mb_y * 8 * a->picture.linesize[2]) + mb_x * 8;
@@ -372,7 +377,7 @@ static inline void dct_get(ASV1Context *a, int mb_x, int mb_y){
     a->dsp.get_pixels(block[3], ptr_y + 8*linesize + 8, linesize);
     for(i=0; i<4; i++)
         a->dsp.fdct(block[i]);
-    
+
     if(!(a->avctx->flags&CODEC_FLAG_GRAY)){
         a->dsp.get_pixels(block[4], ptr_cb, a->picture.linesize[1]);
         a->dsp.get_pixels(block[5], ptr_cr, a->picture.linesize[2]);
@@ -381,13 +386,15 @@ static inline void dct_get(ASV1Context *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)
+                        AVPacket *avpkt)
 {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     ASV1Context * const a = avctx->priv_data;
     AVFrame *picture = data;
-    AVFrame * const p= (AVFrame*)&a->picture;
+    AVFrame * const p= &a->picture;
     int mb_x, mb_y;
 
     if(p->data[0])
@@ -398,17 +405,19 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     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);
+
     if(avctx->codec_id == CODEC_ID_ASV1)
-        a->dsp.bswap_buf((uint32_t*)a->bitstream_buffer, (uint32_t*)buf, buf_size/4);
+        a->dsp.bswap_buf((uint32_t*)a->bitstream_buffer, (const uint32_t*)buf, buf_size/4);
     else{
         int i;
         for(i=0; i<buf_size; i++)
-            a->bitstream_buffer[i]= ff_reverse[ buf[i] ];
+            a->bitstream_buffer[i]= av_reverse[ buf[i] ];
     }
 
     init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8);
@@ -417,7 +426,7 @@ static int decode_frame(AVCodecContext *avctx,
         for(mb_x=0; mb_x<a->mb_width2; mb_x++){
             if( decode_mb(a, a->block) <0)
                 return -1;
-             
+
             idct_put(a, mb_x, mb_y);
         }
     }
@@ -427,7 +436,7 @@ static int decode_frame(AVCodecContext *avctx,
         for(mb_y=0; mb_y<a->mb_height2; mb_y++){
             if( decode_mb(a, a->block) <0)
                 return -1;
-             
+
             idct_put(a, mb_x, mb_y);
         }
     }
@@ -437,11 +446,11 @@ static int decode_frame(AVCodecContext *avctx,
         for(mb_x=0; mb_x<a->mb_width; mb_x++){
             if( decode_mb(a, a->block) <0)
                 return -1;
-             
+
             idct_put(a, mb_x, mb_y);
         }
     }
-#if 0    
+#if 0
 int i;
 printf("%d %d\n", 8*buf_size, get_bits_count(&a->gb));
 for(i=get_bits_count(&a->gb); i<8*buf_size; i++){
@@ -457,21 +466,22 @@ for(i=0; i<s->avctx->extradata_size; i++){
     *data_size = sizeof(AVPicture);
 
     emms_c();
-    
+
     return (get_bits_count(&a->gb)+31)/32*4;
 }
 
+#if CONFIG_ASV1_ENCODER || CONFIG_ASV2_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     ASV1Context * const a = avctx->priv_data;
     AVFrame *pict = data;
-    AVFrame * const p= (AVFrame*)&a->picture;
+    AVFrame * const p= &a->picture;
     int size;
     int mb_x, mb_y;
 
     init_put_bits(&a->pb, buf, buf_size);
-    
+
     *p = *pict;
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_I_TYPE;
     p->key_frame= 1;
 
     for(mb_y=0; mb_y<a->mb_height2; mb_y++){
@@ -497,25 +507,26 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
         }
     }
     emms_c();
-    
+
     align_put_bits(&a->pb);
     while(put_bits_count(&a->pb)&31)
         put_bits(&a->pb, 8, 0);
-    
+
     size= put_bits_count(&a->pb)/32;
-    
+
     if(avctx->codec_id == CODEC_ID_ASV1)
         a->dsp.bswap_buf((uint32_t*)buf, (uint32_t*)buf, size);
     else{
         int i;
         for(i=0; i<4*size; i++)
-            buf[i]= ff_reverse[ buf[i] ];
+            buf[i]= av_reverse[ buf[i] ];
     }
-    
+
     return size*4;
 }
+#endif /* CONFIG_ASV1_ENCODER || CONFIG_ASV2_ENCODER */
 
-static void common_init(AVCodecContext *avctx){
+static av_cold void common_init(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;
 
     dsputil_init(&a->dsp, avctx);
@@ -525,22 +536,22 @@ static void common_init(AVCodecContext *avctx){
     a->mb_width2  = (avctx->width  + 0) / 16;
     a->mb_height2 = (avctx->height + 0) / 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){
     ASV1Context * const a = avctx->priv_data;
-    AVFrame *p= (AVFrame*)&a->picture;
+    AVFrame *p= &a->picture;
     int i;
     const int scale= avctx->codec_id == CODEC_ID_ASV1 ? 1 : 2;
- 
+
     common_init(avctx);
     init_vlcs(a);
     ff_init_scantable(a->dsp.idct_permutation, &a->scantable, scantab);
     avctx->pix_fmt= PIX_FMT_YUV420P;
 
-    a->inv_qscale= ((uint8_t*)avctx->extradata)[0];
+    a->inv_qscale= avctx->extradata[0];
     if(a->inv_qscale == 0){
         av_log(avctx, AV_LOG_ERROR, "illegal qscale 0\n");
         if(avctx->codec_id == CODEC_ID_ASV1)
@@ -563,22 +574,23 @@ static int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-static int encode_init(AVCodecContext *avctx){
+#if CONFIG_ASV1_ENCODER || CONFIG_ASV2_ENCODER
+static av_cold int encode_init(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;
     int i;
     const int scale= avctx->codec_id == CODEC_ID_ASV1 ? 1 : 2;
 
     common_init(avctx);
-    
+
     if(avctx->global_quality == 0) avctx->global_quality= 4*FF_QUALITY_SCALE;
 
     a->inv_qscale= (32*scale*FF_QUALITY_SCALE +  avctx->global_quality/2) / avctx->global_quality;
-    
+
     avctx->extradata= av_mallocz(8);
     avctx->extradata_size=8;
     ((uint32_t*)avctx->extradata)[0]= le2me_32(a->inv_qscale);
-    ((uint32_t*)avctx->extradata)[1]= le2me_32(ff_get_fourcc("ASUS"));
-    
+    ((uint32_t*)avctx->extradata)[1]= le2me_32(AV_RL32("ASUS"));
+
     for(i=0; i<64; i++){
         int q= 32*scale*ff_mpeg1_default_intra_matrix[i];
         a->q_intra_matrix[i]= ((a->inv_qscale<<16) + q/2) / q;
@@ -586,14 +598,18 @@ static int encode_init(AVCodecContext *avctx){
 
     return 0;
 }
+#endif /* CONFIG_ASV1_ENCODER || CONFIG_ASV2_ENCODER */
 
-static int decode_end(AVCodecContext *avctx){
+static av_cold int decode_end(AVCodecContext *avctx){
     ASV1Context * const a = avctx->priv_data;
 
     av_freep(&a->bitstream_buffer);
     av_freep(&a->picture.qscale_table);
     a->bitstream_buffer_size=0;
-    
+
+    if(a->picture.data[0])
+        avctx->release_buffer(avctx, &a->picture);
+
     return 0;
 }
 
@@ -607,6 +623,7 @@ AVCodec asv1_decoder = {
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
+    .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"),
 };
 
 AVCodec asv2_decoder = {
@@ -619,10 +636,10 @@ AVCodec asv2_decoder = {
     decode_end,
     decode_frame,
     CODEC_CAP_DR1,
+    .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"),
 };
 
-#ifdef CONFIG_ENCODERS
-
+#if CONFIG_ASV1_ENCODER
 AVCodec asv1_encoder = {
     "asv1",
     CODEC_TYPE_VIDEO,
@@ -631,8 +648,12 @@ AVCodec asv1_encoder = {
     encode_init,
     encode_frame,
     //encode_end,
+    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+    .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"),
 };
+#endif
 
+#if CONFIG_ASV2_ENCODER
 AVCodec asv2_encoder = {
     "asv2",
     CODEC_TYPE_VIDEO,
@@ -641,6 +662,7 @@ AVCodec asv2_encoder = {
     encode_init,
     encode_frame,
     //encode_end,
+    .pix_fmts= (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+    .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"),
 };
-
-#endif //CONFIG_ENCODERS
+#endif