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

raw rgb flip fix

Browse Source 
Originally committed as revision 3724 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-11-30 21:50:16 +00:00
parent 1b307febc4
commit 9d2a069519
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffplay.c
View File

@ -899,15 +899,6 @@ static int video_thread(void *arg)
if (pkt->dts != AV_NOPTS_VALUE)
pts = (double)pkt->dts / AV_TIME_BASE;
if (is->video_st->codec.codec_id == CODEC_ID_RAWVIDEO) {
avpicture_fill((AVPicture *)frame, pkt->data,
is->video_st->codec.pix_fmt,
is->video_st->codec.width,
is->video_st->codec.height);
frame->pict_type = FF_I_TYPE;
if (output_picture2(is, frame, pts) < 0)
goto the_end;
} else {
len1 = avcodec_decode_video(&is->video_st->codec,
frame, &got_picture,
pkt->data, pkt->size);
@ -917,7 +908,6 @@ static int video_thread(void *arg)
if (output_picture2(is, frame, pts) < 0)
goto the_end;
}
}
av_free_packet(pkt);
if (step)
if (cur_stream)

9
libavcodec/raw.c
View File

@ -106,6 +106,13 @@ static int raw_init_decoder(AVCodecContext *avctx)
return 0;
}
static void flip(AVCodecContext *avctx, AVPicture * picture){
if(!avctx->codec_tag && avctx->bits_per_sample && picture->linesize[1]==0){
picture->data[0] += picture->linesize[0] * (avctx->height-1);
picture->linesize[0] *= -1;
}
}
static int raw_decode(AVCodecContext *avctx,
void *data, int *data_size,
uint8_t *buf, int buf_size)
@ -118,6 +125,7 @@ static int raw_decode(AVCodecContext *avctx,
/* Early out without copy if packet size == frame size */
if (buf_size == context->length && context->p == context->buffer) {
avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height);
flip(avctx, picture);
*data_size = sizeof(AVPicture);
return buf_size;
}
@ -132,6 +140,7 @@ static int raw_decode(AVCodecContext *avctx,
memcpy(context->p, buf, bytesNeeded);
context->p = context->buffer;
avpicture_fill(picture, context->buffer, avctx->pix_fmt, avctx->width, avctx->height);
flip(avctx, picture);
*data_size = sizeof(AVPicture);
return bytesNeeded;
}