[FFmpeg-cvslog] r8928 - in trunk: libavcodec/vp3.c libavformat/oggparsetheora.c
aurel
subversion
Mon May 7 17:43:01 CEST 2007
Author: aurel
Date: Mon May 7 17:43:01 2007
New Revision: 8928
Log:
fix display of theora videos with visible size smaller than encoded size
Modified:
trunk/libavcodec/vp3.c
trunk/libavformat/oggparsetheora.c
Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c (original)
+++ trunk/libavcodec/vp3.c Mon May 7 17:43:01 2007
@@ -2371,6 +2371,7 @@ static int read_huffman_tree(AVCodecCont
static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb)
{
Vp3DecodeContext *s = avctx->priv_data;
+ int visible_width, visible_height;
s->theora = get_bits_long(gb, 24);
av_log(avctx, AV_LOG_INFO, "Theora bitstream version %X\n", s->theora);
@@ -2399,16 +2400,11 @@ static int theora_decode_header(AVCodecC
skip_bits(gb, 32); /* total number of blocks in a frame */
skip_bits(gb, 4); /* total number of blocks in a frame */
skip_bits(gb, 32); /* total number of macroblocks in a frame */
-
- skip_bits(gb, 24); /* frame width */
- skip_bits(gb, 24); /* frame height */
- }
- else
- {
- skip_bits(gb, 24); /* frame width */
- skip_bits(gb, 24); /* frame height */
}
+ visible_width = get_bits_long(gb, 24);
+ visible_height = get_bits_long(gb, 24);
+
if (s->theora >= 0x030200) {
skip_bits(gb, 8); /* offset x */
skip_bits(gb, 8); /* offset y */
@@ -2438,8 +2434,11 @@ static int theora_decode_header(AVCodecC
// align_get_bits(gb);
- avctx->width = s->width;
- avctx->height = s->height;
+ if ( visible_width <= s->width && visible_width > s->width-16
+ && visible_height <= s->height && visible_height > s->height-16)
+ avcodec_set_dimensions(avctx, visible_width, visible_height);
+ else
+ avcodec_set_dimensions(avctx, s->width, s->height);
return 0;
}
Modified: trunk/libavformat/oggparsetheora.c
==============================================================================
--- trunk/libavformat/oggparsetheora.c (original)
+++ trunk/libavformat/oggparsetheora.c Mon May 7 17:43:01 2007
@@ -53,6 +53,7 @@ theora_header (AVFormatContext * s, int
if (os->buf[os->pstart] == 0x80) {
GetBitContext gb;
+ int width, height;
int version;
init_get_bits(&gb, os->buf + os->pstart, os->psize*8);
@@ -70,13 +71,21 @@ theora_header (AVFormatContext * s, int
return -1;
}
- st->codec->width = get_bits(&gb, 16) << 4;
- st->codec->height = get_bits(&gb, 16) << 4;
+ width = get_bits(&gb, 16) << 4;
+ height = get_bits(&gb, 16) << 4;
+ avcodec_set_dimensions(st->codec, width, height);
if (version >= 0x030400)
- skip_bits(&gb, 164);
- else if (version >= 0x030200)
- skip_bits(&gb, 64);
+ skip_bits(&gb, 100);
+
+ width = get_bits_long(&gb, 24);
+ height = get_bits_long(&gb, 24);
+ if ( width <= st->codec->width && width > st->codec->width-16
+ && height <= st->codec->height && height > st->codec->height-16)
+ avcodec_set_dimensions(st->codec, width, height);
+
+ if (version >= 0x030200)
+ skip_bits(&gb, 16);
st->codec->time_base.den = get_bits(&gb, 32);
st->codec->time_base.num = get_bits(&gb, 32);
st->time_base = st->codec->time_base;
More information about the ffmpeg-cvslog
mailing list