* 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>
		
	
			
		
			
				
	
	
		
			168 lines
		
	
	
		
			5.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			168 lines
		
	
	
		
			5.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Apple MJPEG-B decoder
 | |
|  * Copyright (c) 2002 Alex Beregszaszi
 | |
|  *
 | |
|  * 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
 | |
|  * Apple MJPEG-B decoder.
 | |
|  */
 | |
| 
 | |
| #include "avcodec.h"
 | |
| #include "mjpeg.h"
 | |
| #include "mjpegdec.h"
 | |
| 
 | |
| static uint32_t read_offs(AVCodecContext *avctx, GetBitContext *gb, uint32_t size, const char *err_msg){
 | |
|     uint32_t offs= get_bits_long(gb, 32);
 | |
|     if(offs >= size){
 | |
|         av_log(avctx, AV_LOG_WARNING, err_msg, offs, size);
 | |
|         return 0;
 | |
|     }
 | |
|     return offs;
 | |
| }
 | |
| 
 | |
| static int mjpegb_decode_frame(AVCodecContext *avctx,
 | |
|                               void *data, int *got_frame,
 | |
|                               AVPacket *avpkt)
 | |
| {
 | |
|     const uint8_t *buf = avpkt->data;
 | |
|     int buf_size = avpkt->size;
 | |
|     MJpegDecodeContext *s = avctx->priv_data;
 | |
|     const uint8_t *buf_end, *buf_ptr;
 | |
|     GetBitContext hgb; /* for the header */
 | |
|     uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs;
 | |
|     uint32_t field_size, sod_offs;
 | |
|     int ret;
 | |
| 
 | |
|     buf_ptr = buf;
 | |
|     buf_end = buf + buf_size;
 | |
|     s->got_picture = 0;
 | |
| 
 | |
| read_header:
 | |
|     /* reset on every SOI */
 | |
|     s->restart_interval = 0;
 | |
|     s->restart_count = 0;
 | |
|     s->mjpb_skiptosod = 0;
 | |
| 
 | |
|     if (buf_end - buf_ptr >= 1 << 28)
 | |
|         return AVERROR_INVALIDDATA;
 | |
| 
 | |
|     init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8);
 | |
| 
 | |
|     skip_bits(&hgb, 32); /* reserved zeros */
 | |
| 
 | |
|     if (get_bits_long(&hgb, 32) != MKBETAG('m','j','p','g'))
 | |
|     {
 | |
|         av_log(avctx, AV_LOG_WARNING, "not mjpeg-b (bad fourcc)\n");
 | |
|         return AVERROR_INVALIDDATA;
 | |
|     }
 | |
| 
 | |
|     field_size = get_bits_long(&hgb, 32); /* field size */
 | |
|     av_log(avctx, AV_LOG_DEBUG, "field size: 0x%x\n", field_size);
 | |
|     skip_bits(&hgb, 32); /* padded field size */
 | |
|     second_field_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "second_field_offs is %d and size is %d\n");
 | |
|     av_log(avctx, AV_LOG_DEBUG, "second field offs: 0x%x\n", second_field_offs);
 | |
| 
 | |
|     dqt_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "dqt is %d and size is %d\n");
 | |
|     av_log(avctx, AV_LOG_DEBUG, "dqt offs: 0x%x\n", dqt_offs);
 | |
|     if (dqt_offs)
 | |
|     {
 | |
|         init_get_bits(&s->gb, buf_ptr+dqt_offs, (buf_end - (buf_ptr+dqt_offs))*8);
 | |
|         s->start_code = DQT;
 | |
|         if (ff_mjpeg_decode_dqt(s) < 0 &&
 | |
|             (avctx->err_recognition & AV_EF_EXPLODE))
 | |
|           return AVERROR_INVALIDDATA;
 | |
|     }
 | |
| 
 | |
|     dht_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "dht is %d and size is %d\n");
 | |
|     av_log(avctx, AV_LOG_DEBUG, "dht offs: 0x%x\n", dht_offs);
 | |
|     if (dht_offs)
 | |
|     {
 | |
|         init_get_bits(&s->gb, buf_ptr+dht_offs, (buf_end - (buf_ptr+dht_offs))*8);
 | |
|         s->start_code = DHT;
 | |
|         ff_mjpeg_decode_dht(s);
 | |
|     }
 | |
| 
 | |
|     sof_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "sof is %d and size is %d\n");
 | |
|     av_log(avctx, AV_LOG_DEBUG, "sof offs: 0x%x\n", sof_offs);
 | |
|     if (sof_offs)
 | |
|     {
 | |
|         init_get_bits(&s->gb, buf_ptr+sof_offs, (buf_end - (buf_ptr+sof_offs))*8);
 | |
|         s->start_code = SOF0;
 | |
|         if (ff_mjpeg_decode_sof(s) < 0)
 | |
|             return -1;
 | |
|     }
 | |
| 
 | |
|     sos_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "sos is %d and size is %d\n");
 | |
|     av_log(avctx, AV_LOG_DEBUG, "sos offs: 0x%x\n", sos_offs);
 | |
|     sod_offs = read_offs(avctx, &hgb, buf_end - buf_ptr, "sof is %d and size is %d\n");
 | |
|     av_log(avctx, AV_LOG_DEBUG, "sod offs: 0x%x\n", sod_offs);
 | |
|     if (sos_offs)
 | |
|     {
 | |
|         init_get_bits(&s->gb, buf_ptr + sos_offs,
 | |
|                       8 * FFMIN(field_size, buf_end - buf_ptr - sos_offs));
 | |
|         s->mjpb_skiptosod = (sod_offs - sos_offs - show_bits(&s->gb, 16));
 | |
|         s->start_code = SOS;
 | |
|         if (ff_mjpeg_decode_sos(s, NULL, NULL) < 0 &&
 | |
|             (avctx->err_recognition & AV_EF_EXPLODE))
 | |
|           return AVERROR_INVALIDDATA;
 | |
|     }
 | |
| 
 | |
|     if (s->interlaced) {
 | |
|         s->bottom_field ^= 1;
 | |
|         /* if not bottom field, do not output image yet */
 | |
|         if (s->bottom_field != s->interlace_polarity && second_field_offs)
 | |
|         {
 | |
|             buf_ptr = buf + second_field_offs;
 | |
|             goto read_header;
 | |
|             }
 | |
|     }
 | |
| 
 | |
|     //XXX FIXME factorize, this looks very similar to the EOI code
 | |
| 
 | |
|     if(!s->got_picture) {
 | |
|         av_log(avctx, AV_LOG_WARNING, "no picture\n");
 | |
|         return buf_size;
 | |
|     }
 | |
| 
 | |
|     if ((ret = av_frame_ref(data, s->picture_ptr)) < 0)
 | |
|         return ret;
 | |
|     *got_frame = 1;
 | |
| 
 | |
|     if (!s->lossless && avctx->debug & FF_DEBUG_QP) {
 | |
|         av_log(avctx, AV_LOG_DEBUG, "QP: %d\n",
 | |
|                FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2]));
 | |
|     }
 | |
| 
 | |
|     return buf_size;
 | |
| }
 | |
| 
 | |
| AVCodec ff_mjpegb_decoder = {
 | |
|     .name           = "mjpegb",
 | |
|     .type           = AVMEDIA_TYPE_VIDEO,
 | |
|     .id             = AV_CODEC_ID_MJPEGB,
 | |
|     .priv_data_size = sizeof(MJpegDecodeContext),
 | |
|     .init           = ff_mjpeg_decode_init,
 | |
|     .close          = ff_mjpeg_decode_end,
 | |
|     .decode         = mjpegb_decode_frame,
 | |
|     .capabilities   = CODEC_CAP_DR1,
 | |
|     .max_lowres     = 3,
 | |
|     .long_name      = NULL_IF_CONFIG_SMALL("Apple MJPEG-B"),
 | |
| };
 |