[Ffmpeg-cvslog] r8326 - trunk/libavcodec/flashsvenc.c
banan
subversion
Sun Mar 11 22:01:33 CET 2007
Author: banan
Date: Sun Mar 11 22:01:33 2007
New Revision: 8326
Modified:
trunk/libavcodec/flashsvenc.c
Log:
Respect the gop size (-g) for marking I frames. Use -g 0 gives the old behaviour.
Modified: trunk/libavcodec/flashsvenc.c
==============================================================================
--- trunk/libavcodec/flashsvenc.c (original)
+++ trunk/libavcodec/flashsvenc.c Sun Mar 11 22:01:33 2007
@@ -74,6 +74,7 @@ typedef struct FlashSVContext {
uint8_t* encbuffer;
int block_size;
z_stream zstream;
+ int last_key_frame;
} FlashSVContext;
static int copy_region_enc(uint8_t *sptr, uint8_t *dptr,
@@ -125,6 +126,8 @@ static int flashsv_encode_init(AVCodecCo
}
*/
+ s->last_key_frame=0;
+
s->image_width = avctx->width;
s->image_height = avctx->height;
@@ -238,6 +241,7 @@ static int flashsv_encode_frame(AVCodecC
*p = *pict;
+ /* First frame needs to be a keyframe */
if (avctx->frame_number == 0) {
s->previous_frame = av_mallocz(p->linesize[0]*s->image_height);
if (!s->previous_frame) {
@@ -247,6 +251,13 @@ static int flashsv_encode_frame(AVCodecC
I_frame = 1;
}
+ /* Check the placement of keyframes */
+ if (avctx->gop_size > 0) {
+ if (avctx->frame_number >= s->last_key_frame + avctx->gop_size) {
+ I_frame = 1;
+ }
+ }
+
#if 0
int w, h;
int optim_sizes[16][16];
@@ -297,6 +308,8 @@ static int flashsv_encode_frame(AVCodecC
if (I_frame) {
p->pict_type = FF_I_TYPE;
p->key_frame = 1;
+ s->last_key_frame = avctx->frame_number;
+ av_log(avctx, AV_LOG_DEBUG, "Inserting key frame at frame %d\n",avctx->frame_number);
} else {
p->pict_type = FF_P_TYPE;
p->key_frame = 0;
More information about the ffmpeg-cvslog
mailing list