From 520c1ec699161a0463fc6efacc91974601c5149d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 18 Apr 2012 17:55:49 +0200 Subject: dv: Split profile handling code into a separate file. --- libavcodec/dvdata.h | 46 +--------------------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) (limited to 'libavcodec/dvdata.h') diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h index 54a4bf1..c50fa5f 100644 --- a/libavcodec/dvdata.h +++ b/libavcodec/dvdata.h @@ -27,45 +27,10 @@ #ifndef AVCODEC_DVDATA_H #define AVCODEC_DVDATA_H -#include "libavutil/rational.h" #include "avcodec.h" #include "dsputil.h" #include "get_bits.h" - -typedef struct DVwork_chunk { - uint16_t buf_offset; - uint16_t mb_coordinates[5]; -} DVwork_chunk; - -/* - * DVprofile is used to express the differences between various - * DV flavors. For now it's primarily used for differentiating - * 525/60 and 625/50, but the plans are to use it for various - * DV specs as well (e.g. SMPTE314M vs. IEC 61834). - */ -typedef struct DVprofile { - int dsf; /* value of the dsf in the DV header */ - int video_stype; /* stype for VAUX source pack */ - int frame_size; /* total size of one frame in bytes */ - int difseg_size; /* number of DIF segments per DIF channel */ - int n_difchan; /* number of DIF channels per frame */ - AVRational time_base; /* 1/framerate */ - int ltc_divisor; /* FPS from the LTS standpoint */ - int height; /* picture height in pixels */ - int width; /* picture width in pixels */ - AVRational sar[2]; /* sample aspect ratios for 4:3 and 16:9 */ - DVwork_chunk *work_chunks; /* each thread gets its own chunk of frame to work on */ - uint32_t *idct_factor; /* set of iDCT factor tables */ - enum PixelFormat pix_fmt; /* picture pixel format */ - int bpm; /* blocks per macroblock */ - const uint8_t *block_sizes; /* AC block sizes, in bits */ - int audio_stride; /* size of audio_shuffle table */ - int audio_min_samples[3]; /* min amount of audio samples */ - /* for 48kHz, 44.1kHz and 32kHz */ - int audio_samples_dist[5]; /* how many samples are supposed to be */ - /* in each frame in a 5 frames window */ - const uint8_t (*audio_shuffle)[9]; /* PCM shuffling table */ -} DVprofile; +#include "dv_profile.h" typedef struct DVVideoContext { const DVprofile *sys; @@ -136,10 +101,6 @@ extern const int ff_dv_iweight_720_c[64]; extern RL_VLC_ELEM ff_dv_rl_vlc[1184]; -const DVprofile* avpriv_dv_frame_profile(const DVprofile *sys, - const uint8_t* frame, unsigned buf_size); -const DVprofile* avpriv_dv_codec_profile(AVCodecContext* codec); - int ff_dv_init_dynamic_tables(const DVprofile *d); int ff_dvvideo_init(AVCodecContext *avctx); @@ -164,9 +125,4 @@ static inline void dv_calculate_mb_xy(DVVideoContext *s, DVwork_chunk *work_chun } } -/** - * Print all allowed DV profiles into logctx at specified logging level. - */ -void ff_dv_print_profiles(void *logctx, int loglevel); - #endif /* AVCODEC_DVDATA_H */ -- cgit v1.1