Commit 0de4918f authored by Michael Niedermayer's avatar Michael Niedermayer

rawdec: support AVRn 1:1 raw interlaced mode

Fixes Ticket971
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e35c0ee0
......@@ -39,6 +39,7 @@ typedef struct RawVideoContext {
unsigned char * buffer; /* block of memory for holding one frame */
int length; /* number of bytes in buffer */
int flip;
int interlace;
AVFrame pic; ///< AVCodecContext.coded_frame
int tff;
} RawVideoContext;
......@@ -130,6 +131,17 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
avctx->codec_tag == MKTAG(3, 0, 0, 0) || avctx->codec_tag == MKTAG('W','R','A','W'))
context->flip=1;
if(avctx->extradata_size >= 9 && avctx->extradata[4]+28 < avctx->extradata_size && !context->buffer && avctx->pix_fmt == PIX_FMT_UYVY422) {
int ndx = avctx->extradata[4] + 4;
context->interlace = !memcmp(avctx->extradata + ndx, "1:1(", 4);
if(context->interlace) {
context->buffer = av_malloc(context->length);
if (!context->buffer)
return AVERROR(ENOMEM);
context->tff = avctx->extradata[ndx + 24] == 1;
}
}
return 0;
}
......@@ -173,6 +185,7 @@ static int raw_decode(AVCodecContext *avctx,
if (context->buffer) {
int i;
uint8_t *dst = context->buffer;
if(avctx->pix_fmt == PIX_FMT_PAL8){
buf_size = context->length - AVPALETTE_SIZE;
if (avctx->bits_per_coded_sample == 4){
for(i=0; 2*i+1 < buf_size && i<avpkt->size; i++){
......@@ -190,6 +203,23 @@ static int raw_decode(AVCodecContext *avctx,
}
linesize_align = 16;
}
} else if(context->interlace && avctx->pix_fmt == PIX_FMT_UYVY422) {
int x, y;
int true_height = buf_size / (2*avctx->width);
int tff = !!context->tff;
av_assert0(avctx->height * avctx->width * 2 == context->length);
if (buf_size < context->length) {
av_log(avctx, AV_LOG_ERROR, "Invalid buffer size, packet size %d < context length %d\n", buf_size, context->length);
return AVERROR(EINVAL);
}
buf += (true_height - avctx->height)*avctx->width;
for(y = 0; y < avctx->height-1; y+=2) {
memcpy(dst + (y+ tff)*2*avctx->width, buf , 2*avctx->width);
memcpy(dst + (y+!tff)*2*avctx->width, buf + avctx->width*true_height+4, 2*avctx->width);
buf += 2*avctx->width;
}
}else
av_assert0(0);
buf= dst;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment