RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mpeg12dec: Remove outdated UV swapping code for VCR2

This commit is contained in:
Diego Biurrun 2013-11-13 18:44:25 +01:00
parent 669fe50595
commit ad1161799e
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/mpeg12dec.c
View File

@ -646,15 +646,6 @@ static inline int get_qscale(MpegEncContext *s)
}
}
static void exchange_uv(MpegEncContext *s)
{
int16_t (*tmp)[64];
tmp = s->pblocks[4];
s->pblocks[4] = s->pblocks[5];
s->pblocks[5] = tmp;
}
/* motion type (for MPEG-2) */
#define MT_FIELD 1
#define MT_FRAME 2
@ -761,9 +752,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
// if 1, we memcpy blocks in xvmcvideo
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) {
ff_xvmc_pack_pblocks(s, -1); // inter are always full blocks
if (s->swap_uv) {
exchange_uv(s);
}
}
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
@ -978,9 +966,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
//if 1, we memcpy blocks in xvmcvideo
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration > 1) {
ff_xvmc_pack_pblocks(s, cbp);
if (s->swap_uv) {
exchange_uv(s);
}
}
FF_ENABLE_DEPRECATION_WARNINGS
#endif /* FF_API_XVMC */
@ -1988,7 +1973,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
s->chroma_format = 1;
s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
s->out_format = FMT_MPEG1;
s->swap_uv = 0; // AFAIK VCR2 does not have SEQ_HEADER
if (s->flags & CODEC_FLAG_LOW_DELAY)
s->low_delay = 1;
@ -2028,8 +2012,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
if (ff_MPV_common_init(s) < 0)
return -1;
exchange_uv(s); // common init reset pblocks, so we swap them here
s->swap_uv = 1; // in case of xvmc we need to swap uv for each MB
s1->mpeg_enc_ctx_allocated = 1;
for (i = 0; i < 64; i++) {

1
libavcodec/mpegvideo.h
View File

@ -707,7 +707,6 @@ typedef struct MpegEncContext {
int rtp_mode;
uint8_t *ptr_lastgob;
int swap_uv; //vcr2 codec is an MPEG-2 variant with U and V swapped
int16_t (*pblocks[12])[64];
int16_t (*block)[64]; ///< points to one of the following blocks