videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7' 

* commit 'cb214707a6cb0d3272ec0261af6f1f5d8b7dabc7':
  vp56data: Move all shared enum/struct declarations to common header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-16 13:19:19 +02:00
parent dbcee7cc5c cb214707a6
commit 669ea5e102
4 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/vp56.h
View File

@ -26,7 +26,6 @@
#ifndef AVCODEC_VP56_H
#define AVCODEC_VP56_H
#include "vp56data.h"
#include "dsputil.h"
#include "get_bits.h"
#include "hpeldsp.h"
@ -38,6 +37,32 @@
typedef struct vp56_context VP56Context;
typedef enum {
VP56_FRAME_NONE =-1,
VP56_FRAME_CURRENT = 0,
VP56_FRAME_PREVIOUS = 1,
VP56_FRAME_GOLDEN = 2,
VP56_FRAME_GOLDEN2 = 3,
} VP56Frame;
typedef enum {
VP56_MB_INTER_NOVEC_PF = 0, /**< Inter MB, no vector, from previous frame */
VP56_MB_INTRA = 1, /**< Intra MB */
VP56_MB_INTER_DELTA_PF = 2, /**< Inter MB, above/left vector + delta, from previous frame */
VP56_MB_INTER_V1_PF = 3, /**< Inter MB, first vector, from previous frame */
VP56_MB_INTER_V2_PF = 4, /**< Inter MB, second vector, from previous frame */
VP56_MB_INTER_NOVEC_GF = 5, /**< Inter MB, no vector, from golden frame */
VP56_MB_INTER_DELTA_GF = 6, /**< Inter MB, above/left vector + delta, from golden frame */
VP56_MB_INTER_4V = 7, /**< Inter MB, 4 vectors, from previous frame */
VP56_MB_INTER_V1_GF = 8, /**< Inter MB, first vector, from golden frame */
VP56_MB_INTER_V2_GF = 9, /**< Inter MB, second vector, from golden frame */
} VP56mb;
typedef struct VP56Tree {
int8_t val;
int8_t prob_idx;
} VP56Tree;
typedef struct VP56mv {
DECLARE_ALIGNED(4, int16_t, x);
int16_t y;

27
libavcodec/vp56data.h
View File

@ -27,32 +27,7 @@
#define AVCODEC_VP56DATA_H
#include "libavutil/common.h"
typedef enum {
VP56_FRAME_NONE =-1,
VP56_FRAME_CURRENT = 0,
VP56_FRAME_PREVIOUS = 1,
VP56_FRAME_GOLDEN = 2,
VP56_FRAME_GOLDEN2 = 3,
} VP56Frame;
typedef enum {
VP56_MB_INTER_NOVEC_PF = 0, /**< Inter MB, no vector, from previous frame */
VP56_MB_INTRA = 1, /**< Intra MB */
VP56_MB_INTER_DELTA_PF = 2, /**< Inter MB, above/left vector + delta, from previous frame */
VP56_MB_INTER_V1_PF = 3, /**< Inter MB, first vector, from previous frame */
VP56_MB_INTER_V2_PF = 4, /**< Inter MB, second vector, from previous frame */
VP56_MB_INTER_NOVEC_GF = 5, /**< Inter MB, no vector, from golden frame */
VP56_MB_INTER_DELTA_GF = 6, /**< Inter MB, above/left vector + delta, from golden frame */
VP56_MB_INTER_4V = 7, /**< Inter MB, 4 vectors, from previous frame */
VP56_MB_INTER_V1_GF = 8, /**< Inter MB, first vector, from golden frame */
VP56_MB_INTER_V2_GF = 9, /**< Inter MB, second vector, from golden frame */
} VP56mb;
typedef struct VP56Tree {
int8_t val;
int8_t prob_idx;
} VP56Tree;
#include "vp56.h"
extern const uint8_t ff_vp56_b2p[];
extern const uint8_t ff_vp56_b6to4[];

4
libavcodec/vp6data.h
View File

@ -26,7 +26,9 @@
#ifndef AVCODEC_VP6DATA_H
#define AVCODEC_VP6DATA_H
#include "vp56data.h"
#include <stdint.h>
#include "vp56.h"
static const uint8_t vp6_def_fdv_vector_model[2][8] = {
{ 247, 210, 135, 68, 138, 220, 239, 246 },

1
libavcodec/vp8.h
View File

@ -29,7 +29,6 @@
#include "libavutil/buffer.h"
#include "vp56.h"
#include "vp56data.h"
#include "vp8dsp.h"
#include "h264pred.h"
#include "thread.h"