mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-31 20:42:49 +08:00 
			
		
		
		
	 80e9e63c94
			
		
	
	80e9e63c94
	
	
	
		
			
			* 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>
		
	
		
			
				
	
	
		
			222 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			222 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * FFV1 codec for libavcodec
 | |
|  *
 | |
|  * Copyright (c) 2003-2012 Michael Niedermayer <michaelni@gmx.at>
 | |
|  *
 | |
|  * 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
 | |
|  * FF Video Codec 1 (a lossless codec)
 | |
|  */
 | |
| 
 | |
| #include "libavutil/avassert.h"
 | |
| #include "libavutil/crc.h"
 | |
| #include "libavutil/opt.h"
 | |
| #include "libavutil/imgutils.h"
 | |
| #include "libavutil/pixdesc.h"
 | |
| #include "libavutil/timer.h"
 | |
| #include "avcodec.h"
 | |
| #include "internal.h"
 | |
| #include "rangecoder.h"
 | |
| #include "golomb.h"
 | |
| #include "mathops.h"
 | |
| #include "ffv1.h"
 | |
| 
 | |
| av_cold int ffv1_common_init(AVCodecContext *avctx)
 | |
| {
 | |
|     FFV1Context *s = avctx->priv_data;
 | |
| 
 | |
|     if (!avctx->width || !avctx->height)
 | |
|         return AVERROR_INVALIDDATA;
 | |
| 
 | |
|     s->avctx = avctx;
 | |
|     s->flags = avctx->flags;
 | |
| 
 | |
|     avcodec_get_frame_defaults(&s->picture);
 | |
| 
 | |
|     ff_dsputil_init(&s->dsp, avctx);
 | |
| 
 | |
|     s->width  = avctx->width;
 | |
|     s->height = avctx->height;
 | |
| 
 | |
|     // defaults
 | |
|     s->num_h_slices = 1;
 | |
|     s->num_v_slices = 1;
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int ffv1_init_slice_state(FFV1Context *f, FFV1Context *fs)
 | |
| {
 | |
|     int j;
 | |
| 
 | |
|     fs->plane_count  = f->plane_count;
 | |
|     fs->transparency = f->transparency;
 | |
|     for (j = 0; j < f->plane_count; j++) {
 | |
|         PlaneContext *const p = &fs->plane[j];
 | |
| 
 | |
|         if (fs->ac) {
 | |
|             if (!p->state)
 | |
|                 p->state = av_malloc(CONTEXT_SIZE * p->context_count *
 | |
|                                      sizeof(uint8_t));
 | |
|             if (!p->state)
 | |
|                 return AVERROR(ENOMEM);
 | |
|         } else {
 | |
|             if (!p->vlc_state)
 | |
|                 p->vlc_state = av_malloc(p->context_count * sizeof(VlcState));
 | |
|             if (!p->vlc_state)
 | |
|                 return AVERROR(ENOMEM);
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     if (fs->ac > 1) {
 | |
|         //FIXME only redo if state_transition changed
 | |
|         for (j = 1; j < 256; j++) {
 | |
|             fs->c. one_state[      j] = f->state_transition[j];
 | |
|             fs->c.zero_state[256 - j] = 256 - fs->c.one_state[j];
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int ffv1_init_slices_state(FFV1Context *f)
 | |
| {
 | |
|     int i, ret;
 | |
|     for (i = 0; i < f->slice_count; i++) {
 | |
|         FFV1Context *fs = f->slice_context[i];
 | |
|         if ((ret = ffv1_init_slice_state(f, fs)) < 0)
 | |
|             return AVERROR(ENOMEM);
 | |
|     }
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| av_cold int ffv1_init_slice_contexts(FFV1Context *f)
 | |
| {
 | |
|     int i;
 | |
| 
 | |
|     f->slice_count = f->num_h_slices * f->num_v_slices;
 | |
|     av_assert0(f->slice_count > 0);
 | |
| 
 | |
|     for (i = 0; i < f->slice_count; i++) {
 | |
|         FFV1Context *fs = av_mallocz(sizeof(*fs));
 | |
|         int sx          = i % f->num_h_slices;
 | |
|         int sy          = i / f->num_h_slices;
 | |
|         int sxs         = f->avctx->width  *  sx      / f->num_h_slices;
 | |
|         int sxe         = f->avctx->width  * (sx + 1) / f->num_h_slices;
 | |
|         int sys         = f->avctx->height *  sy      / f->num_v_slices;
 | |
|         int sye         = f->avctx->height * (sy + 1) / f->num_v_slices;
 | |
| 
 | |
|         if (!fs)
 | |
|             return AVERROR(ENOMEM);
 | |
| 
 | |
|         f->slice_context[i] = fs;
 | |
|         memcpy(fs, f, sizeof(*fs));
 | |
|         memset(fs->rc_stat2, 0, sizeof(fs->rc_stat2));
 | |
| 
 | |
|         fs->slice_width  = sxe - sxs;
 | |
|         fs->slice_height = sye - sys;
 | |
|         fs->slice_x      = sxs;
 | |
|         fs->slice_y      = sys;
 | |
| 
 | |
|         fs->sample_buffer = av_malloc(3 * MAX_PLANES * (fs->width + 6) *
 | |
|                                       sizeof(*fs->sample_buffer));
 | |
|         if (!fs->sample_buffer)
 | |
|             return AVERROR(ENOMEM);
 | |
|     }
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| int ffv1_allocate_initial_states(FFV1Context *f)
 | |
| {
 | |
|     int i;
 | |
| 
 | |
|     for (i = 0; i < f->quant_table_count; i++) {
 | |
|         f->initial_states[i] = av_malloc(f->context_count[i] *
 | |
|                                          sizeof(*f->initial_states[i]));
 | |
|         if (!f->initial_states[i])
 | |
|             return AVERROR(ENOMEM);
 | |
|         memset(f->initial_states[i], 128,
 | |
|                f->context_count[i] * sizeof(*f->initial_states[i]));
 | |
|     }
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| void ffv1_clear_slice_state(FFV1Context *f, FFV1Context *fs)
 | |
| {
 | |
|     int i, j;
 | |
| 
 | |
|     for (i = 0; i < f->plane_count; i++) {
 | |
|         PlaneContext *p = &fs->plane[i];
 | |
| 
 | |
|         p->interlace_bit_state[0] = 128;
 | |
|         p->interlace_bit_state[1] = 128;
 | |
| 
 | |
|         if (fs->ac) {
 | |
|             if (f->initial_states[p->quant_table_index]) {
 | |
|                 memcpy(p->state, f->initial_states[p->quant_table_index],
 | |
|                        CONTEXT_SIZE * p->context_count);
 | |
|             } else
 | |
|                 memset(p->state, 128, CONTEXT_SIZE * p->context_count);
 | |
|         } else {
 | |
|             for (j = 0; j < p->context_count; j++) {
 | |
|                 p->vlc_state[j].drift     = 0;
 | |
|                 p->vlc_state[j].error_sum = 4;    //FFMAX((RANGE + 32)/64, 2);
 | |
|                 p->vlc_state[j].bias      = 0;
 | |
|                 p->vlc_state[j].count     = 1;
 | |
|             }
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| 
 | |
| av_cold int ffv1_close(AVCodecContext *avctx)
 | |
| {
 | |
|     FFV1Context *s = avctx->priv_data;
 | |
|     int i, j;
 | |
| 
 | |
|     av_frame_unref(&s->last_picture);
 | |
| 
 | |
|     for (j = 0; j < s->slice_count; j++) {
 | |
|         FFV1Context *fs = s->slice_context[j];
 | |
|         for (i = 0; i < s->plane_count; i++) {
 | |
|             PlaneContext *p = &fs->plane[i];
 | |
| 
 | |
|             av_freep(&p->state);
 | |
|             av_freep(&p->vlc_state);
 | |
|         }
 | |
|         av_freep(&fs->sample_buffer);
 | |
|     }
 | |
| 
 | |
|     av_freep(&avctx->stats_out);
 | |
|     for (j = 0; j < s->quant_table_count; j++) {
 | |
|         av_freep(&s->initial_states[j]);
 | |
|         for (i = 0; i < s->slice_count; i++) {
 | |
|             FFV1Context *sf = s->slice_context[i];
 | |
|             av_freep(&sf->rc_stat2[j]);
 | |
|         }
 | |
|         av_freep(&s->rc_stat2[j]);
 | |
|     }
 | |
| 
 | |
|     for (i = 0; i < s->slice_count; i++)
 | |
|         av_freep(&s->slice_context[i]);
 | |
| 
 | |
|     return 0;
 | |
| }
 |