* commit '759001c534287a96dc96d1e274665feb7059145d':
  lavc decoders: work with refcounted frames.
Anton Khirnov (1):
      lavc decoders: work with refcounted frames.
Clément Bœsch (47):
      lavc/ansi: reset file
      lavc/ansi: re-do refcounted frame changes from Anton
      fraps: reset file
      lavc/fraps: switch to refcounted frames
      gifdec: reset file
      lavc/gifdec: switch to refcounted frames
      dsicinav: resolve conflicts
      smc: resolve conflicts
      zmbv: resolve conflicts
      rpza: resolve conflicts
      vble: resolve conflicts
      xxan: resolve conflicts
      targa: resolve conflicts
      vmnc: resolve conflicts
      utvideodec: resolve conflicts
      tscc: resolve conflicts
      ulti: resolve conflicts
      ffv1dec: resolve conflicts
      dnxhddec: resolve conflicts
      v210dec: resolve conflicts
      vp3: resolve conflicts
      vcr1: resolve conflicts
      v210x: resolve conflicts
      wavpack: resolve conflicts
      pngdec: fix compilation
      roqvideodec: resolve conflicts
      pictordec: resolve conflicts
      mdec: resolve conflicts
      tiertexseqv: resolve conflicts
      smacker: resolve conflicts
      vb: resolve conflicts
      vqavideo: resolve conflicts
      xl: resolve conflicts
      tmv: resolve conflicts
      vmdav: resolve conflicts
      truemotion1: resolve conflicts
      truemotion2: resolve conflicts
      lcldec: fix compilation
      libcelt_dec: fix compilation
      qdrw: fix compilation
      r210dec: fix compilation
      rl2: fix compilation
      wnv1: fix compilation
      yop: fix compilation
      tiff: resolve conflicts
      interplayvideo: fix compilation
      qpeg: resolve conflicts (FIXME/TESTME).
Hendrik Leppkes (33):
      012v: convert to refcounted frames
      8bps: fix compilation
      8svx: resolve conflicts
      4xm: resolve conflicts
      aasc: resolve conflicts
      bfi: fix compilation
      aura: fix compilation
      alsdec: resolve conflicts
      avrndec: convert to refcounted frames
      avuidec: convert to refcounted frames
      bintext: convert to refcounted frames
      cavsdec: resolve conflicts
      brender_pix: convert to refcounted frames
      cinepak: resolve conflicts
      cinepak: avoid using AVFrame struct directly in private context
      cljr: fix compilation
      cpia: convert to refcounted frames
      cscd: resolve conflicts
      iff: resolve conflicts and do proper conversion to refcounted frames
      4xm: fix reference frame handling
      cyuv: fix compilation
      dxa: fix compilation
      eacmv: fix compilation
      eamad: fix compilation
      eatgv: fix compilation
      escape124: remove unused variable.
      escape130: convert to refcounted frames
      evrcdec: convert to refcounted frames
      exr: convert to refcounted frames
      mvcdec: convert to refcounted frames
      paf: properly free the frame data on decode close
      sgirle: convert to refcounted frames
      lavfi/moviesrc: use refcounted frames
Michael Niedermayer (56):
      Merge commit '759001c534287a96dc96d1e274665feb7059145d'
      resolve conflicts in headers
      motion_est: resolve conflict
      mpeg4videodec: fix conflicts
      dpcm conflict fix
      dpx: fix conflicts
      indeo3: resolve confilcts
      kmvc: resolve conflicts
      kmvc: resolve conflicts
      h264: resolve conflicts
      utils: resolve conflicts
      rawdec: resolve conflcits
      mpegvideo: resolve conflicts
      svq1enc: resolve conflicts
      mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
      pthreads: resolve conflicts
      frame_thread_encoder: simple compilefix not yet tested
      snow: update to buffer refs
      crytsalhd: fix compile
      dirac: switch to new API
      sonic: update to new API
      svq1: resolve conflict, update to new API
      ffwavesynth: update to new buffer API
      g729: update to new API
      indeo5: fix compile
      j2kdec: update to new buffer API
      linopencore-amr: fix compile
      libvorbisdec: update to new API
      loco: fix compile
      paf: update to new API
      proresdec: update to new API
      vp56: update to new api / resolve conflicts
      xface: convert to refcounted frames
      xan: fix compile&fate
      v408: update to ref counted buffers
      v308: update to ref counted buffers
      yuv4dec: update to ref counted buffers
      y41p: update to ref counted frames
      xbm: update to refcounted frames
      targa_y216: update to refcounted buffers
      qpeg: fix fate/crash
      cdxl: fix fate
      tscc: fix reget buffer useage
      targa_y216dec: fix style
      msmpeg4: fix fate
      h264: ref_picture() copy fields that have been lost too
      update_frame_pool: use channel field
      h264: Put code that prevents deadlocks back
      mpegvideo: dont allow last == current
      wmalossless: fix buffer ref messup
      ff_alloc_picture: free tables in case of dimension mismatches
      h264: fix null pointer dereference and assertion failure
      frame_thread_encoder: update to bufrefs
      ec: fix used arrays
      snowdec: fix off by 1 error in dimensions check
      h264: disallow single unpaired fields as references of frames
Paul B Mahol (2):
      lavc/vima: convert to refcounted frames
      sanm: convert to refcounted frames
Conflicts:
	libavcodec/4xm.c
	libavcodec/8bps.c
	libavcodec/8svx.c
	libavcodec/aasc.c
	libavcodec/alsdec.c
	libavcodec/anm.c
	libavcodec/ansi.c
	libavcodec/avs.c
	libavcodec/bethsoftvideo.c
	libavcodec/bfi.c
	libavcodec/c93.c
	libavcodec/cavsdec.c
	libavcodec/cdgraphics.c
	libavcodec/cinepak.c
	libavcodec/cljr.c
	libavcodec/cscd.c
	libavcodec/dnxhddec.c
	libavcodec/dpcm.c
	libavcodec/dpx.c
	libavcodec/dsicinav.c
	libavcodec/dvdec.c
	libavcodec/dxa.c
	libavcodec/eacmv.c
	libavcodec/eamad.c
	libavcodec/eatgq.c
	libavcodec/eatgv.c
	libavcodec/eatqi.c
	libavcodec/error_resilience.c
	libavcodec/escape124.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/flicvideo.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/g723_1.c
	libavcodec/gifdec.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_direct.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/huffyuvdec.c
	libavcodec/idcinvideo.c
	libavcodec/iff.c
	libavcodec/indeo2.c
	libavcodec/indeo3.c
	libavcodec/internal.h
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/jvdec.c
	libavcodec/kgv1dec.c
	libavcodec/kmvc.c
	libavcodec/lagarith.c
	libavcodec/libopenjpegdec.c
	libavcodec/mdec.c
	libavcodec/mimic.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mmvideo.c
	libavcodec/motion_est.c
	libavcodec/motionpixels.c
	libavcodec/mpc7.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/msrle.c
	libavcodec/msvideo1.c
	libavcodec/nuv.c
	libavcodec/options_table.h
	libavcodec/pcx.c
	libavcodec/pictordec.c
	libavcodec/pngdec.c
	libavcodec/pnmdec.c
	libavcodec/pthread.c
	libavcodec/qpeg.c
	libavcodec/qtrle.c
	libavcodec/r210dec.c
	libavcodec/rawdec.c
	libavcodec/roqvideodec.c
	libavcodec/rpza.c
	libavcodec/smacker.c
	libavcodec/smc.c
	libavcodec/svq1dec.c
	libavcodec/svq1enc.c
	libavcodec/targa.c
	libavcodec/tiertexseqv.c
	libavcodec/tiff.c
	libavcodec/tmv.c
	libavcodec/truemotion1.c
	libavcodec/truemotion2.c
	libavcodec/tscc.c
	libavcodec/ulti.c
	libavcodec/utils.c
	libavcodec/utvideodec.c
	libavcodec/v210dec.c
	libavcodec/v210x.c
	libavcodec/vb.c
	libavcodec/vble.c
	libavcodec/vcr1.c
	libavcodec/vmdav.c
	libavcodec/vmnc.c
	libavcodec/vp3.c
	libavcodec/vp56.c
	libavcodec/vp56.h
	libavcodec/vp6.c
	libavcodec/vqavideo.c
	libavcodec/wavpack.c
	libavcodec/xl.c
	libavcodec/xxan.c
	libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
	
			
		
			
				
	
	
		
			215 lines
		
	
	
		
			6.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			215 lines
		
	
	
		
			6.3 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * VBLE Decoder
 | |
|  * Copyright (c) 2011 Derek Buitenhuis
 | |
|  *
 | |
|  * 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.1 of the License, or (at your option) any later version.
 | |
|  *
 | |
|  * 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 FFmpeg; if not, write to the Free Software
 | |
|  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | |
|  */
 | |
| 
 | |
| /**
 | |
|  * @file
 | |
|  * VBLE Decoder
 | |
|  */
 | |
| 
 | |
| #define BITSTREAM_READER_LE
 | |
| 
 | |
| #include "avcodec.h"
 | |
| #include "dsputil.h"
 | |
| #include "get_bits.h"
 | |
| #include "internal.h"
 | |
| #include "mathops.h"
 | |
| 
 | |
| typedef struct {
 | |
|     AVCodecContext *avctx;
 | |
|     DSPContext dsp;
 | |
| 
 | |
|     int            size;
 | |
|     uint8_t        *val; ///< This array first holds the lengths of vlc symbols and then their value.
 | |
| } VBLEContext;
 | |
| 
 | |
| static int vble_unpack(VBLEContext *ctx, GetBitContext *gb)
 | |
| {
 | |
|     int i;
 | |
|     int allbits = 0;
 | |
|     static const uint8_t LUT[256] = {
 | |
|         8,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
 | |
|         5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
 | |
|         6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
 | |
|         5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
 | |
|         7,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
 | |
|         5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
 | |
|         6,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
 | |
|         5,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0,
 | |
|     };
 | |
| 
 | |
|     /* Read all the lengths in first */
 | |
|     for (i = 0; i < ctx->size; i++) {
 | |
|         /* At most we need to read 9 bits total to get indices up to 8 */
 | |
|         int val = show_bits(gb, 8);
 | |
| 
 | |
|         // read reverse unary
 | |
|         if (val) {
 | |
|             val = LUT[val];
 | |
|             skip_bits(gb, val + 1);
 | |
|             ctx->val[i] = val;
 | |
|         } else {
 | |
|             skip_bits(gb, 8);
 | |
|             if (!get_bits1(gb))
 | |
|                 return -1;
 | |
|             ctx->val[i] = 8;
 | |
|         }
 | |
|         allbits += ctx->val[i];
 | |
|     }
 | |
| 
 | |
|     /* Check we have enough bits left */
 | |
|     if (get_bits_left(gb) < allbits)
 | |
|         return -1;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static void vble_restore_plane(VBLEContext *ctx, AVFrame *pic,
 | |
|                                GetBitContext *gb, int plane,
 | |
|                                int offset, int width, int height)
 | |
| {
 | |
|     uint8_t *dst = pic->data[plane];
 | |
|     uint8_t *val = ctx->val + offset;
 | |
|     int stride = pic->linesize[plane];
 | |
|     int i, j, left, left_top;
 | |
| 
 | |
|     for (i = 0; i < height; i++) {
 | |
|         for (j = 0; j < width; j++) {
 | |
|             /* get_bits can't take a length of 0 */
 | |
|             if (val[j]) {
 | |
|                 int v = (1 << val[j]) + get_bits(gb, val[j]) - 1;
 | |
|                 val[j] = (v >> 1) ^ -(v & 1);
 | |
|             }
 | |
|         }
 | |
|         if (i) {
 | |
|             left = 0;
 | |
|             left_top = dst[-stride];
 | |
|             ctx->dsp.add_hfyu_median_prediction(dst, dst-stride, val, width, &left, &left_top);
 | |
|         } else {
 | |
|             dst[0] = val[0];
 | |
|             for (j = 1; j < width; j++)
 | |
|                 dst[j] = val[j] + dst[j - 1];
 | |
|         }
 | |
|         dst += stride;
 | |
|         val += width;
 | |
|     }
 | |
| }
 | |
| 
 | |
| static int vble_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
 | |
|                              AVPacket *avpkt)
 | |
| {
 | |
|     VBLEContext *ctx = avctx->priv_data;
 | |
|     AVFrame *pic     = data;
 | |
|     GetBitContext gb;
 | |
|     const uint8_t *src = avpkt->data;
 | |
|     int version;
 | |
|     int offset = 0;
 | |
|     int width_uv = avctx->width / 2, height_uv = avctx->height / 2;
 | |
| 
 | |
|     if (avpkt->size < 4 || avpkt->size - 4 > INT_MAX/8) {
 | |
|         av_log(avctx, AV_LOG_ERROR, "Invalid packet size\n");
 | |
|         return AVERROR_INVALIDDATA;
 | |
|     }
 | |
| 
 | |
|     /* Allocate buffer */
 | |
|     if (ff_get_buffer(avctx, pic, 0) < 0) {
 | |
|         av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n");
 | |
|         return AVERROR(ENOMEM);
 | |
|     }
 | |
| 
 | |
|     /* Set flags */
 | |
|     pic->key_frame = 1;
 | |
|     pic->pict_type = AV_PICTURE_TYPE_I;
 | |
| 
 | |
|     /* Version should always be 1 */
 | |
|     version = AV_RL32(src);
 | |
| 
 | |
|     if (version != 1)
 | |
|         av_log(avctx, AV_LOG_WARNING, "Unsupported VBLE Version: %d\n", version);
 | |
| 
 | |
|     init_get_bits(&gb, src + 4, (avpkt->size - 4) * 8);
 | |
| 
 | |
|     /* Unpack */
 | |
|     if (vble_unpack(ctx, &gb) < 0) {
 | |
|         av_log(avctx, AV_LOG_ERROR, "Invalid Code\n");
 | |
|         return AVERROR_INVALIDDATA;
 | |
|     }
 | |
| 
 | |
|     /* Restore planes. Should be almost identical to Huffyuv's. */
 | |
|     vble_restore_plane(ctx, pic, &gb, 0, offset, avctx->width, avctx->height);
 | |
| 
 | |
|     /* Chroma */
 | |
|     if (!(ctx->avctx->flags & CODEC_FLAG_GRAY)) {
 | |
|         offset += avctx->width * avctx->height;
 | |
|         vble_restore_plane(ctx, pic, &gb, 1, offset, width_uv, height_uv);
 | |
| 
 | |
|         offset += width_uv * height_uv;
 | |
|         vble_restore_plane(ctx, pic, &gb, 2, offset, width_uv, height_uv);
 | |
|     }
 | |
| 
 | |
|     *got_frame       = 1;
 | |
| 
 | |
|     return avpkt->size;
 | |
| }
 | |
| 
 | |
| static av_cold int vble_decode_close(AVCodecContext *avctx)
 | |
| {
 | |
|     VBLEContext *ctx = avctx->priv_data;
 | |
|     av_freep(&ctx->val);
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static av_cold int vble_decode_init(AVCodecContext *avctx)
 | |
| {
 | |
|     VBLEContext *ctx = avctx->priv_data;
 | |
| 
 | |
|     /* Stash for later use */
 | |
|     ctx->avctx = avctx;
 | |
|     ff_dsputil_init(&ctx->dsp, avctx);
 | |
| 
 | |
|     avctx->pix_fmt = AV_PIX_FMT_YUV420P;
 | |
|     avctx->bits_per_raw_sample = 8;
 | |
| 
 | |
|     ctx->size = avpicture_get_size(avctx->pix_fmt,
 | |
|                                    avctx->width, avctx->height);
 | |
| 
 | |
|     ctx->val = av_malloc(ctx->size * sizeof(*ctx->val));
 | |
| 
 | |
|     if (!ctx->val) {
 | |
|         av_log(avctx, AV_LOG_ERROR, "Could not allocate values buffer.\n");
 | |
|         vble_decode_close(avctx);
 | |
|         return AVERROR(ENOMEM);
 | |
|     }
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| AVCodec ff_vble_decoder = {
 | |
|     .name           = "vble",
 | |
|     .type           = AVMEDIA_TYPE_VIDEO,
 | |
|     .id             = AV_CODEC_ID_VBLE,
 | |
|     .priv_data_size = sizeof(VBLEContext),
 | |
|     .init           = vble_decode_init,
 | |
|     .close          = vble_decode_close,
 | |
|     .decode         = vble_decode_frame,
 | |
|     .capabilities   = CODEC_CAP_DR1,
 | |
|     .long_name      = NULL_IF_CONFIG_SMALL("VBLE Lossless Codec"),
 | |
| };
 |