generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '453642f8afe9f979fcc813a246b1ec656ec36a93'

Browse Source 
* commit '453642f8afe9f979fcc813a246b1ec656ec36a93':
  hqx: Store shareable data in main decoder context

Conflicts:
	libavcodec/hqx.c
	libavcodec/hqx.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-04-20 04:57:06 +02:00
parent d8b4e9adbb 453642f8af
commit 55b866f618
2 changed files with 67 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/hqx.h
View File

@@ -22,6 +22,8 @@
#define AVCODEC_HQX_H
#include <stdint.h>
#include "libavutil/frame.h"
#include "libavutil/mem.h"
#include "get_bits.h"
#include "hqxdsp.h"
@@ -51,17 +53,30 @@ typedef struct HQXAC {
typedef struct HQXSliceData
{
DECLARE_ALIGNED(16, int16_t, block)[16][64];
GetBitContext gb;
} HQXSliceData;
struct HQXContext;
typedef int (*mb_decode_func)(struct HQXContext *ctx, HQXSliceData * slice_data,
GetBitContext *gb, int x, int y);
typedef struct HQXContext {
HQXDSPContext hqxdsp;
AVFrame *pic;
mb_decode_func decode_func;
int format, dcb, width, height;
int interlaced;
HQXSliceData slice[17];
uint8_t *src;
unsigned int data_size;
uint32_t slice_off[17];
VLC cbp_vlc;
VLC dc_vlc[3];
} HQXContext;