projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
f79bb11
)
Merge commit '8edaf625f3c38c695c33745822182e94e17d6e1b'
author
Hendrik Leppkes
<h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:26:17 +0000
(14:26 +0100)
committer
Hendrik Leppkes
<h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:26:17 +0000
(14:26 +0100)
* commit '
8edaf625f3c38c695c33745822182e94e17d6e1b
':
libopenh264enc: Count and warn about the number of skipped frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libopenh264enc.c
patch
|
blob
|
history
diff --git
a/libavcodec/libopenh264enc.c
b/libavcodec/libopenh264enc.c
index 8ff85b5070ad21d4c480c187a3a3afd67fd0b2aa..ccf65ebf8a0fe3fb2ff5105069b6d47a3f031e4d 100644
(file)
--- a/
libavcodec/libopenh264enc.c
+++ b/
libavcodec/libopenh264enc.c
@@
-39,6
+39,7
@@
typedef struct SVCContext {
char *profile;
int max_nal_size;
int skip_frames;
+ int skipped;
} SVCContext;
#define OPENH264_VER_AT_LEAST(maj, min) \
@@
-95,6
+96,8
@@
static av_cold int svc_encode_close(AVCodecContext *avctx)
if (s->encoder)
WelsDestroySVCEncoder(s->encoder);
+ if (s->skipped > 0)
+ av_log(avctx, AV_LOG_WARNING, "%d frames skipped\n", s->skipped);
return 0;
}
@@
-252,6
+255,7
@@
static int svc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return AVERROR_UNKNOWN;
}
if (fbi.eFrameType == videoFrameTypeSkip) {
+ s->skipped++;
av_log(avctx, AV_LOG_DEBUG, "frame skipped\n");
return 0;
}