Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
cb214707
Commit
cb214707
authored
Aug 14, 2013
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vp56data: Move all shared enum/struct declarations to common header
parent
38f64c03
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
29 deletions
+30
-29
vp56.h
libavcodec/vp56.h
+26
-1
vp56data.h
libavcodec/vp56data.h
+1
-26
vp6data.h
libavcodec/vp6data.h
+3
-1
vp8.h
libavcodec/vp8.h
+0
-1
No files found.
libavcodec/vp56.h
View file @
cb214707
...
...
@@ -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
;
...
...
libavcodec/vp56data.h
View file @
cb214707
...
...
@@ -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
[];
...
...
libavcodec/vp6data.h
View file @
cb214707
...
...
@@ -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
},
...
...
libavcodec/vp8.h
View file @
cb214707
...
...
@@ -29,7 +29,6 @@
#include "libavutil/buffer.h"
#include "vp56.h"
#include "vp56data.h"
#include "vp8dsp.h"
#include "h264pred.h"
#include "thread.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment