summaryrefslogtreecommitdiffstats
path: root/media/ffvpx/libavcodec/vp8.h
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-10-01 15:25:44 +0200
committerGitHub <noreply@github.com>2018-10-01 15:25:44 +0200
commit8e8fcee4a55de171303ebe526d3cf051522111bf (patch)
treefef75d382fc6216a093eeaf80560473dff19d883 /media/ffvpx/libavcodec/vp8.h
parent79b00fc33b5cb6d56d29b50efac6d62ce3a89018 (diff)
parent45c24f05d023a2cd8289ed40a13708392ce2e6a4 (diff)
downloadUXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar
UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.gz
UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.lz
UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.tar.xz
UXP-8e8fcee4a55de171303ebe526d3cf051522111bf.zip
Merge pull request #805 from MoonchildProductions/revert-801-update-from-upstream
Revert "Update ffvpx code to 4.0.2"
Diffstat (limited to 'media/ffvpx/libavcodec/vp8.h')
-rw-r--r--media/ffvpx/libavcodec/vp8.h33
1 files changed, 0 insertions, 33 deletions
diff --git a/media/ffvpx/libavcodec/vp8.h b/media/ffvpx/libavcodec/vp8.h
index 70d21e3c6..8263997e3 100644
--- a/media/ffvpx/libavcodec/vp8.h
+++ b/media/ffvpx/libavcodec/vp8.h
@@ -138,18 +138,12 @@ typedef struct VP8ThreadData {
typedef struct VP8Frame {
ThreadFrame tf;
AVBufferRef *seg_map;
-
- AVBufferRef *hwaccel_priv_buf;
- void *hwaccel_picture_private;
} VP8Frame;
#define MAX_THREADS 8
typedef struct VP8Context {
VP8ThreadData *thread_data;
AVCodecContext *avctx;
- enum AVPixelFormat pix_fmt;
- int actually_webp;
-
VP8Frame *framep[4];
VP8Frame *next_framep[4];
VP8Frame *curframe;
@@ -178,7 +172,6 @@ typedef struct VP8Context {
uint8_t enabled;
uint8_t absolute_vals;
uint8_t update_map;
- uint8_t update_feature_data;
int8_t base_quant[4];
int8_t filter_level[4]; ///< base loop filter level
} segmentation;
@@ -206,19 +199,8 @@ typedef struct VP8Context {
int16_t chroma_qmul[2];
} qmat[4];
- // Raw quantisation values, which may be needed by hwaccel decode.
- struct {
- int yac_qi;
- int ydc_delta;
- int y2dc_delta;
- int y2ac_delta;
- int uvdc_delta;
- int uvac_delta;
- } quant;
-
struct {
uint8_t enabled; ///< whether each mb can have a different strength based on mode/ref
- uint8_t update;
/**
* filter strength adjustment for the following macroblock modes:
@@ -246,20 +228,6 @@ typedef struct VP8Context {
VP56RangeCoder c; ///< header context, includes mb modes and motion vectors
- /* This contains the entropy coder state at the end of the header
- * block, in the form specified by the standard. For use by
- * hwaccels, so that a hardware decoder has the information to
- * start decoding at the macroblock layer.
- */
- struct {
- const uint8_t *input;
- uint32_t range;
- uint32_t value;
- int bit_count;
- } coder_state_at_header_end;
-
- int header_partition_size;
-
/**
* These are all of the updatable probabilities for binary decisions.
* They are only implicitly reset on keyframes, making it quite likely
@@ -297,7 +265,6 @@ typedef struct VP8Context {
*/
int num_coeff_partitions;
VP56RangeCoder coeff_partition[8];
- int coeff_partition_size[8];
VideoDSPContext vdsp;
VP8DSPContext vp8dsp;
H264PredContext hpc;