har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set pict_type & key_frame on decoding too

Browse Source 
Originally committed as revision 918 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2002-09-12 00:27:08 +00:00
parent 89b3d7c9f1
commit 208d3ddf96
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avcodec.h
View File

@ -182,7 +182,7 @@ typedef struct AVCodecContext {
int key_frame; /* true if the previous compressed frame was int key_frame; /* true if the previous compressed frame was
a key frame (intra, or seekable) */ a key frame (intra, or seekable) */
int pict_type; /* picture type of the previous int pict_type; /* picture type of the previous
encoded frame */ en/decoded frame */
/* FIXME: these should have FF_ */ /* FIXME: these should have FF_ */
#define I_TYPE 1 // Intra #define I_TYPE 1 // Intra
#define P_TYPE 2 // Predicted #define P_TYPE 2 // Predicted

6
libavcodec/mpegvideo.c
View File

@ -720,7 +720,8 @@ void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
/* generic function for encode/decode called after a frame has been coded/decoded */ /* generic function for encode/decode called after a frame has been coded/decoded */
void MPV_frame_end(MpegEncContext *s) void MPV_frame_end(MpegEncContext *s)
{ {
// if((s->picture_number%100)==0 && s->encoding) printf("sads:%d //\n", sads); s->avctx->key_frame = (s->pict_type == I_TYPE);
s->avctx->pict_type = s->pict_type;
/* draw edge for correct motion prediction if outside */ /* draw edge for correct motion prediction if outside */
if (s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) { if (s->pict_type != B_TYPE && !s->intra_only && !(s->flags&CODEC_FLAG_EMU_EDGE)) {
@ -870,8 +871,7 @@ int MPV_encode_picture(AVCodecContext *avctx,
MPV_frame_start(s, avctx); MPV_frame_start(s, avctx);
encode_picture(s, s->picture_number); encode_picture(s, s->picture_number);
avctx->key_frame = (s->pict_type == I_TYPE);
avctx->pict_type = s->pict_type;
avctx->real_pict_num = s->picture_number; avctx->real_pict_num = s->picture_number;
avctx->header_bits = s->header_bits; avctx->header_bits = s->header_bits;
avctx->mv_bits = s->mv_bits; avctx->mv_bits = s->mv_bits;