unused variable

[ffmpeg] / libavcodec / msvideo1.c

diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c
index 3a51ebe2fcb26e6f57f95015e61a90822f3f78a7..e8524b32efa1549347c8afe41c0a1a9493cacdd7 100644 (file)
--- a/libavcodec/msvideo1.c
+++ b/libavcodec/msvideo1.c
@@ -14,7 +14,7 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  */
 
@@ -39,28 +39,18 @@
 #include "dsputil.h"
 
 #define PALETTE_COUNT 256
-#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
 #define CHECK_STREAM_PTR(n) \
   if ((stream_ptr + n) > s->size ) { \
-    printf (" MS Video-1 warning: stream_ptr out of bounds (%d >= %d)\n", \
+    av_log(s->avctx, AV_LOG_ERROR, " MS Video-1 warning: stream_ptr out of bounds (%d >= %d)\n", \
       stream_ptr + n, s->size); \
     return; \
   }
 
-#define COPY_PREV_BLOCK() \
-    pixel_ptr = block_ptr; \
-    for (pixel_y = 0; pixel_y < 4; pixel_y++) { \
-        for (pixel_x = 0; pixel_x < 4; pixel_x++, pixel_ptr++) \
-            pixels[pixel_ptr] = prev_pixels[pixel_ptr]; \
-        pixel_ptr -= row_dec; \
-    }
-
 typedef struct Msvideo1Context {
 
     AVCodecContext *avctx;
     DSPContext dsp;
     AVFrame frame;
-    AVFrame prev_frame;
 
     unsigned char *buf;
     int size;
@@ -87,7 +77,7 @@ static int msvideo1_decode_init(AVCodecContext *avctx)
     avctx->has_b_frames = 0;
     dsputil_init(&s->dsp, avctx);
 
-    s->frame.data[0] = s->prev_frame.data[0] = NULL;
+    s->frame.data[0] = NULL;
 
     return 0;
 }
@@ -109,7 +99,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s)
     int skip_blocks;
     unsigned char colors[8];
     unsigned char *pixels = s->frame.data[0];
-    unsigned char *prev_pixels = s->prev_frame.data[0];
     int stride = s->frame.linesize[0];
 
     stream_ptr = 0;
@@ -125,7 +114,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s)
         for (block_x = blocks_wide; block_x > 0; block_x--) {
             /* check if this block should be skipped */
             if (skip_blocks) {
-                COPY_PREV_BLOCK();
                 block_ptr += block_inc;
                 skip_blocks--;
                 total_blocks--;
@@ -145,7 +133,6 @@ static void msvideo1_decode_8bit(Msvideo1Context *s)
             else if ((byte_b & 0xFC) == 0x84) {
                 /* skip code, but don't count the current block */
                 skip_blocks = ((byte_b - 0x84) << 8) + byte_a - 1;
-                COPY_PREV_BLOCK();
             } else if (byte_b < 0x80) {
                 /* 2-color encoding */
                 flags = (byte_b << 8) | byte_a;
@@ -169,8 +156,8 @@ static void msvideo1_decode_8bit(Msvideo1Context *s)
 
                 for (pixel_y = 0; pixel_y < 4; pixel_y++) {
                     for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1)
-                        pixels[pixel_ptr++] = 
-                            colors[((pixel_y & 0x2) << 1) + 
+                        pixels[pixel_ptr++] =
+                            colors[((pixel_y & 0x2) << 1) +
                                 (pixel_x & 0x2) + ((flags & 0x1) ^ 1)];
                     pixel_ptr -= row_dec;
                 }
@@ -217,7 +204,6 @@ static void msvideo1_decode_16bit(Msvideo1Context *s)
     int skip_blocks;
     unsigned short colors[8];
     unsigned short *pixels = (unsigned short *)s->frame.data[0];
-    unsigned short *prev_pixels = (unsigned short *)s->prev_frame.data[0];
     int stride = s->frame.linesize[0] / 2;
 
     stream_ptr = 0;
@@ -233,7 +219,6 @@ static void msvideo1_decode_16bit(Msvideo1Context *s)
         for (block_x = blocks_wide; block_x > 0; block_x--) {
             /* check if this block should be skipped */
             if (skip_blocks) {
-                COPY_PREV_BLOCK();
                 block_ptr += block_inc;
                 skip_blocks--;
                 total_blocks--;
@@ -253,7 +238,6 @@ static void msvideo1_decode_16bit(Msvideo1Context *s)
             } else if ((byte_b & 0xFC) == 0x84) {
                 /* skip code, but don't count the current block */
                 skip_blocks = ((byte_b - 0x84) << 8) + byte_a - 1;
-                COPY_PREV_BLOCK();
             } else if (byte_b < 0x80) {
                 /* 2- or 8-color encoding modes */
                 flags = (byte_b << 8) | byte_a;
@@ -282,8 +266,8 @@ static void msvideo1_decode_16bit(Msvideo1Context *s)
 
                     for (pixel_y = 0; pixel_y < 4; pixel_y++) {
                         for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1)
-                            pixels[pixel_ptr++] = 
-                                colors[((pixel_y & 0x2) << 1) + 
+                            pixels[pixel_ptr++] =
+                                colors[((pixel_y & 0x2) << 1) +
                                     (pixel_x & 0x2) + ((flags & 0x1) ^ 1)];
                         pixel_ptr -= row_dec;
                     }
@@ -321,27 +305,18 @@ static int msvideo1_decode_frame(AVCodecContext *avctx,
     s->buf = buf;
     s->size = buf_size;
 
-    if (avctx->get_buffer(avctx, &s->frame)) {
-        printf ("  MS Video-1 Video: get_buffer() failed\n");
+    s->frame.reference = 1;
+    s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
+    if (avctx->reget_buffer(avctx, &s->frame)) {
+        av_log(s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
         return -1;
     }
 
-    if (s->prev_frame.data[0] &&(s->frame.linesize[0] != s->prev_frame.linesize[0]))
-        printf ("  MS Video-1: Buffer linesize changed: current %u, previous %u.\n"
-                "              Expect wrong image and/or crash!\n",
-                s->frame.linesize[0], s->prev_frame.linesize[0]);
-
     if (s->mode_8bit)
         msvideo1_decode_8bit(s);
     else
         msvideo1_decode_16bit(s);
 
-    if (s->prev_frame.data[0])
-        avctx->release_buffer(avctx, &s->prev_frame);
-
-    /* shuffle frames */
-    s->prev_frame = s->frame;
-
     *data_size = sizeof(AVFrame);
     *(AVFrame*)data = s->frame;
 
@@ -353,8 +328,8 @@ static int msvideo1_decode_end(AVCodecContext *avctx)
 {
     Msvideo1Context *s = (Msvideo1Context *)avctx->priv_data;
 
-    if (s->prev_frame.data[0])
-        avctx->release_buffer(avctx, &s->prev_frame);
+    if (s->frame.data[0])
+        avctx->release_buffer(avctx, &s->frame);
 
     return 0;
 }