[FFmpeg-soc] [soc]: r814 - in dirac: ffmpeg.diff libavcodec/dirac.c

marco subversion at mplayerhq.hu
Wed Aug 15 15:07:52 CEST 2007


Author: marco
Date: Wed Aug 15 15:07:52 2007
New Revision: 814

Log:
update to the FFmpeg

Modified:
   dirac/ffmpeg.diff
   dirac/libavcodec/dirac.c

Modified: dirac/ffmpeg.diff
==============================================================================
--- dirac/ffmpeg.diff	(original)
+++ dirac/ffmpeg.diff	Wed Aug 15 15:07:52 2007
@@ -1,156 +1,8 @@
-Index: libavcodec/golomb.c
-===================================================================
---- libavcodec/golomb.c	(revision 10116)
-+++ libavcodec/golomb.c	(working copy)
-@@ -1,6 +1,7 @@
- /*
-  * exp golomb vlc stuff
-  * Copyright (c) 2003 Michael Niedermayer <michaelni at gmx.at>
-+ * Copyright (c) 2007 Marco Gerards <marco at gnu.org>
-  *
-  * This file is part of FFmpeg.
-  *
-@@ -23,7 +24,7 @@
-  * @file golomb.c
-  * @brief
-  *     exp golomb vlc stuff
-- * @author Michael Niedermayer <michaelni at gmx.at>
-+ * @author Michael Niedermayer <michaelni at gmx.at> and Marco Gerards <marco at gnu.org>
-  */
- 
- #include "common.h"
-@@ -153,3 +154,39 @@
-   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
- };
-+
-+const uint8_t ff_interleaved_dirac_golomb_vlc_len[256]={
-+9,9,7,7,9,9,7,7,5,5,5,5,5,5,5,5,
-+9,9,7,7,9,9,7,7,5,5,5,5,5,5,5,5,
-+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
-+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
-+9,9,7,7,9,9,7,7,5,5,5,5,5,5,5,5,
-+9,9,7,7,9,9,7,7,5,5,5,5,5,5,5,5,
-+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
-+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
-+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-+1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,};
-+
-+const uint8_t ff_interleaved_dirac_golomb_vlc_code[256]={
-+0, 1, 0, 0, 2, 3, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 
-+4, 5, 2, 2, 6, 7, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+8, 9, 4, 4, 10,11,5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 
-+12,13,6, 6, 14,15,7, 7, 3, 3, 3, 3, 3, 3, 3, 3, 
-+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-+1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,};
 Index: libavcodec/golomb.h
 ===================================================================
---- libavcodec/golomb.h	(revision 10116)
+--- libavcodec/golomb.h	(revision 10119)
 +++ libavcodec/golomb.h	(working copy)
-@@ -2,6 +2,7 @@
-  * exp golomb vlc stuff
-  * Copyright (c) 2003 Michael Niedermayer <michaelni at gmx.at>
-  * Copyright (c) 2004 Alex Beregszaszi
-+ * Copyright (c) 2007 Marco Gerards <marco at gnu.org>
-  *
-  * This file is part of FFmpeg.
-  *
-@@ -24,7 +25,7 @@
-  * @file golomb.h
-  * @brief
-  *     exp golomb vlc stuff
-- * @author Michael Niedermayer <michaelni at gmx.at> and Alex Beregszaszi
-+ * @author Michael Niedermayer <michaelni at gmx.at>, Alex Beregszaszi and Marco Gerards
-  */
- 
- #ifndef AVCODEC_GOLOMB_H
-@@ -43,6 +44,8 @@
- extern const uint8_t ff_interleaved_golomb_vlc_len[256];
- extern const uint8_t ff_interleaved_ue_golomb_vlc_code[256];
- extern const  int8_t ff_interleaved_se_golomb_vlc_code[256];
-+extern const uint8_t ff_interleaved_dirac_golomb_vlc_len[256];
-+extern const uint8_t ff_interleaved_dirac_golomb_vlc_code[256];
- 
- 
-  /**
-@@ -106,6 +109,60 @@
-     }
- }
- 
-+static inline int dirac_get_ue_golomb(GetBitContext *gb){
-+    uint32_t buf;
-+    uint32_t ret = 1;
-+
-+    OPEN_READER(re, gb);
-+    while (1) {
-+        UPDATE_CACHE(re, gb);
-+        buf = GET_CACHE(re, gb);
-+
-+        buf >>= 32 - 8;
-+        LAST_SKIP_BITS(re, gb, FFMIN(ff_interleaved_dirac_golomb_vlc_len[buf], 8));
-+
-+        ret <<= (ff_interleaved_dirac_golomb_vlc_len[buf] - 1) >> 1;
-+        ret |= ff_interleaved_dirac_golomb_vlc_code[buf];
-+        if (ff_interleaved_dirac_golomb_vlc_len[buf] != 9)
-+            break;
-+    }
-+    CLOSE_READER(re, gb);
-+
-+    return ret - 1;
-+}
-+
-+static inline int dirac_get_se_golomb(GetBitContext *gb){
-+    uint32_t buf;
-+    uint32_t ret = 1;
-+
-+    OPEN_READER(re, gb);
-+    while (1) {
-+        UPDATE_CACHE(re, gb);
-+
-+        buf = GET_CACHE(re, gb);
-+        buf >>= 32 - 8;
-+        LAST_SKIP_BITS(re, gb, FFMIN(ff_interleaved_dirac_golomb_vlc_len[buf], 8));
-+
-+        ret <<= (ff_interleaved_dirac_golomb_vlc_len[buf] - 1) >> 1;
-+        ret |= ff_interleaved_dirac_golomb_vlc_code[buf];
-+        if (ff_interleaved_dirac_golomb_vlc_len[buf] != 9)
-+            break;
-+    }
-+    ret--;
-+
-+    UPDATE_CACHE(re, gb);
-+    buf = GET_CACHE(re, gb);
-+    if (ret) {
-+        LAST_SKIP_BITS(re, gb, 1);
-+        if (buf & 0x80000000)
-+            ret = -ret;
-+    }
-+
-+    CLOSE_READER(re, gb);
-+
-+    return ret;
-+}
-+
- /**
-  * read unsigned truncated exp golomb code.
-  */
-@@ -483,4 +540,28 @@
+@@ -504,4 +504,28 @@
      set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
  }
  
@@ -181,7 +33,7 @@ Index: libavcodec/golomb.h
  #endif // AVCODEC_GOLOMB_H
 Index: libavcodec/Makefile
 ===================================================================
---- libavcodec/Makefile	(revision 10116)
+--- libavcodec/Makefile	(revision 10119)
 +++ libavcodec/Makefile	(working copy)
 @@ -53,6 +53,7 @@
  OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
@@ -201,7 +53,7 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_H261_PARSER)             += h261_parser.o
 Index: libavcodec/allcodecs.c
 ===================================================================
---- libavcodec/allcodecs.c	(revision 10116)
+--- libavcodec/allcodecs.c	(revision 10119)
 +++ libavcodec/allcodecs.c	(working copy)
 @@ -68,6 +68,7 @@
      REGISTER_DECODER(CLJR, cljr);
@@ -221,7 +73,7 @@ Index: libavcodec/allcodecs.c
      REGISTER_PARSER (H261, h261);
 Index: libavcodec/allcodecs.h
 ===================================================================
---- libavcodec/allcodecs.h	(revision 10116)
+--- libavcodec/allcodecs.h	(revision 10119)
 +++ libavcodec/allcodecs.h	(working copy)
 @@ -93,6 +93,7 @@
  extern AVCodec cscd_decoder;
@@ -233,7 +85,7 @@ Index: libavcodec/allcodecs.h
  extern AVCodec dsicinvideo_decoder;
 Index: libavcodec/avcodec.h
 ===================================================================
---- libavcodec/avcodec.h	(revision 10116)
+--- libavcodec/avcodec.h	(revision 10119)
 +++ libavcodec/avcodec.h	(working copy)
 @@ -166,6 +166,7 @@
      CODEC_ID_BETHSOFTVID,
@@ -253,7 +105,7 @@ Index: libavcodec/avcodec.h
  extern AVCodecParser h261_parser;
 Index: libavformat/Makefile
 ===================================================================
---- libavformat/Makefile	(revision 10116)
+--- libavformat/Makefile	(revision 10119)
 +++ libavformat/Makefile	(working copy)
 @@ -36,6 +36,7 @@
  OBJS-$(CONFIG_CRC_MUXER)                 += crc.o
@@ -265,7 +117,7 @@ Index: libavformat/Makefile
  OBJS-$(CONFIG_DV_DEMUXER)                += dv.o
 Index: libavformat/raw.c
 ===================================================================
---- libavformat/raw.c	(revision 10116)
+--- libavformat/raw.c	(revision 10119)
 +++ libavformat/raw.c	(working copy)
 @@ -311,6 +311,7 @@
          av_set_pts_info(st, 64, ap->time_base.num, ap->time_base.den);
@@ -311,7 +163,7 @@ Index: libavformat/raw.c
      "raw dts",
 Index: libavformat/allformats.c
 ===================================================================
---- libavformat/allformats.c	(revision 10116)
+--- libavformat/allformats.c	(revision 10119)
 +++ libavformat/allformats.c	(working copy)
 @@ -66,6 +66,7 @@
      REGISTER_MUXER   (CRC, crc);
@@ -323,7 +175,7 @@ Index: libavformat/allformats.c
      REGISTER_MUXDEMUX(DV, dv);
 Index: libavformat/allformats.h
 ===================================================================
---- libavformat/allformats.h	(revision 10116)
+--- libavformat/allformats.h	(revision 10119)
 +++ libavformat/allformats.h	(working copy)
 @@ -39,6 +39,7 @@
  extern AVInputFormat c93_demuxer;

Modified: dirac/libavcodec/dirac.c
==============================================================================
--- dirac/libavcodec/dirac.c	(original)
+++ dirac/libavcodec/dirac.c	Wed Aug 15 15:07:52 2007
@@ -407,13 +407,13 @@ static void parse_sequence_parameters(Di
 
     /* Override the luma dimensions.  */
     if (get_bits(gb, 1)) {
-        s->sequence.luma_width = dirac_get_ue_golomb(gb);
-        s->sequence.luma_height = dirac_get_ue_golomb(gb);
+        s->sequence.luma_width = svq3_get_ue_golomb(gb);
+        s->sequence.luma_height = svq3_get_ue_golomb(gb);
     }
 
     /* Override the chroma format.  */
     if (get_bits(gb, 1))
-        s->sequence.chroma_format = dirac_get_ue_golomb(gb);
+        s->sequence.chroma_format = svq3_get_ue_golomb(gb);
 
     /* Override the chroma dimensions.  */
     switch (s->sequence.chroma_format) {
@@ -444,7 +444,7 @@ static void parse_sequence_parameters(Di
 
     /* Override the video depth.  */
     if (get_bits(gb, 1))
-        s->sequence.video_depth = dirac_get_ue_golomb(gb);
+        s->sequence.video_depth = svq3_get_ue_golomb(gb);
 }
 
 /**
@@ -469,10 +469,10 @@ static void parse_source_parameters(Dira
 
     /* Framerate.  */
     if (get_bits(gb, 1)) {
-        int idx = dirac_get_ue_golomb(gb);
+        int idx = svq3_get_ue_golomb(gb);
         if (! idx) {
-            s->source.frame_rate.num = dirac_get_ue_golomb(gb);
-            s->source.frame_rate.den = dirac_get_ue_golomb(gb);
+            s->source.frame_rate.num = svq3_get_ue_golomb(gb);
+            s->source.frame_rate.den = svq3_get_ue_golomb(gb);
         } else {
             /* Use a pre-set framerate.  */
             s->source.frame_rate = preset_frame_rates[idx - 1];
@@ -481,10 +481,10 @@ static void parse_source_parameters(Dira
 
     /* Override aspect ratio.  */
     if (get_bits(gb, 1)) {
-        int idx = dirac_get_ue_golomb(gb);
+        int idx = svq3_get_ue_golomb(gb);
         if (! idx) {
-            s->source.aspect_ratio.num = dirac_get_ue_golomb(gb);
-            s->source.aspect_ratio.den = dirac_get_ue_golomb(gb);
+            s->source.aspect_ratio.num = svq3_get_ue_golomb(gb);
+            s->source.aspect_ratio.den = svq3_get_ue_golomb(gb);
         } else {
             /* Use a pre-set aspect ratio.  */
             s->source.aspect_ratio = preset_aspect_ratios[idx - 1];
@@ -493,20 +493,20 @@ static void parse_source_parameters(Dira
 
     /* Override clean area.  */
     if (get_bits(gb, 1)) {
-        s->source.clean_width = dirac_get_ue_golomb(gb);
-        s->source.clean_height = dirac_get_ue_golomb(gb);
-        s->source.clean_left_offset = dirac_get_ue_golomb(gb);
-        s->source.clean_right_offset = dirac_get_ue_golomb(gb);
+        s->source.clean_width = svq3_get_ue_golomb(gb);
+        s->source.clean_height = svq3_get_ue_golomb(gb);
+        s->source.clean_left_offset = svq3_get_ue_golomb(gb);
+        s->source.clean_right_offset = svq3_get_ue_golomb(gb);
     }
 
     /* Override signal range.  */
     if (get_bits(gb, 1)) {
-        int idx = dirac_get_ue_golomb(gb);
+        int idx = svq3_get_ue_golomb(gb);
         if (! idx) {
-            s->source.luma_offset = dirac_get_ue_golomb(gb);
-            s->source.luma_excursion = dirac_get_ue_golomb(gb);
-            s->source.chroma_offset = dirac_get_ue_golomb(gb);
-            s->source.chroma_excursion = dirac_get_ue_golomb(gb);
+            s->source.luma_offset = svq3_get_ue_golomb(gb);
+            s->source.luma_excursion = svq3_get_ue_golomb(gb);
+            s->source.chroma_offset = svq3_get_ue_golomb(gb);
+            s->source.chroma_excursion = svq3_get_ue_golomb(gb);
         } else {
             /* Use a pre-set signal range.  */
             s->source.luma_offset = preset_luma_offset[idx - 1];
@@ -518,7 +518,7 @@ static void parse_source_parameters(Dira
 
     /* Color spec.  */
     if (get_bits(gb, 1)) {
-        int idx = dirac_get_ue_golomb(gb);
+        int idx = svq3_get_ue_golomb(gb);
 
         s->source.color_primaries = preset_primaries[idx];
         s->source.k_r = preset_kr[preset_matrix[idx]];
@@ -530,13 +530,13 @@ static void parse_source_parameters(Dira
         if (! idx) {
             /* Color primaries.  */
             if (get_bits(gb, 1)) {
-                int primaries_idx = dirac_get_ue_golomb(gb);
+                int primaries_idx = svq3_get_ue_golomb(gb);
                 s->source.color_primaries = preset_primaries[primaries_idx];
             }
 
             /* Override matrix.  */
             if (get_bits(gb, 1)) {
-                int matrix_idx = dirac_get_ue_golomb(gb);
+                int matrix_idx = svq3_get_ue_golomb(gb);
 
                 s->source.k_r = preset_kr[preset_matrix[matrix_idx]];
                 s->source.k_b = preset_kb[preset_matrix[matrix_idx]];
@@ -544,7 +544,7 @@ static void parse_source_parameters(Dira
 
             /* Transfer function.  */
             if (get_bits(gb, 1)) {
-                int tf_idx = dirac_get_ue_golomb(gb);
+                int tf_idx = svq3_get_ue_golomb(gb);
                 s->source.transfer_function = preset_transfer_func[tf_idx];
             }
         } else {
@@ -564,20 +564,20 @@ static int parse_access_unit_header(Dira
     unsigned int video_format;
 
     /* Parse parameters.  */
-    version_major = dirac_get_ue_golomb(gb);
-    version_minor = dirac_get_ue_golomb(gb);
+    version_major = svq3_get_ue_golomb(gb);
+    version_minor = svq3_get_ue_golomb(gb);
     /* XXX: Don't check the version yet, existing encoders do not yet
        set this to a sane value (0.6 at the moment).  */
 
     /* XXX: Not yet documented in the spec.  This is actually the main
        thing that is missing.  */
-    s->profile = dirac_get_ue_golomb(gb);
-    s->level = dirac_get_ue_golomb(gb);
+    s->profile = svq3_get_ue_golomb(gb);
+    s->level = svq3_get_ue_golomb(gb);
     dprintf(s->avctx, "Access unit header: Version %d.%d\n",
             version_major, version_minor);
     dprintf(s->avctx, "Profile: %d, Level: %d\n", s->profile, s->level);
 
-    video_format = dirac_get_ue_golomb(gb);
+    video_format = svq3_get_ue_golomb(gb);
     dprintf(s->avctx, "Video format: %d\n", video_format);
 
     /* Fill in defaults for the sequence parameters.  */
@@ -1031,11 +1031,11 @@ static int subband(DiracContext *s, int1
     int quant, qoffset, qfactor;
     int x, y;
 
-    length = dirac_get_ue_golomb(gb);
+    length = svq3_get_ue_golomb(gb);
     if (! length) {
         align_get_bits(gb);
     } else {
-        quant = dirac_get_ue_golomb(gb);
+        quant = svq3_get_ue_golomb(gb);
         qfactor = coeff_quant_factor(quant);
         qoffset = coeff_quant_offset(s, quant) + 2;
 
@@ -1071,11 +1071,11 @@ static int subband_dc(DiracContext *s, i
     width  = subband_width(s, 0);
     height = subband_height(s, 0);
 
-    length = dirac_get_ue_golomb(gb);
+    length = svq3_get_ue_golomb(gb);
     if (! length) {
         align_get_bits(gb);
     } else {
-        quant = dirac_get_ue_golomb(gb);
+        quant = svq3_get_ue_golomb(gb);
         qfactor = coeff_quant_factor(quant);
         qoffset = coeff_quant_offset(s, quant) + 2;
 
@@ -1118,12 +1118,12 @@ static void dirac_unpack_prediction_para
 
     /* Override block parameters.  */
     if (get_bits(gb, 1)) {
-        int idx = dirac_get_ue_golomb(gb);
+        int idx = svq3_get_ue_golomb(gb);
         if (idx == 0) {
-            s->frame_decoding.luma_xblen = dirac_get_ue_golomb(gb);
-            s->frame_decoding.luma_yblen = dirac_get_ue_golomb(gb);
-            s->frame_decoding.luma_xbsep = dirac_get_ue_golomb(gb);
-            s->frame_decoding.luma_ybsep = dirac_get_ue_golomb(gb);
+            s->frame_decoding.luma_xblen = svq3_get_ue_golomb(gb);
+            s->frame_decoding.luma_yblen = svq3_get_ue_golomb(gb);
+            s->frame_decoding.luma_xbsep = svq3_get_ue_golomb(gb);
+            s->frame_decoding.luma_ybsep = svq3_get_ue_golomb(gb);
         } else {
             s->frame_decoding.luma_xblen = block_param_defaults[idx].xblen;
             s->frame_decoding.luma_yblen = block_param_defaults[idx].yblen;
@@ -1141,7 +1141,7 @@ static void dirac_unpack_prediction_para
 
     /* Override motion vector precision.  */
     if (get_bits(gb, 1))
-        s->frame_decoding.mv_precision = dirac_get_ue_golomb(gb);
+        s->frame_decoding.mv_precision = svq3_get_ue_golomb(gb);
 
     /* Read the global motion compensation parameters.  */
     s->globalmc_flag = get_bits(gb, 1);
@@ -1159,7 +1159,7 @@ static void dirac_unpack_prediction_para
 
             /* Rotation/shear parameters.  */
             if (get_bits(gb, 1)) {
-                s->globalmc.zrs_exp = dirac_get_ue_golomb(gb);
+                s->globalmc.zrs_exp = svq3_get_ue_golomb(gb);
                 s->globalmc.A[0][0] = dirac_get_se_golomb(gb);
                 s->globalmc.A[0][1] = dirac_get_se_golomb(gb);
                 s->globalmc.A[1][0] = dirac_get_se_golomb(gb);
@@ -1174,7 +1174,7 @@ static void dirac_unpack_prediction_para
 
             /* Perspective parameters.  */
             if (get_bits(gb, 1)) {
-                s->globalmc.perspective_exp = dirac_get_ue_golomb(gb);
+                s->globalmc.perspective_exp = svq3_get_ue_golomb(gb);
                 s->globalmc.c[0]            = dirac_get_se_golomb(gb);
                 s->globalmc.c[1]            = dirac_get_se_golomb(gb);
             } else {
@@ -1188,7 +1188,7 @@ static void dirac_unpack_prediction_para
     /* Picture prediction mode.  Not used yet in the specification.  */
     if (get_bits(gb, 1)) {
         /* Just ignore it, it should and will be zero.  */
-        dirac_get_ue_golomb(gb);
+        svq3_get_ue_golomb(gb);
     }
 
     /* XXX: For now set the weights here, I can't find this in the
@@ -1204,7 +1204,7 @@ static void dirac_unpack_prediction_para
 
     /* Override reference picture weights.  */
     if (get_bits(gb, 1)) {
-        s->frame_decoding.picture_weight_precision = dirac_get_ue_golomb(gb);
+        s->frame_decoding.picture_weight_precision = svq3_get_ue_golomb(gb);
         s->frame_decoding.picture_weight_ref1 = dirac_get_se_golomb(gb);
         if (s->refs == 2)
             s->frame_decoding.picture_weight_ref2 = dirac_get_se_golomb(gb);
@@ -1491,7 +1491,7 @@ static void dirac_unpack_motion_vectors(
     int length;
     int x, y;
 
-    length = dirac_get_ue_golomb(gb);
+    length = svq3_get_ue_golomb(gb);
     dirac_arith_init(&s->arith, gb, length);
     for (y = 0; y < s->sbheight; y++)
         for (x = 0; x < s->sbwidth; x++) {
@@ -1534,7 +1534,7 @@ static void dirac_unpack_prediction_data
     s->blmotion = av_mallocz(s->blwidth * s->blheight * sizeof(*s->blmotion));
 
     /* Superblock splitmodes.  */
-    length = dirac_get_ue_golomb(gb);
+    length = svq3_get_ue_golomb(gb);
     dirac_arith_init(&s->arith, gb, length);
     for (y = 0; y < s->sbheight; y++)
         for (x = 0; x < s->sbwidth; x++) {
@@ -1546,7 +1546,7 @@ static void dirac_unpack_prediction_data
     dirac_arith_flush(&s->arith);
 
     /* Prediction modes.  */
-    length = dirac_get_ue_golomb(gb);
+    length = svq3_get_ue_golomb(gb);
     dirac_arith_init(&s->arith, gb, length);
     for (y = 0; y < s->sbheight; y++)
         for (x = 0; x < s->sbwidth; x++) {
@@ -1580,7 +1580,7 @@ static void dirac_unpack_prediction_data
     /* Unpack the DC values for all the three components (YUV).  */
     for (comp = 0; comp < 3; comp++) {
         /* Unpack the DC values.  */
-        length = dirac_get_ue_golomb(gb);
+        length = svq3_get_ue_golomb(gb);
         dirac_arith_init(&s->arith, gb, length);
         for (y = 0; y < s->sbheight; y++)
             for (x = 0; x < s->sbwidth; x++) {
@@ -2647,7 +2647,7 @@ static int parse_frame(DiracContext *s) 
     }
 
     /* Retire the reference frames that are not used anymore.  */
-    retire = dirac_get_ue_golomb(gb);
+    retire = svq3_get_ue_golomb(gb);
     s->retirecnt = retire;
     for (i = 0; i < retire; i++) {
         uint32_t retire_num;
@@ -2675,7 +2675,7 @@ static int parse_frame(DiracContext *s) 
         /* Override wavelet transform parameters.  */
         if (get_bits(gb, 1)) {
             dprintf(s->avctx, "Non default filter\n");
-            filter = dirac_get_ue_golomb(gb); /* XXX */
+            filter = svq3_get_ue_golomb(gb); /* XXX */
         } else {
             dprintf(s->avctx, "Default filter\n");
             filter = s->frame_decoding.wavelet_idx_intra;
@@ -2684,7 +2684,7 @@ static int parse_frame(DiracContext *s) 
         /* Overrid wavelet depth.  */
         if (get_bits(gb, 1)) {
             dprintf(s->avctx, "Non default depth\n");
-            s->frame_decoding.wavelet_depth = dirac_get_ue_golomb(gb);
+            s->frame_decoding.wavelet_depth = svq3_get_ue_golomb(gb);
         }
         dprintf(s->avctx, "Depth: %d\n", s->frame_decoding.wavelet_depth);
 
@@ -2697,8 +2697,8 @@ static int parse_frame(DiracContext *s) 
             /* Override the default partitioning.  */
             if (get_bits(gb, 1)) {
                 for (i = 0; i <= s->frame_decoding.wavelet_depth; i++) {
-                    s->codeblocksh[i] = dirac_get_ue_golomb(gb);
-                    s->codeblocksv[i] = dirac_get_ue_golomb(gb);
+                    s->codeblocksh[i] = svq3_get_ue_golomb(gb);
+                    s->codeblocksv[i] = svq3_get_ue_golomb(gb);
                 }
 
                 dprintf(s->avctx, "Non-default partitioning\n");
@@ -2724,7 +2724,7 @@ static int parse_frame(DiracContext *s) 
                 }
             }
 
-            idx = dirac_get_ue_golomb(gb);
+            idx = svq3_get_ue_golomb(gb);
             dprintf(s->avctx, "Codeblock mode idx: %d\n", idx);
             /* XXX: Here 0, so single quant.  */
         }



More information about the FFmpeg-soc mailing list