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

avcodec/vp9: make last_invisible local.

Browse Source 
Original change by one of these developers:
    Anton Khirnov <anton@khirnov.net>
    Diego Biurrun <diego@biurrun.de>
    Luca Barbato <lu_zero@gentoo.org>
    Martin Storsjö <martin@martin.st>

See 97962b2 / 72ca830
This commit is contained in:
Clément Bœsch 2013-11-16 00:11:24 +01:00
parent d28c79b003
commit 7cd555dfa5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/vp9.c
View File

@ -98,7 +98,7 @@ typedef struct VP9Context {
// bitstream header // bitstream header
uint8_t profile; uint8_t profile;
uint8_t keyframe, last_keyframe; uint8_t keyframe, last_keyframe;
uint8_t invisible, last_invisible; uint8_t invisible;
uint8_t use_last_frame_mvs; uint8_t use_last_frame_mvs;
uint8_t errorres; uint8_t errorres;
uint8_t colorspace; uint8_t colorspace;
@ -359,6 +359,7 @@ static int decode_frame_header(AVCodecContext *ctx,
{ {
VP9Context *s = ctx->priv_data; VP9Context *s = ctx->priv_data;
int c, i, j, k, l, m, n, w, h, max, size2, res, sharp; int c, i, j, k, l, m, n, w, h, max, size2, res, sharp;
int last_invisible;
const uint8_t *data2; const uint8_t *data2;
/* general header */ /* general header */
@ -381,11 +382,11 @@ static int decode_frame_header(AVCodecContext *ctx,
} }
s->last_keyframe = s->keyframe; s->last_keyframe = s->keyframe;
s->keyframe = !get_bits1(&s->gb); s->keyframe = !get_bits1(&s->gb);
s->last_invisible = s->invisible; last_invisible = s->invisible;
s->invisible = !get_bits1(&s->gb); s->invisible = !get_bits1(&s->gb);
s->errorres = get_bits1(&s->gb); s->errorres = get_bits1(&s->gb);
// FIXME disable this upon resolution change // FIXME disable this upon resolution change
s->use_last_frame_mvs = !s->errorres && !s->last_invisible; s->use_last_frame_mvs = !s->errorres && !last_invisible;
if (s->keyframe) { if (s->keyframe) {
if (get_bits_long(&s->gb, 24) != VP9_SYNCCODE) { // synccode if (get_bits_long(&s->gb, 24) != VP9_SYNCCODE) { // synccode
av_log(ctx, AV_LOG_ERROR, "Invalid sync code\n"); av_log(ctx, AV_LOG_ERROR, "Invalid sync code\n");