MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpegvideo: move mpegvideo formats-related defines to mpegutils.h

Browse Source
This commit is contained in:
Vittorio Giovara 2014-02-28 13:40:54 +01:00
parent 136034d86b
commit e0c16e4e32
41 changed files with 154 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/dxva2_h264.c
View File

@ -23,6 +23,7 @@
#include "dxva2_internal.h"
#include "h264.h"
#include "h264data.h"
#include "mpegutils.h"
struct dxva2_picture_context {
DXVA_PicParams_H264 pp;

1
libavcodec/dxva2_mpeg2.c
View File

@ -22,6 +22,7 @@
#include "libavutil/log.h"
#include "dxva2_internal.h"
#include "mpegutils.h"
#define MAX_SLICES 1024
struct dxva2_picture_context {

1
libavcodec/dxva2_vc1.c
View File

@ -21,6 +21,7 @@
*/
#include "dxva2_internal.h"
#include "mpegutils.h"
#include "vc1.h"
#include "vc1data.h"

1
libavcodec/error_resilience.c
View File

@ -30,6 +30,7 @@
#include "libavutil/internal.h"
#include "avcodec.h"
#include "error_resilience.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "rectangle.h"
#include "thread.h"

1
libavcodec/h261dec.c
View File

@ -26,6 +26,7 @@
*/
#include "avcodec.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h261.h"

1
libavcodec/h261enc.c
View File

@ -27,6 +27,7 @@
#include "libavutil/attributes.h"
#include "avcodec.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h261.h"

1
libavcodec/h263.c
View File

@ -34,6 +34,7 @@
#include "h263.h"
#include "h263data.h"
#include "mathops.h"
#include "mpegutils.h"
#include "unary.h"
#include "flv.h"
#include "mpeg4video.h"

1
libavcodec/h264.c
View File

@ -42,6 +42,7 @@
#include "h264_mvpred.h"
#include "golomb.h"
#include "mathops.h"
#include "mpegutils.h"
#include "rectangle.h"
#include "svq3.h"
#include "thread.h"

1
libavcodec/h264.h
View File

@ -38,6 +38,7 @@
#include "h264dsp.h"
#include "h264pred.h"
#include "h264qpel.h"
#include "mpegutils.h"
#include "rectangle.h"
#define H264_MAX_PICTURE_COUNT 32

1
libavcodec/h264_cabac.c
View File

@ -38,6 +38,7 @@
#include "h264data.h"
#include "h264_mvpred.h"
#include "golomb.h"
#include "mpegutils.h"
#if ARCH_X86
#include "x86/h264_i386.h"

1
libavcodec/h264_cavlc.c
View File

@ -34,6 +34,7 @@
#include "h264data.h" // FIXME FIXME FIXME
#include "h264_mvpred.h"
#include "golomb.h"
#include "mpegutils.h"
#include <assert.h>

1
libavcodec/h264_direct.c
View File

@ -29,6 +29,7 @@
#include "avcodec.h"
#include "mpegvideo.h"
#include "h264.h"
#include "mpegutils.h"
#include "rectangle.h"
#include "thread.h"

1
libavcodec/h264_loopfilter.c
View File

@ -32,6 +32,7 @@
#include "mpegvideo.h"
#include "h264.h"
#include "mathops.h"
#include "mpegutils.h"
#include "rectangle.h"
#include <assert.h>

1
libavcodec/h264_mvpred.h
View File

@ -31,6 +31,7 @@
#include "internal.h"
#include "avcodec.h"
#include "h264.h"
#include "mpegutils.h"
#include <assert.h>

1
libavcodec/h264_parser.c
View File

@ -30,6 +30,7 @@
#include "h264data.h"
#include "golomb.h"
#include "internal.h"
#include "mpegutils.h"
#include <assert.h>

1
libavcodec/h264_refs.c
View File

@ -29,6 +29,7 @@
#include "avcodec.h"
#include "h264.h"
#include "golomb.h"
#include "mpegutils.h"
#include <assert.h>

1
libavcodec/ituh263dec.c
View File

@ -36,6 +36,7 @@
#include "mpegvideo.h"
#include "h263.h"
#include "mathops.h"
#include "mpegutils.h"
#include "unary.h"
#include "flv.h"
#include "mpeg4video.h"

1
libavcodec/ituh263enc.c
View File

@ -34,6 +34,7 @@
#include "mpegvideo.h"
#include "h263.h"
#include "mathops.h"
#include "mpegutils.h"
#include "unary.h"
#include "flv.h"
#include "mpeg4video.h"

1
libavcodec/motion_est.c
View File

@ -33,6 +33,7 @@
#include "avcodec.h"
#include "mathops.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#undef NDEBUG

1
libavcodec/mpeg12dec.c
View File

@ -36,6 +36,7 @@
#include "internal.h"
#include "mpeg12.h"
#include "mpeg12data.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "thread.h"
#include "version.h"

1
libavcodec/mpeg4video.c
View File

@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mpegutils.h"
#include "mpegvideo.h"
#include "mpeg4video.h"
#include "mpeg4data.h"

1
libavcodec/mpeg4videodec.c
View File

@ -22,6 +22,7 @@
#include "error_resilience.h"
#include "internal.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "mpeg4video.h"
#include "h263.h"

1
libavcodec/mpeg4videoenc.c
View File

@ -23,6 +23,7 @@
#include "libavutil/attributes.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "h263.h"
#include "mpeg4video.h"

111
libavcodec/mpegutils.h Normal file
View File

@ -0,0 +1,111 @@
/*
* Mpeg video formats-related defines and utility functions
*
* This file is part of Libav.
*
* Libav 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.
*
* Libav 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 Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_MPEGUTILS_H
#define AVCODEC_MPEGUTILS_H
#include "version.h"
/* picture type */
#define PICT_TOP_FIELD 1
#define PICT_BOTTOM_FIELD 2
#define PICT_FRAME 3
/**
* Value of Picture.reference when Picture is not a reference picture, but
* is held for delayed output.
*/
#define DELAYED_PIC_REF 4
/* MB types */
#if !FF_API_MB_TYPE
#define MB_TYPE_INTRA4x4 (1 << 0)
#define MB_TYPE_INTRA16x16 (1 << 1) // FIXME H.264-specific
#define MB_TYPE_INTRA_PCM (1 << 2) // FIXME H.264-specific
#define MB_TYPE_16x16 (1 << 3)
#define MB_TYPE_16x8 (1 << 4)
#define MB_TYPE_8x16 (1 << 5)
#define MB_TYPE_8x8 (1 << 6)
#define MB_TYPE_INTERLACED (1 << 7)
#define MB_TYPE_DIRECT2 (1 << 8) // FIXME
#define MB_TYPE_ACPRED (1 << 9)
#define MB_TYPE_GMC (1 << 10)
#define MB_TYPE_SKIP (1 << 11)
#define MB_TYPE_P0L0 (1 << 12)
#define MB_TYPE_P1L0 (1 << 13)
#define MB_TYPE_P0L1 (1 << 14)
#define MB_TYPE_P1L1 (1 << 15)
#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0)
#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1)
#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1)
#define MB_TYPE_QUANT (1 << 16)
#define MB_TYPE_CBP (1 << 17)
#endif
#define MB_TYPE_INTRA MB_TYPE_INTRA4x4 // default mb_type if there is just one type
#define IS_INTRA4x4(a) ((a) & MB_TYPE_INTRA4x4)
#define IS_INTRA16x16(a) ((a) & MB_TYPE_INTRA16x16)
#define IS_PCM(a) ((a) & MB_TYPE_INTRA_PCM)
#define IS_INTRA(a) ((a) & 7)
#define IS_INTER(a) ((a) & (MB_TYPE_16x16 | MB_TYPE_16x8 | \
MB_TYPE_8x16 | MB_TYPE_8x8))
#define IS_SKIP(a) ((a) & MB_TYPE_SKIP)
#define IS_INTRA_PCM(a) ((a) & MB_TYPE_INTRA_PCM)
#define IS_INTERLACED(a) ((a) & MB_TYPE_INTERLACED)
#define IS_DIRECT(a) ((a) & MB_TYPE_DIRECT2)
#define IS_GMC(a) ((a) & MB_TYPE_GMC)
#define IS_16X16(a) ((a) & MB_TYPE_16x16)
#define IS_16X8(a) ((a) & MB_TYPE_16x8)
#define IS_8X16(a) ((a) & MB_TYPE_8x16)
#define IS_8X8(a) ((a) & MB_TYPE_8x8)
#define IS_SUB_8X8(a) ((a) & MB_TYPE_16x16) // note reused
#define IS_SUB_8X4(a) ((a) & MB_TYPE_16x8) // note reused
#define IS_SUB_4X8(a) ((a) & MB_TYPE_8x16) // note reused
#define IS_SUB_4X4(a) ((a) & MB_TYPE_8x8) // note reused
#define IS_ACPRED(a) ((a) & MB_TYPE_ACPRED)
#define IS_QUANT(a) ((a) & MB_TYPE_QUANT)
#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list))))
// does this mb use listX, note does not work if subMBs
#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list))))
#define HAS_CBP(a) ((a) & MB_TYPE_CBP)
/* MB types for encoding */
#define CANDIDATE_MB_TYPE_INTRA (1 << 0)
#define CANDIDATE_MB_TYPE_INTER (1 << 1)
#define CANDIDATE_MB_TYPE_INTER4V (1 << 2)
#define CANDIDATE_MB_TYPE_SKIPPED (1 << 3)
#define CANDIDATE_MB_TYPE_DIRECT (1 << 4)
#define CANDIDATE_MB_TYPE_FORWARD (1 << 5)
#define CANDIDATE_MB_TYPE_BACKWARD (1 << 6)
#define CANDIDATE_MB_TYPE_BIDIR (1 << 7)
#define CANDIDATE_MB_TYPE_INTER_I (1 << 8)
#define CANDIDATE_MB_TYPE_FORWARD_I (1 << 9)
#define CANDIDATE_MB_TYPE_BACKWARD_I (1 << 10)
#define CANDIDATE_MB_TYPE_BIDIR_I (1 << 11)
#define CANDIDATE_MB_TYPE_DIRECT0 (1 << 12)
#endif /* AVCODEC_PICTTYPE_H */

1
libavcodec/mpegvideo.c
View File

@ -36,6 +36,7 @@
#include "dsputil.h"
#include "internal.h"
#include "mathops.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "mjpegenc.h"
#include "msmpeg4.h"

82
libavcodec/mpegvideo.h
View File

@ -85,12 +85,6 @@ enum OutputFormat {
#define EXT_START_CODE 0x000001b5
#define USER_START_CODE 0x000001b2
/**
* Value of Picture.reference when Picture is not a reference picture, but
* is held for delayed output.
*/
#define DELAYED_PIC_REF 4
struct MpegEncContext;
/**
@ -107,31 +101,7 @@ typedef struct Picture{
int16_t (*motion_val[2])[2];
AVBufferRef *mb_type_buf;
uint32_t *mb_type;
#if !FF_API_MB_TYPE
#define MB_TYPE_INTRA4x4 0x0001
#define MB_TYPE_INTRA16x16 0x0002 //FIXME H.264-specific
#define MB_TYPE_INTRA_PCM 0x0004 //FIXME H.264-specific
#define MB_TYPE_16x16 0x0008
#define MB_TYPE_16x8 0x0010
#define MB_TYPE_8x16 0x0020
#define MB_TYPE_8x8 0x0040
#define MB_TYPE_INTERLACED 0x0080
#define MB_TYPE_DIRECT2 0x0100 //FIXME
#define MB_TYPE_ACPRED 0x0200
#define MB_TYPE_GMC 0x0400
#define MB_TYPE_SKIP 0x0800
#define MB_TYPE_P0L0 0x1000
#define MB_TYPE_P1L0 0x2000
#define MB_TYPE_P0L1 0x4000
#define MB_TYPE_P1L1 0x8000
#define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0)
#define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1)
#define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1)
#define MB_TYPE_QUANT 0x00010000
#define MB_TYPE_CBP 0x00020000
#endif
uint32_t *mb_type; ///< types and macros are defined in mpegutils.h
AVBufferRef *mbskip_table_buf;
uint8_t *mbskip_table;
@ -154,31 +124,6 @@ typedef struct Picture{
*/
void *hwaccel_picture_private;
#define MB_TYPE_INTRA MB_TYPE_INTRA4x4 //default mb_type if there is just one type
#define IS_INTRA4x4(a) ((a)&MB_TYPE_INTRA4x4)
#define IS_INTRA16x16(a) ((a)&MB_TYPE_INTRA16x16)
#define IS_PCM(a) ((a)&MB_TYPE_INTRA_PCM)
#define IS_INTRA(a) ((a)&7)
#define IS_INTER(a) ((a)&(MB_TYPE_16x16|MB_TYPE_16x8|MB_TYPE_8x16|MB_TYPE_8x8))
#define IS_SKIP(a) ((a)&MB_TYPE_SKIP)
#define IS_INTRA_PCM(a) ((a)&MB_TYPE_INTRA_PCM)
#define IS_INTERLACED(a) ((a)&MB_TYPE_INTERLACED)
#define IS_DIRECT(a) ((a)&MB_TYPE_DIRECT2)
#define IS_GMC(a) ((a)&MB_TYPE_GMC)
#define IS_16X16(a) ((a)&MB_TYPE_16x16)
#define IS_16X8(a) ((a)&MB_TYPE_16x8)
#define IS_8X16(a) ((a)&MB_TYPE_8x16)
#define IS_8X8(a) ((a)&MB_TYPE_8x8)
#define IS_SUB_8X8(a) ((a)&MB_TYPE_16x16) //note reused
#define IS_SUB_8X4(a) ((a)&MB_TYPE_16x8) //note reused
#define IS_SUB_4X8(a) ((a)&MB_TYPE_8x16) //note reused
#define IS_SUB_4X4(a) ((a)&MB_TYPE_8x8) //note reused
#define IS_ACPRED(a) ((a)&MB_TYPE_ACPRED)
#define IS_QUANT(a) ((a)&MB_TYPE_QUANT)
#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0<<((part)+2*(list))))
#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0|MB_TYPE_P1L0)<<(2*(list)))) ///< does this mb use listX, note does not work if subMBs
#define HAS_CBP(a) ((a)&MB_TYPE_CBP)
int field_poc[2]; ///< h264 top/bottom POC
int poc; ///< h264 frame POC
int frame_num; ///< h264 frame_num (raw frame_num from slice header)
@ -463,24 +408,7 @@ typedef struct MpegEncContext {
int mb_x, mb_y;
int mb_skip_run;
int mb_intra;
uint16_t *mb_type; ///< Table for candidate MB types for encoding
#define CANDIDATE_MB_TYPE_INTRA 0x01
#define CANDIDATE_MB_TYPE_INTER 0x02
#define CANDIDATE_MB_TYPE_INTER4V 0x04
#define CANDIDATE_MB_TYPE_SKIPPED 0x08
//#define MB_TYPE_GMC 0x10
#define CANDIDATE_MB_TYPE_DIRECT 0x10
#define CANDIDATE_MB_TYPE_FORWARD 0x20
#define CANDIDATE_MB_TYPE_BACKWARD 0x40
#define CANDIDATE_MB_TYPE_BIDIR 0x80
#define CANDIDATE_MB_TYPE_INTER_I 0x100
#define CANDIDATE_MB_TYPE_FORWARD_I 0x200
#define CANDIDATE_MB_TYPE_BACKWARD_I 0x400
#define CANDIDATE_MB_TYPE_BIDIR_I 0x800
#define CANDIDATE_MB_TYPE_DIRECT0 0x1000
uint16_t *mb_type; ///< Table for candidate MB types for encoding (defines in mpegutils.h)
int block_index[6]; ///< index to current MB in block based arrays with edges
int block_wrap[6];
@ -639,11 +567,9 @@ typedef struct MpegEncContext {
/* MPEG-2-specific - I wished not to have to support this mess. */
int progressive_sequence;
int mpeg_f_code[2][2];
// picture structure defines are loaded from mpegutils.h
int picture_structure;
/* picture type */
#define PICT_TOP_FIELD 1
#define PICT_BOTTOM_FIELD 2
#define PICT_FRAME 3
int intra_dc_precision;
int frame_pred_frame_dct;

1
libavcodec/mpegvideo_enc.c
View File

@ -43,6 +43,7 @@
#include "h261.h"
#include "h263.h"
#include "mathops.h"
#include "mpegutils.h"
#include "mjpegenc.h"
#include "msmpeg4.h"
#include "faandct.h"

1
libavcodec/mpegvideo_motion.c
View File

@ -27,6 +27,7 @@
#include "avcodec.h"
#include "dsputil.h"
#include "h261.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "mjpegenc.h"
#include "msmpeg4.h"

1
libavcodec/mpegvideo_xvmc.c
View File

@ -23,6 +23,7 @@
#include <X11/extensions/XvMC.h>
#include "avcodec.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#undef NDEBUG

1
libavcodec/msmpeg4dec.c
View File

@ -24,6 +24,7 @@
#include "avcodec.h"
#include "dsputil.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "msmpeg4.h"
#include "libavutil/x86/asm.h"

1
libavcodec/ratecontrol.c
View File

@ -28,6 +28,7 @@
#include "libavutil/attributes.h"
#include "avcodec.h"
#include "ratecontrol.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "libavutil/eval.h"

1
libavcodec/rv30.c
View File

@ -25,6 +25,7 @@
*/
#include "avcodec.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "golomb.h"

1
libavcodec/rv34.c
View File

@ -28,6 +28,7 @@
#include "avcodec.h"
#include "error_resilience.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "golomb.h"
#include "internal.h"

1
libavcodec/rv40.c
View File

@ -27,6 +27,7 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "golomb.h"

1
libavcodec/svq1enc.c
View File

@ -32,6 +32,7 @@
#include "mpegvideo.h"
#include "h263.h"
#include "internal.h"
#include "mpegutils.h"
#include "svq1.h"
#include "svq1enc_cb.h"

1
libavcodec/svq3.c
View File

@ -43,6 +43,7 @@
#include "libavutil/attributes.h"
#include "internal.h"
#include "avcodec.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "h264.h"

1
libavcodec/vaapi_h264.c
View File

@ -22,6 +22,7 @@
#include "vaapi_internal.h"
#include "h264.h"
#include "mpegutils.h"
/**
* @file

1
libavcodec/vaapi_mpeg2.c
View File

@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "mpegutils.h"
#include "vaapi_internal.h"
/** Reconstruct bitstream f_code */

1
libavcodec/vc1dec.c
View File

@ -29,6 +29,7 @@
#include "internal.h"
#include "avcodec.h"
#include "error_resilience.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "h263.h"
#include "h264chroma.h"

1
libavcodec/vdpau_h264.c
View File

@ -25,6 +25,7 @@
#include "avcodec.h"
#include "h264.h"
#include "mpegutils.h"
#include "vdpau.h"
#include "vdpau_internal.h"

1
libavcodec/wmv2dec.c
View File

@ -19,6 +19,7 @@
*/
#include "avcodec.h"
#include "mpegutils.h"
#include "mpegvideo.h"
#include "h263.h"
#include "mathops.h"