create adts stream if CODEC_FLAG_GLOBAL_HEADER not set

[ffmpeg] / libavcodec / indeo2.c

diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index a2f4583c643a480b99d15d881453e9fadf5fa963..3814e5250f3a7911b34b40285f568d3f17790d08 100644 (file)
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -14,15 +14,15 @@
  *
  * 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
  *
  */
- 
+
 /**
  * @file indeo2.c
  * Intel Indeo 2 decoder.
  */
- 
+#define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "bitstream.h"
 #include "indeo2data.h"
@@ -40,20 +40,10 @@ static VLC ir2_vlc;
 /* Indeo 2 codes are in range 0x01..0x7F and 0x81..0x90 */
 static inline int ir2_get_code(GetBitContext *gb)
 {
-    int code;
-    
-    code = get_vlc2(gb, ir2_vlc.table, CODE_VLC_BITS, 1) + 1;
-    if (code >= 0x80)
-        return (code + 1);
-    return code;
+    return get_vlc2(gb, ir2_vlc.table, CODE_VLC_BITS, 1) + 1;
 }
-#define CLAMP_TO_BYTE(value) \
-if (value > 255) \
-    value = 255; \
-else if (value < 0) \
-    value = 0; \
 
-static void ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride,
+static int ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride,
                              const uint8_t *table)
 {
     int i;
@@ -61,12 +51,17 @@ static void ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *ds
     int out = 0;
     int c;
     int t;
-    
+
+    if(width&1)
+        return -1;
+
     /* first line contain absolute values, other lines contain deltas */
     while (out < width){
         c = ir2_get_code(&ctx->gb);
-        if(c > 0x80) { /* we have a run */
-            c -= 0x80;
+        if(c >= 0x80) { /* we have a run */
+            c -= 0x7F;
+            if(out + c*2 > width)
+                return -1;
             for (i = 0; i < c * 2; i++)
                 dst[out++] = 0x80;
         } else { /* copy two values from table */
@@ -75,63 +70,70 @@ static void ir2_decode_plane(Ir2Context *ctx, int width, int height, uint8_t *ds
         }
     }
     dst += stride;
-    
+
     for (j = 1; j < height; j++){
         out = 0;
         while (out < width){
             c = ir2_get_code(&ctx->gb);
-            if(c > 0x80) { /* we have a skip */
-                c -= 0x80;
+            if(c >= 0x80) { /* we have a skip */
+                c -= 0x7F;
+                if(out + c*2 > width)
+                    return -1;
                 for (i = 0; i < c * 2; i++) {
                     dst[out] = dst[out - stride];
                     out++;
                 }
             } else { /* add two deltas from table */
                 t = dst[out - stride] + (table[c * 2] - 128);
-                CLAMP_TO_BYTE(t);
+                t= clip_uint8(t);
                 dst[out] = t;
                 out++;
                 t = dst[out - stride] + (table[(c * 2) + 1] - 128);
-                CLAMP_TO_BYTE(t);
+                t= clip_uint8(t);
                 dst[out] = t;
                 out++;
             }
         }
         dst += stride;
     }
+    return 0;
 }
 
-static void ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride,
+static int ir2_decode_plane_inter(Ir2Context *ctx, int width, int height, uint8_t *dst, int stride,
                              const uint8_t *table)
 {
     int j;
     int out = 0;
     int c;
     int t;
-    
+
+    if(width&1)
+        return -1;
+
     for (j = 0; j < height; j++){
         out = 0;
         while (out < width){
             c = ir2_get_code(&ctx->gb);
-            if(c > 0x80) { /* we have a skip */
-                c -= 0x80;
+            if(c >= 0x80) { /* we have a skip */
+                c -= 0x7F;
                 out += c * 2;
             } else { /* add two deltas from table */
-                t = dst[out] + (table[c * 2] - 128);
-                CLAMP_TO_BYTE(t);
+                t = dst[out] + (((table[c * 2] - 128)*3) >> 2);
+                t= clip_uint8(t);
                 dst[out] = t;
                 out++;
-                t = dst[out] + (table[(c * 2) + 1] - 128);
-                CLAMP_TO_BYTE(t);
+                t = dst[out] + (((table[(c * 2) + 1] - 128)*3) >> 2);
+                t= clip_uint8(t);
                 dst[out] = t;
                 out++;
             }
         }
         dst += stride;
     }
+    return 0;
 }
 
-static int ir2_decode_frame(AVCodecContext *avctx, 
+static int ir2_decode_frame(AVCodecContext *avctx,
                         void *data, int *data_size,
                         uint8_t *buf, int buf_size)
 {
@@ -139,7 +141,6 @@ static int ir2_decode_frame(AVCodecContext *avctx,
     AVFrame *picture = data;
     AVFrame * const p= (AVFrame*)&s->picture;
     int start;
-    int i;
 
     if(p->data[0])
         avctx->release_buffer(avctx, p);
@@ -152,12 +153,12 @@ static int ir2_decode_frame(AVCodecContext *avctx,
     }
 
     s->decode_delta = buf[18];
-    
+
     /* decide whether frame uses deltas or not */
-    
+#ifndef ALT_BITSTREAM_READER_LE
     for (i = 0; i < buf_size; i++)
         buf[i] = ff_reverse[buf[i]];
-        
+#endif
     start = 48; /* hardcoded for now */
 
     init_get_bits(&s->gb, buf + start, buf_size - start);
@@ -192,11 +193,15 @@ static int ir2_decode_init(AVCodecContext *avctx){
     ic->avctx = avctx;
 
     avctx->pix_fmt= PIX_FMT_YUV410P;
-    
+
     if (!ir2_vlc.table)
         init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
                  &ir2_codes[0][1], 4, 2,
-                 &ir2_codes[0][0], 4, 2, 1);    
+#ifdef ALT_BITSTREAM_READER_LE
+                 &ir2_codes[0][0], 4, 2, INIT_VLC_USE_STATIC | INIT_VLC_LE);
+#else
+                 &ir2_codes[0][0], 4, 2, INIT_VLC_USE_STATIC);
+#endif
 
     return 0;
 }