mirror of
				https://github.com/nyanmisaka/ffmpeg-rockchip.git
				synced 2025-10-31 04:26:37 +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>
		
	
		
			
				
	
	
		
			217 lines
		
	
	
		
			5.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			217 lines
		
	
	
		
			5.5 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
 | |
|  */
 | |
| 
 | |
| #ifndef AVCODEC_FFV1_H
 | |
| #define AVCODEC_FFV1_H
 | |
| 
 | |
| /**
 | |
|  * @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 "dsputil.h"
 | |
| #include "get_bits.h"
 | |
| #include "internal.h"
 | |
| #include "mathops.h"
 | |
| #include "put_bits.h"
 | |
| #include "rangecoder.h"
 | |
| 
 | |
| #ifdef __INTEL_COMPILER
 | |
| #undef av_flatten
 | |
| #define av_flatten
 | |
| #endif
 | |
| 
 | |
| #define MAX_PLANES 4
 | |
| #define CONTEXT_SIZE 32
 | |
| 
 | |
| #define MAX_QUANT_TABLES 8
 | |
| #define MAX_CONTEXT_INPUTS 5
 | |
| 
 | |
| extern const uint8_t ff_log2_run[41];
 | |
| 
 | |
| typedef struct VlcState {
 | |
|     int16_t drift;
 | |
|     uint16_t error_sum;
 | |
|     int8_t bias;
 | |
|     uint8_t count;
 | |
| } VlcState;
 | |
| 
 | |
| typedef struct PlaneContext {
 | |
|     int16_t quant_table[MAX_CONTEXT_INPUTS][256];
 | |
|     int quant_table_index;
 | |
|     int context_count;
 | |
|     uint8_t (*state)[CONTEXT_SIZE];
 | |
|     VlcState *vlc_state;
 | |
|     uint8_t interlace_bit_state[2];
 | |
| } PlaneContext;
 | |
| 
 | |
| #define MAX_SLICES 256
 | |
| 
 | |
| typedef struct FFV1Context {
 | |
|     AVClass *class;
 | |
|     AVCodecContext *avctx;
 | |
|     RangeCoder c;
 | |
|     GetBitContext gb;
 | |
|     PutBitContext pb;
 | |
|     uint64_t rc_stat[256][2];
 | |
|     uint64_t (*rc_stat2[MAX_QUANT_TABLES])[32][2];
 | |
|     int version;
 | |
|     int minor_version;
 | |
|     int width, height;
 | |
|     int chroma_planes;
 | |
|     int chroma_h_shift, chroma_v_shift;
 | |
|     int transparency;
 | |
|     int flags;
 | |
|     int picture_number;
 | |
|     AVFrame picture, last_picture;
 | |
| 
 | |
|     AVFrame *cur;
 | |
|     int plane_count;
 | |
|     int ac;                              ///< 1=range coder <-> 0=golomb rice
 | |
|     int ac_byte_count;                   ///< number of bytes used for AC coding
 | |
|     PlaneContext plane[MAX_PLANES];
 | |
|     int16_t quant_table[MAX_CONTEXT_INPUTS][256];
 | |
|     int16_t quant_tables[MAX_QUANT_TABLES][MAX_CONTEXT_INPUTS][256];
 | |
|     int context_count[MAX_QUANT_TABLES];
 | |
|     uint8_t state_transition[256];
 | |
|     uint8_t (*initial_states[MAX_QUANT_TABLES])[32];
 | |
|     int run_index;
 | |
|     int colorspace;
 | |
|     int16_t *sample_buffer;
 | |
| 
 | |
|     int ec;
 | |
|     int slice_damaged;
 | |
|     int key_frame_ok;
 | |
| 
 | |
|     int bits_per_raw_sample;
 | |
|     int packed_at_lsb;
 | |
| 
 | |
|     int gob_count;
 | |
|     int quant_table_count;
 | |
| 
 | |
|     DSPContext dsp;
 | |
| 
 | |
|     struct FFV1Context *slice_context[MAX_SLICES];
 | |
|     int slice_count;
 | |
|     int num_v_slices;
 | |
|     int num_h_slices;
 | |
|     int slice_width;
 | |
|     int slice_height;
 | |
|     int slice_x;
 | |
|     int slice_y;
 | |
| } FFV1Context;
 | |
| 
 | |
| int ffv1_common_init(AVCodecContext *avctx);
 | |
| int ffv1_init_slice_state(FFV1Context *f, FFV1Context *fs);
 | |
| int ffv1_init_slices_state(FFV1Context *f);
 | |
| int ffv1_init_slice_contexts(FFV1Context *f);
 | |
| int ffv1_allocate_initial_states(FFV1Context *f);
 | |
| void ffv1_clear_slice_state(FFV1Context *f, FFV1Context *fs);
 | |
| int ffv1_close(AVCodecContext *avctx);
 | |
| 
 | |
| static av_always_inline int fold(int diff, int bits)
 | |
| {
 | |
|     if (bits == 8)
 | |
|         diff = (int8_t)diff;
 | |
|     else {
 | |
|         diff +=  1 << (bits  - 1);
 | |
|         diff &= (1 <<  bits) - 1;
 | |
|         diff -=  1 << (bits  - 1);
 | |
|     }
 | |
| 
 | |
|     return diff;
 | |
| }
 | |
| 
 | |
| static inline int predict(int16_t *src, int16_t *last)
 | |
| {
 | |
|     const int LT = last[-1];
 | |
|     const int T  = last[0];
 | |
|     const int L  = src[-1];
 | |
| 
 | |
|     return mid_pred(L, L + T - LT, T);
 | |
| }
 | |
| 
 | |
| static inline int get_context(PlaneContext *p, int16_t *src,
 | |
|                               int16_t *last, int16_t *last2)
 | |
| {
 | |
|     const int LT = last[-1];
 | |
|     const int T  = last[0];
 | |
|     const int RT = last[1];
 | |
|     const int L  = src[-1];
 | |
| 
 | |
|     if (p->quant_table[3][127]) {
 | |
|         const int TT = last2[0];
 | |
|         const int LL = src[-2];
 | |
|         return p->quant_table[0][(L - LT) & 0xFF] +
 | |
|                p->quant_table[1][(LT - T) & 0xFF] +
 | |
|                p->quant_table[2][(T - RT) & 0xFF] +
 | |
|                p->quant_table[3][(LL - L) & 0xFF] +
 | |
|                p->quant_table[4][(TT - T) & 0xFF];
 | |
|     } else
 | |
|         return p->quant_table[0][(L - LT) & 0xFF] +
 | |
|                p->quant_table[1][(LT - T) & 0xFF] +
 | |
|                p->quant_table[2][(T - RT) & 0xFF];
 | |
| }
 | |
| 
 | |
| static inline void update_vlc_state(VlcState *const state, const int v)
 | |
| {
 | |
|     int drift = state->drift;
 | |
|     int count = state->count;
 | |
|     state->error_sum += FFABS(v);
 | |
|     drift            += v;
 | |
| 
 | |
|     if (count == 128) { // FIXME: variable
 | |
|         count            >>= 1;
 | |
|         drift            >>= 1;
 | |
|         state->error_sum >>= 1;
 | |
|     }
 | |
|     count++;
 | |
| 
 | |
|     if (drift <= -count) {
 | |
|         if (state->bias > -128)
 | |
|             state->bias--;
 | |
| 
 | |
|         drift += count;
 | |
|         if (drift <= -count)
 | |
|             drift = -count + 1;
 | |
|     } else if (drift > 0) {
 | |
|         if (state->bias < 127)
 | |
|             state->bias++;
 | |
| 
 | |
|         drift -= count;
 | |
|         if (drift > 0)
 | |
|             drift = 0;
 | |
|     }
 | |
| 
 | |
|     state->drift = drift;
 | |
|     state->count = count;
 | |
| }
 | |
| 
 | |
| #endif /* AVCODEC_FFV1_H */
 |