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

Merge commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'

Browse Source 
* commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a':
  intrax8: Keep a reference to the context idctdsp

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-24 12:19:53 +01:00
commit 83e0b1b1d7
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -2261,6 +2261,7 @@ faandct_deps="faan fdctdsp"
faanidct_deps="faan idctdsp" faanidct_deps="faan idctdsp"
h264dsp_select="startcode" h264dsp_select="startcode"
frame_thread_encoder_deps="encoders threads" frame_thread_encoder_deps="encoders threads"
intrax8_select="idctdsp"
mdct_select="fft" mdct_select="fft"
me_cmp_select="fdctdsp idctdsp pixblockdsp" me_cmp_select="fdctdsp idctdsp pixblockdsp"
mpeg_er_select="error_resilience" mpeg_er_select="error_resilience"

6
libavcodec/intrax8.c
View File

@ -488,7 +488,7 @@ static void x8_ac_compensation(IntraX8Context *const w, const int direction,
{ {
MpegEncContext *const s = w->s; MpegEncContext *const s = w->s;
int t; int t;
#define B(x,y) s->block[0][w->idct_permutation[(x)+(y)*8]] #define B(x,y) s->block[0][w->idct_permutation[(x) + (y) * 8]]
#define T(x) ((x) * dc_level + 0x8000) >> 16; #define T(x) ((x) * dc_level + 0x8000) >> 16;
switch (direction) { switch (direction) {
case 0: case 0:
@ -739,12 +739,14 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame, int mb_y)
w->dest[2] += (mb_y & (~1)) * uvlinesize << 2; w->dest[2] += (mb_y & (~1)) * uvlinesize << 2;
} }
av_cold int ff_intrax8_common_init(IntraX8Context *w, MpegEncContext *const s) av_cold int ff_intrax8_common_init(IntraX8Context *w, IDCTDSPContext *idsp,
MpegEncContext *const s)
{ {
int ret = x8_vlc_init(); int ret = x8_vlc_init();
if (ret < 0) if (ret < 0)
return ret; return ret;
w->idsp = *idsp;
w->s = s; w->s = s;
//two rows, 2 blocks per cannon mb //two rows, 2 blocks per cannon mb

6
libavcodec/intrax8.h
View File

@ -21,6 +21,7 @@
#include "get_bits.h" #include "get_bits.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "idctdsp.h"
#include "intrax8dsp.h" #include "intrax8dsp.h"
#include "wmv2dsp.h" #include "wmv2dsp.h"
@ -40,6 +41,7 @@ typedef struct IntraX8Context {
//set by the caller codec //set by the caller codec
MpegEncContext * s; MpegEncContext * s;
IntraX8DSPContext dsp; IntraX8DSPContext dsp;
IDCTDSPContext idsp;
int quant; int quant;
int dquant; int dquant;
int qsum; int qsum;
@ -64,10 +66,12 @@ typedef struct IntraX8Context {
* Initialize IntraX8 frame decoder. * Initialize IntraX8 frame decoder.
* Requires valid MpegEncContext with valid s->mb_width before calling. * Requires valid MpegEncContext with valid s->mb_width before calling.
* @param w pointer to IntraX8Context * @param w pointer to IntraX8Context
* @param idsp pointer to IDCTDSPContext
* @param s pointer to MpegEncContext of the parent codec * @param s pointer to MpegEncContext of the parent codec
* @return 0 on success, a negative AVERROR value on error * @return 0 on success, a negative AVERROR value on error
*/ */
int ff_intrax8_common_init(IntraX8Context *w, MpegEncContext *const s); int ff_intrax8_common_init(IntraX8Context *w, IDCTDSPContext *idsp,
MpegEncContext *const s);
/** /**
* Destroy IntraX8 frame structure. * Destroy IntraX8 frame structure.

2
libavcodec/vc1dec.c
View File

@ -387,7 +387,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
ret = ff_intrax8_common_init(&v->x8, s); ret = ff_intrax8_common_init(&v->x8, &s->idsp, s);
if (ret < 0) if (ret < 0)
goto error; goto error;

2
libavcodec/wmv2dec.c
View File

@ -466,7 +466,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
ff_wmv2_common_init(w); ff_wmv2_common_init(w);
return ff_intrax8_common_init(&w->x8, &w->s); return ff_intrax8_common_init(&w->x8, &w->s.idsp, &w->s);
} }
static av_cold int wmv2_decode_end(AVCodecContext *avctx) static av_cold int wmv2_decode_end(AVCodecContext *avctx)